From 4ae6a9da5c4be1cb4075e7dcf8862051f8c5851c Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 29 Nov 2018 14:06:01 +0100
Subject: [PATCH] refactoring: read fc-ncv-correction factor directly from fuel
properties - removed separate field
---
.../Reader/Impl/DeclarationModeVectoRunDataFactory.cs | 1 -
.../Models/SimulationComponent/Data/CombustionEngineData.cs | 5 +----
.../Models/SimulationComponent/Impl/CombustionEngine.cs | 2 +-
VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs | 5 ++++-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index 5b721125cc..9e4e04a75d 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -228,7 +228,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
mission.MissionType.GetNonEMSMissionType(), _engineData.WHTCRural, _engineData.WHTCUrban,
_engineData.WHTCMotorway) *
_engineData.ColdHotCorrectionFactor * _engineData.CorrectionFactorRegPer;
- simulationRunData.EngineData.NCVCorrectionFactor = _engineData.FuelData.HeatingValueCorrection;
simulationRunData.EngineData.ADASCorrectionFactor = DeclarationData.ADASBenefits.Lookup(
_segment.VehicleClass, adasCombination, mission.MissionType, loading.Key);
simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index be6fd63edf..97fcc6e22c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -83,8 +83,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public NewtonMeter MaxTorqueDeclared { get; internal set; }
public FuelData.Entry FuelData { get; internal set; }
- public double NCVCorrectionFactor { get; set; }
-
+
public CombustionEngineData()
{
WHTCUrban = 1;
@@ -93,7 +92,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
CorrectionFactorRegPer = 1;
FuelConsumptionCorrectionFactor = 1;
ADASCorrectionFactor = 1;
- NCVCorrectionFactor = 1;
}
public CombustionEngineData Copy()
@@ -117,7 +115,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
MaxTorqueDeclared = MaxTorqueDeclared,
FuelData = FuelData,
ADASCorrectionFactor = ADASCorrectionFactor,
- NCVCorrectionFactor = NCVCorrectionFactor
};
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 71894fc589..73d6812528 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -396,7 +396,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var fc = result.Value;
- var fcNCVcorr = fc * ModelData.NCVCorrectionFactor; // TODO: wird fcNCVcorr
+ var fcNCVcorr = fc * ModelData.FuelData.HeatingValueCorrection; // TODO: wird fcNCVcorr
var fcWHTC = fcNCVcorr * WHTCCorrectionFactor;
var fcAAUX = fcWHTC;
diff --git a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
index be3602c0ce..b7e9737b54 100644
--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -112,7 +112,10 @@ namespace TUGraz.VectoCore.Tests.Integration
var run = jobContainer.Runs[runIdx];
var modContainer = (ModalDataContainer)run.Run.GetContainer().ModalData;
var modData = modContainer.Data;
- modContainer.FuelData = FuelData.Instance().Lookup(fuelType, tankSystem);
+
+ var fuelData = FuelData.Instance().Lookup(fuelType, tankSystem);
+ modContainer.FuelData = fuelData;
+ ((VehicleContainer)run.Run.GetContainer()).RunData.EngineData.FuelData = fuelData;
run.Run.Run();
--
GitLab