From 7b5ed800c84da81879c6660dd6380d87d44aff72 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 9 Nov 2020 15:42:23 +0100 Subject: [PATCH] set correct engine correction factor for VTP simulation,write CO2 values in VTP report (fix) --- .../Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs | 7 +++++++ VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs index d85f808baa..82cf10c0fe 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs @@ -170,6 +170,13 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl } var loading = mission.Loadings.FirstOrDefault(l => l.Key == DeclarationData.VTPMode.SelectedLoading); var runData = CreateVectoRunData(Segment, mission, loading.Value); + runData.EngineData.FuelConsumptionCorrectionFactor = DeclarationData.WHTCCorrection.Lookup( + mission.MissionType.GetNonEMSMissionType(), runData.EngineData.WHTCRural, runData.EngineData.WHTCUrban, + runData.EngineData.WHTCMotorway) * + runData.EngineData.ColdHotCorrectionFactor * runData.EngineData.CorrectionFactorRegPer; + var adasCombination = DeclarationData.ADASCombinations.Lookup(JobInputData.Vehicle.ADAS); + runData.EngineData.ADASCorrectionFactor = DeclarationData.ADASBenefits.Lookup( + Segment.VehicleClass, adasCombination, mission.MissionType, loading.Key); runData.ModFileSuffix = loading.Key.ToString(); var cycle = DrivingCycleDataReader.ReadFromStream(mission.CycleFile, CycleType.DistanceBased, "", false); runData.Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString()); diff --git a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs index 709aac33b1..43bf9c9974 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs @@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.OutputData.XML var vtpFcMeasuredCorr = vtpResult.VTPFcMeasured / vtpResult.VTPWorkPWheelPos * vtpResult.VTPFcCorrectionFactor; var vtpFcSimulated = vtpResult.VTPFcFinalSimulated / vtpResult.FuelData.HeatingValueCorrection / vtpResult.VTPWorPWheelSimPos; var cVtp = vtpFcMeasuredCorr / vtpFcSimulated; - var declaredCO2 = result.FuelConsumptionTotal / result.Distance / result.Payload; + var declaredCO2 = result.FuelConsumptionTotal * result.FuelData.CO2PerFuelWeight / result.Distance / result.Payload; var verifiedCO2 = declaredCO2 * cVtp; Results.Add( -- GitLab