From 1922d851d43af9d204261d45ed343714f2f92769 Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Wed, 23 Nov 2022 09:47:47 +0100 Subject: [PATCH] set axlegearratio to 1.0 if AxleGearData is null --- .../SimulationComponents/ElectricMachinesDataAdapter.cs | 8 ++++++-- .../SimulationComponents/GearBoxDataAdapter.cs | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs index e81ddfe498..11740b865d 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/ElectricMachinesDataAdapter.cs @@ -298,8 +298,12 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen var overloadTestSpeed = (voltageEntry.OverloadTestSpeed ?? 0.RPMtoRad()) * gearRatioUsedForMeasurement; - var peakElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, overloadTestSpeed, -overloadTorque, gear, true) - .ElectricalPower; + var peakElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, + overloadTestSpeed, + -overloadTorque, + gear, + true) + .ElectricalPower; var peakPwrLoss = -peakElPwr - overloadTorque * overloadTestSpeed; // losses need to be positive var contElPwr = voltageLevels.LookupElectricPower(voltageEntry.VoltageLevel, continuousTorqueSpeed, diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs index ef0856a46f..4c3dc27c82 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs @@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen var torqueConverter = inputData.Components.TorqueConverterInputData; var engine = runData.EngineData; - var axlegearRatio = runData.AxleGearData.AxleGear.Ratio; + var axlegearRatio = runData.AxleGearData?.AxleGear.Ratio ?? 1.0f; var dynamicTyreRadius = runData.VehicleData.DynamicTyreRadius; var retVal = SetCommonGearboxData(gearbox); -- GitLab