diff --git a/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs b/VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs index f9e94ff463c68ea784013cb1f8dbe346cb12bc51..f8c5db399dde97a215d6ff20e72f666f929dc623 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 4c1425e31338056c21165e97b64aedcc5b6f37d1..d5bfb2792f74f9f69ed8bd2734ec331a5e6905b0 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 7c85f3fd8d46ea45f95184b3ed5942504e2be0f2..29592e8b593f2eebcdc32ae9f8da8f8e4f580e0f 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; }