From 9c25cef8ec796ad00a8b696db65ab3c042fdaae2 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 15 Mar 2023 19:31:07 +0100
Subject: [PATCH] change in post-processing correction: EC_el_soc/final = 0 for
 charge depleting simulations

---
 .../ParallelHybridModalDataPostprocessingCorrection.cs     | 6 ++++--
 .../SerialHybridModalDataPostprocessingCorrection.cs       | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs
index d19931039f..6fc616699f 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 b5814e7c78..2fd5cd77e4 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;
 		}
 
-- 
GitLab