From 508ac4e9f24580f5db4fa710fc166b1e1464e81d Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 14 Mar 2016 08:51:45 +0100
Subject: [PATCH] set whtc correction factors to 1 by default, override only in
declaration mode
---
.../DataObjectAdaper/AbstractSimulationDataAdapter.cs | 3 ---
.../Reader/DataObjectAdaper/DeclarationDataAdapter.cs | 3 +++
.../SimulationComponent/Data/CombustionEngineData.cs | 7 +++++++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
index efd4c8a56c..d1115be74d 100644
--- a/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
@@ -116,9 +116,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
Displacement = data.Displacement,
IdleSpeed = data.IdleSpeed,
ConsumptionMap = FuelConsumptionMap.Create(data.FuelConsumptionMap),
- WHTCUrban = data.WHTCUrban,
- WHTCMotorway = data.WHTCMotorway,
- WHTCRural = data.WHTCRural,
};
return retVal;
}
diff --git a/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs b/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
index 6f36164dd5..4fe412186e 100644
--- a/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
+++ b/VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs
@@ -142,6 +142,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
}
var retVal = SetCommonCombustionEngineData(engine);
+ retVal.WHTCUrban = engine.WHTCUrban;
+ retVal.WHTCMotorway = engine.WHTCMotorway;
+ retVal.WHTCRural = engine.WHTCRural;
retVal.Inertia = DeclarationData.Engine.EngineInertia(retVal.Displacement);
retVal.FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve, true);
retVal.FullLoadCurve.EngineData = retVal;
diff --git a/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index eb12a92a69..d6ccb2d1ec 100644
--- a/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -64,6 +64,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
internal double WHTCCorrectionFactor = 1;
+ public CombustionEngineData()
+ {
+ WHTCUrban = 1;
+ WHTCMotorway = 1;
+ WHTCRural = 1;
+ }
+
#region Equality Member
protected bool Equals(CombustionEngineData other)
--
GitLab