diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs index 2216f1013fdc1cbb7b1059f36e9e1601f3561123..4d30ffaa4111ef89090656224f3d57a259ebe249 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Auxiliaries/Conditioning.cs @@ -82,8 +82,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Auxiliaries public Watt GetPEV_SHEV_PowerDemand(IDataBus dataBus) { - var elInfo = GetElectricMotorInfo(dataBus); - if (!elInfo.EmOff || EPTOOn(dataBus)) { + var oneEmOn = dataBus.GetElectricMotors().Any(elInfo => !elInfo.EmOff); + if (oneEmOn || EPTOOn(dataBus)) { return _electricPowerDemand; } else { return 0.SI<Watt>(); @@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Auxiliaries { double xFactor = 0; - var elInfo = GetElectricMotorInfo(dataBus); + var elInfo = dataBus.GetElectricMotors().Single(); if (!elInfo.EmOff) { var iceInfo = dataBus.EngineInfo; @@ -106,19 +106,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl.Auxiliaries return _electricPowerDemand * xFactor; } - - private IElectricMotorInfo GetElectricMotorInfo(IDataBus dataBus) - { - try - { - return dataBus.ElectricMotorInfo(dataBus.PowertrainInfo.ElectricMotorPositions.Single()); - } - catch (Exception ex) - { - throw new VectoException("Only one electric motor position supported"); - } - - } }