From ce720a555a1df9c99b076efb2c74d2c0c504b3ea Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Mon, 26 Mar 2018 14:59:59 +0200 Subject: [PATCH] fix: take engine's RegPer correction factor into account --- .../Reader/DataObjectAdapter/DeclarationDataAdapter.cs | 1 + .../InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs index c3e9d134a0..0c934c136d 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs @@ -156,6 +156,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter retVal.WHTCMotorway = engine.WHTCMotorway; retVal.WHTCRural = engine.WHTCRural; retVal.ColdHotCorrectionFactor = engine.ColdHotBalancingFactor; + retVal.CorrectionFactorRegPer = engine.CorrectionFactorRegPer; retVal.Inertia = DeclarationData.Engine.EngineInertia(retVal.Displacement, gearbox.Type); var limits = torqueLimits.ToDictionary(e => e.Gear); var numGears = gearbox.Gears.Count; diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs index 2fa122c79b..b497a1c7ea 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs @@ -188,7 +188,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl }; simulationRunData.EngineData.FuelConsumptionCorrectionFactor = DeclarationData.WHTCCorrection.Lookup( mission.MissionType.GetNonEMSMissionType(), _engineData.WHTCRural, _engineData.WHTCUrban, _engineData.WHTCMotorway) * - _engineData.ColdHotCorrectionFactor; + _engineData.ColdHotCorrectionFactor * _engineData.CorrectionFactorRegPer; simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass; yield return simulationRunData; } -- GitLab