Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit aefb03b0 authored by Harald Martini's avatar Harald Martini
Browse files

updated serial hybrid engine auxiliaries

parent 8b0fc7b5
No related branches found
No related tags found
No related merge requests found
...@@ -807,7 +807,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -807,7 +807,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (data.PTO == null) { if (data.PTO == null) {
return null; return null;
} }
var pto = new PEVPTO(container); var pto = new PEVPtoTransm(container);
RoadSweeperAuxiliary rdSwpAux = null; RoadSweeperAuxiliary rdSwpAux = null;
PTODriveAuxiliary ptoDrive = null; PTODriveAuxiliary ptoDrive = null;
...@@ -830,7 +830,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -830,7 +830,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
pto.Add(Constants.Auxiliaries.IDs.PTODuringDrive, (nEng, absTime, dt, dryRun) => ptoDrive.PowerDemand(nEng, absTime, dt, dryRun) / nEng); pto.Add(Constants.Auxiliaries.IDs.PTODuringDrive, (nEng, absTime, dt, dryRun) => ptoDrive.PowerDemand(nEng, absTime, dt, dryRun) / nEng);
container.AddAuxiliary(Constants.Auxiliaries.IDs.PTODuringDrive, Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTODuringDrive); container.AddAuxiliary(Constants.Auxiliaries.IDs.PTODuringDrive, Constants.Auxiliaries.PowerPrefix + Constants.Auxiliaries.IDs.PTODuringDrive);
} }
if (data.PTO != null) { if (data.PTO.TransmissionType != null) {
pto.AddConstant(Constants.Auxiliaries.IDs.PTOTransmission, pto.AddConstant(Constants.Auxiliaries.IDs.PTOTransmission,
DeclarationData.PTOTransmission.Lookup(data.PTO.TransmissionType).TorqueLoss); DeclarationData.PTOTransmission.Lookup(data.PTO.TransmissionType).TorqueLoss);
container.AddAuxiliary(Constants.Auxiliaries.IDs.PTOTransmission, container.AddAuxiliary(Constants.Auxiliaries.IDs.PTOTransmission,
...@@ -1543,9 +1543,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -1543,9 +1543,15 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
{ {
var aux = new EngineAuxiliary(container); var aux = new EngineAuxiliary(container);
foreach (var auxData in data.Aux) { foreach (var auxData in data.Aux) {
if (auxData.ConnectToREESS == true)
{
continue;
}
// id's in upper case // id's in upper case
var id = auxData.ID.ToUpper(); var id = auxData.ID.ToUpper();
switch (auxData.DemandType) { switch (auxData.DemandType) {
case AuxiliaryDemandType.Constant: case AuxiliaryDemandType.Constant:
aux.AddConstant(id, auxData.PowerDemandMech); aux.AddConstant(id, auxData.PowerDemandMech);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment