From 66beacd5824c2e75f43c369cbcd1a839b530606f Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 25 Sep 2019 10:17:56 +0200
Subject: [PATCH] bugfix data adapter
---
.../Engineering Mode/Class5_Tractor_4x2/325kW_WHR.vmap | 2 +-
.../Reader/DataObjectAdapter/DeclarationDataAdapter.cs | 1 +
.../Reader/DataObjectAdapter/EngineeringDataAdapter.cs | 10 ++++++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/325kW_WHR.vmap b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/325kW_WHR.vmap
index 0e8ed64792..f7601d0116 100644
--- a/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/325kW_WHR.vmap
+++ b/Generic Vehicles/Engineering Mode/Class5_Tractor_4x2/325kW_WHR.vmap
@@ -1,4 +1,4 @@
-engine speed [rpm], torque [Nm], fuel consumption [g/h], whr power [W]
+engine speed [rpm], torque [Nm], fuel consumption [g/h], whr power electrical [W]
500,-135.5,0, 200
500,0,1355, 200
500,213.4,3412.291, 200
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 0a381c4a9a..95451d90fb 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -233,6 +233,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.FullLoadCurves = fullLoadCurves;
+ retVal.WHRType = engine.WHRType;
if ((retVal.WHRType & WHRType.ElectricalOutput) != 0) {
retVal.ElectricalWHR = CreateWHRData(
mode.WasteHeatRecoveryDataElectrical, mission.MissionType, WHRType.ElectricalOutput);
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 7aa7e0f2b4..e795c28397 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -202,8 +202,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
retVal.FullLoadCurves = fullLoadCurves;
retVal.WHRType = engine.WHRType;
- retVal.ElectricalWHR = CreateWHRData(engineMode.WasteHeatRecoveryDataElectrical, WHRType.ElectricalOutput);
- retVal.MechanicalWHR = CreateWHRData(engineMode.WasteHeatRecoveryDataMechanical, WHRType.MechanicalOutputDrivetrain);
+ if ((retVal.WHRType & WHRType.ElectricalOutput) != 0) {
+ retVal.ElectricalWHR = CreateWHRData(
+ engineMode.WasteHeatRecoveryDataElectrical, WHRType.ElectricalOutput);
+ }
+ if ((retVal.WHRType & WHRType.MechanicalOutputDrivetrain) != 0) {
+ retVal.MechanicalWHR = CreateWHRData(
+ engineMode.WasteHeatRecoveryDataMechanical, WHRType.MechanicalOutputDrivetrain);
+ }
return retVal;
}
--
GitLab