From 0fdb1f1d57421949b80dcd948d040f604b8ed2e8 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 1 Aug 2016 13:22:39 +0200
Subject: [PATCH] read WHTCEngineering correction factor
---
VectoCommon/VectoCommon/InputData/EngineeringInputData.cs | 5 +++++
VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs | 5 +++++
.../Reader/DataObjectAdapter/EngineeringDataAdapter.cs | 1 +
VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs | 1 +
4 files changed, 12 insertions(+)
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 3db09e9cf3..d2234dc305 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 3e0460a43c..5dc1b8abaa 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 70c767dea0..42d08bd4dc 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 b64fbeeb87..6ae0e66a4d 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
--
GitLab