diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs index d0451b85a6fab446872ff7b24820c696e67315c5..668e1523b35a4d0b139ea244d580668ffcbfaabb 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs @@ -107,7 +107,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl return HandleClutchOpen(absTime, dt, outTorque, outAngularVelocity, false); } - if (IdleController != null) { + if (IdleController != null && !dryRun) { IdleController.Reset(); } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs index 64cb50dc9c49c473a2aa9ca2902b5579cb972ef4..98e299d09daa65a41203c3c756b31ee5017dc6d9 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs @@ -480,10 +480,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl searchedOperatingPoint.SimulationInterval, searchedOperatingPoint.Acceleration, rollAction ? "ROLL" : "COAST"); - var applyLimit = rollAction || tcOperatingPointSet; + var ignoreDriverLimits = rollAction || tcOperatingPointSet; var limitedOperatingPoint = LimitAccelerationByDriverModel(searchedOperatingPoint, - applyLimit ? LimitationMode.LimitDecelerationDriver : LimitationMode.NoLimitation); + ignoreDriverLimits ? LimitationMode.NoLimitation : LimitationMode.LimitDecelerationDriver); // compute speed at the end of the simulation interval. if it exceeds the limit -> return var v2 = DataBus.VehicleInfo.VehicleSpeed + diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs index b08171c446c0caef6423a07bb2e751567862cce3..4b3029ff706da714b6f01886453b350f3acb3c5d 100644 --- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs +++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs @@ -970,6 +970,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric } powertrain + .AddComponent(new AxleGear(container, runData.AxleGearData)) .AddComponent(runData.AngledriveData != null ? new Angledrive(container, runData.AngledriveData) : null) .AddComponent(runData.Retarder.Type == RetarderType.TransmissionOutputRetarder ? new Retarder(container, runData.Retarder.LossMap, runData.Retarder.Ratio) : null) .AddComponent(new PEVGearbox(container, strategy))