From 9f72f003b0e9505233445c18683e4a56ac6f588c Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <quaritsch@ivt.tugraz.at> Date: Thu, 1 Jun 2023 21:13:26 +0200 Subject: [PATCH] fix setting gearshift parameters IEPC: in case the Axlegear is included in the IEPC, ignore Axlegear component from input, set ratio to 1 for shift params calculation --- .../DeclarationModePrimaryBusRunDataFactory.cs | 5 ++++- .../DeclarationModeSingleBusVectoRunDataFactory.cs | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/PrimaryBusRunDataFactory/DeclarationModePrimaryBusRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/PrimaryBusRunDataFactory/DeclarationModePrimaryBusRunDataFactory.cs index 1b205bb84a..1bd2eb44d8 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/PrimaryBusRunDataFactory/DeclarationModePrimaryBusRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/PrimaryBusRunDataFactory/DeclarationModePrimaryBusRunDataFactory.cs @@ -746,9 +746,12 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.PrimaryBusRunDa protected override void CreateGearboxAndGearshiftData(VectoRunData runData) { + var iepcInput = Vehicle.Components.IEPC; + var axleGearRequired = !iepcInput.DifferentialIncluded && !iepcInput.DesignTypeWheelMotor; + var axleGearRatio = axleGearRequired ? runData.AxleGearData.AxleGear.Ratio : 1.0; runData.GearshiftParameters = DataAdapter.CreateGearshiftData( - runData.AxleGearData?.AxleGear.Ratio ?? 1.0, + axleGearRatio, null, GearboxType.APTN, Vehicle.Components.IEPC.Gears.Count diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs index e46849cd2e..e00a876010 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/SingleBus/DeclarationModeSingleBusVectoRunDataFactory.cs @@ -781,9 +781,12 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.SingleBus protected override void CreateGearboxAndGearshiftData(VectoRunData runData) { - runData.GearshiftParameters = + var iepcInput = PrimaryVehicle.Components.IEPC; + var axleGearRequired = !iepcInput.DifferentialIncluded && !iepcInput.DesignTypeWheelMotor; + var axleGearRatio = axleGearRequired ? runData.AxleGearData.AxleGear.Ratio : 1.0; + runData.GearshiftParameters = DataAdapter.CreateGearshiftData( - runData.AxleGearData?.AxleGear.Ratio ?? 1.0, + axleGearRatio, null, GearboxType.APTN, PrimaryVehicle.Components.IEPC.Gears.Count -- GitLab