diff --git a/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs index d19931039f9a4c77902c3f8da27c6fb0cb3424fb..6fc616699f0e3d21e659c271910af0851bc3a757 100644 --- a/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs +++ b/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs @@ -13,16 +13,18 @@ namespace TUGraz.VectoCore.OutputData var r = base.ApplyCorrection(modData, runData); var etaChtBatWeighted = 1.0; + var electricEnergyConsumption = 0.SI<WattSecond>(); if (runData.OVCMode == VectoRunData.OvcHevMode.ChargeDepleting && runData.Mission != null) { var vehicleOperation = DeclarationData.VehicleOperation.LookupVehicleOperation(runData.VehicleData.VehicleClass, runData.Mission.MissionType); (_, _, etaChtBatWeighted) = DeclarationData.CalculateChargingEfficiencyOVCHEV(runData.MaxChargingPower, vehicleOperation, runData.BatteryData); + electricEnergyConsumption = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int); } - r.ElectricEnergyConsumption_SoC = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int); - r.ElectricEnergyConsumption_Final = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) / etaChtBatWeighted; + r.ElectricEnergyConsumption_SoC = electricEnergyConsumption; + r.ElectricEnergyConsumption_Final = electricEnergyConsumption / etaChtBatWeighted; return r; } diff --git a/VectoCore/VectoCore/OutputData/SerialHybridModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/SerialHybridModalDataPostprocessingCorrection.cs index b5814e7c78b8ccc8cb189f5f7de3a8491494a211..2fd5cd77e4a1043a941ed037a6360ac5138e7142 100644 --- a/VectoCore/VectoCore/OutputData/SerialHybridModalDataPostprocessingCorrection.cs +++ b/VectoCore/VectoCore/OutputData/SerialHybridModalDataPostprocessingCorrection.cs @@ -16,17 +16,18 @@ namespace TUGraz.VectoCore.OutputData var r = base.ApplyCorrection(modData, runData); var etaChtBatWeighted = 1.0; + var electricEnergyConsumption = 0.SI<WattSecond>(); if (runData.OVCMode == VectoRunData.OvcHevMode.ChargeDepleting && runData.Mission != null) { var vehicleOperation = DeclarationData.VehicleOperation.LookupVehicleOperation(runData.VehicleData.VehicleClass, runData.Mission.MissionType); (_, _, etaChtBatWeighted) = DeclarationData.CalculateChargingEfficiencyOVCHEV(runData.MaxChargingPower, vehicleOperation, runData.BatteryData); + electricEnergyConsumption = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int); } - r.ElectricEnergyConsumption_SoC = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int); - r.ElectricEnergyConsumption_Final = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) / etaChtBatWeighted; - + r.ElectricEnergyConsumption_SoC = electricEnergyConsumption; + r.ElectricEnergyConsumption_Final = electricEnergyConsumption / etaChtBatWeighted; return r; }