From d99077859adeadd6a565b11d8625cdcf64eec5f0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 1 Sep 2015 10:40:44 +0200
Subject: [PATCH] add new retarder type, update powertrain-builder, input file
reader
---
.../Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs | 2 +-
VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs | 3 +++
VectoCore/Models/SimulationComponent/Data/RetarderData.cs | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
index f9e94ff463..f8c5db399d 100644
--- a/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
@@ -42,7 +42,7 @@ namespace TUGraz.VectoCore.FileIO.Reader.DataObjectAdaper
Type =
(RetarderData.RetarderType)Enum.Parse(typeof(RetarderData.RetarderType), data.Retarder.TypeStr.ToString(), true),
};
- if (retarder.Type != RetarderData.RetarderType.None) {
+ if (retarder.Type == RetarderData.RetarderType.Primary || retarder.Type == RetarderData.RetarderType.Secondary) {
retarder.LossMap = RetarderLossMap.ReadFromFile(Path.Combine(basePath, data.Retarder.File));
retarder.Ratio = data.Retarder.Ratio;
}
diff --git a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 4c1425e313..d5bfb2792f 100644
--- a/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -64,6 +64,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
case RetarderData.RetarderType.None:
tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData));
break;
+ case RetarderData.RetarderType.LossesIncludedInTransmission:
+ tmp = AddComponent(tmp, GetGearbox(_container, data.GearboxData));
+ break;
}
// gearbox --> clutch
diff --git a/VectoCore/Models/SimulationComponent/Data/RetarderData.cs b/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
index 7c85f3fd8d..29592e8b59 100644
--- a/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
+++ b/VectoCore/Models/SimulationComponent/Data/RetarderData.cs
@@ -9,7 +9,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
None,
Primary,
- Secondary
+ Secondary,
+ LossesIncludedInTransmission
}
public RetarderLossMap LossMap { get; internal set; }
--
GitLab