From 6402661cccca3fcde337f421838eaa44d4f14038 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Tue, 14 Feb 2023 16:53:48 +0100
Subject: [PATCH] create axle for iepc if its present in input data
---
.../SimulationComponents/GearBoxDataAdapter.cs | 5 ++++-
.../DeclarationModeHeavyLorryRunDataFactory.cs | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs
index 8a52754cb8..b3f72a19f1 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs
@@ -303,8 +303,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
if ((inputData.VehicleType == VectoSimulationJobType.BatteryElectricVehicle || inputData.VehicleType == VectoSimulationJobType.SerialHybridVehicle) &&
gearbox.Type.AutomaticTransmission())
{
+
// PEV with APT-S or APT-P transmission are simulated as APT-N
- retVal.Type = GearboxType.APTN;
+ if (retVal.Type.IsOneOf(GearboxType.ATPowerSplit, GearboxType.ATSerial)) {
+ retVal.Type = GearboxType.APTN;
+ }
}
retVal.ATEcoRollReleaseLockupClutch =
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
index 6bfafce382..671f819ac5 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
@@ -432,7 +432,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDa
result.AngledriveData = DataAdapter.CreateAngledriveData(vehicle.Components.AngledriveInputData);
- if (AxleGearRequired()) {
+ if (AxleGearRequired() || vehicle.Components.AxleGearInputData != null) {
result.AxleGearData = DataAdapter.CreateAxleGearData(vehicle.Components.AxleGearInputData);
}
@@ -588,7 +588,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDa
$"Number of gears drag curve does not match gear count! DragCurve {numGearsDrag}; Gear count: {gearCount}");
}
- return axleGearRequired;
+ return axleGearRequired || vehicle.Components.AxleGearInputData != null;
}
--
GitLab