bugfix postprocessing: lookup vehicle operation only if necessary and mission...

bugfix postprocessing: lookup vehicle operation only if necessary and mission is set to a declaration mission

VectoCore/VectoCore/OutputData/ParallelHybridModalDataPostprocessingCorrection.cs

@@ -12,10 +12,10 @@ namespace TUGraz.VectoCore.OutputData
 		{
 			var r = base.ApplyCorrection(modData, runData);
 			
-			var vehicleOperation = DeclarationData.VehicleOperation.LookupVehicleOperation(runData.VehicleData.VehicleClass, runData.Mission.MissionType);
 			var etaChtBatWeighted = 1.0;
 
-			if (runData.OVCMode == VectoRunData.OvcHevMode.ChargeDepleting) {
+			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);

VectoCore/VectoCore/OutputData/SerialHybridModalDataPostprocessingCorrection.cs

@@ -15,13 +15,17 @@ namespace TUGraz.VectoCore.OutputData
 		{
 			var r = base.ApplyCorrection(modData, runData);
 
-			var chgEfficiency = 1.0;
+			var etaChtBatWeighted = 1.0;
 
-			if (runData.OVCMode == VectoRunData.OvcHevMode.ChargeDepleting) {
-				chgEfficiency = DeclarationData.CalculateChargingEfficiencyPEV(runData);
+			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);
 			}
+
 			r.ElectricEnergyConsumption_SoC = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int);
-			r.ElectricEnergyConsumption_Final = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) / chgEfficiency;
+			r.ElectricEnergyConsumption_Final = -modData.TimeIntegral<WattSecond>(ModalResultField.P_reess_int) / etaChtBatWeighted;
 			
 			return r;
 		}