diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs index 3db09e9cf3fac49cdf08a8aecce4434140bde678..d2234dc3054e1ed1bdcdef084314c55ff4b70fe4 100644 --- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs +++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs @@ -212,6 +212,11 @@ namespace TUGraz.VectoCommon.InputData /// cf. VECTO Input Parameters.xlsx /// </summary> KilogramSquareMeter Inertia { get; } + + /// <summary> + /// P170 + /// </summary> + double WHTCEngineering { get; } } public interface IAuxiliariesEngineeringInputData diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs index 3e0460a43cccde35b00763990482ef6d570e9a76..5dc1b8abaab6434a9e9a0b62aa8f6c0537f1d8d1 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs @@ -96,6 +96,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON get { return Body.GetEx<double>(JsonKeys.Engine_Inertia).SI<KilogramSquareMeter>(); } } + public virtual double WHTCEngineering + { + get { return 1; } + } + public virtual double WHTCMotorway { get { return Body.GetEx<double>(JsonKeys.Engine_WHTC_Motorway); } diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index 70c767dea099d713ffe49b6fc5c25face3a9d335..42d08bd4dc63366350c6a142eff41b6c2953d7ac 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -113,6 +113,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter retVal.Inertia = engine.Inertia; retVal.FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve); retVal.FullLoadCurve.EngineData = retVal; + retVal.WHTCCorrectionFactor = engine.WHTCEngineering; return retVal; } diff --git a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs index b64fbeeb87c169605c2ab76b9c03a55fb4a3c776..6ae0e66a4d1826097ae5fad8888830efad3ea0dd 100644 --- a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs +++ b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs @@ -53,5 +53,6 @@ namespace TUGraz.VectoCore.Tests.Utils public DataTable FuelConsumptionMap { get; set; } public DataTable FullLoadCurve { get; set; } public KilogramSquareMeter Inertia { get; set; } + public double WHTCEngineering { get; set; } } } \ No newline at end of file