diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs index e502fc78c4706ac4d9813288b097da34f0a108a8..216681720170d203c16044c571a387ef8c506f8a 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs @@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl PerSecond angularVelocityIn; var slippingClutchWhenDriving = (DataBus.Gear <= 2 && DataBus.DriverBehavior != DrivingBehavior.Braking); - var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0; + var slippingClutchDuringBraking = DataBus.Gear == 1 && DataBus.DriverBehavior == DrivingBehavior.Braking && outTorque > 0 && DataBus.BrakePower.IsEqual(0); //var slippingClutchWhenDriving = (DataBus.Gear == 1 && outTorque > 0); AddClutchLoss(outTorque, outAngularVelocity, slippingClutchWhenDriving || slippingClutchDuringBraking || startClutch || outAngularVelocity.IsEqual(0), diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs index 8f51dab84beca86a9335548e74d2ef9907f6f98e..754a9195abb808c0868055a96cf2628025b4c6b0 100644 --- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs +++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs @@ -78,8 +78,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent var gearbox = new MockGearbox(container); gearbox.Gear = (uint)gear; var clutch = new Clutch(container, engineData) { IdleController = new MockIdleController() }; - var vehicle = new MockVehicle(container); - vehicle.MyVehicleSpeed = 50.KMPHtoMeterPerSecond(); + var brakes = new Brakes(container) { BrakePower = 0.SI<Watt>() }; + var vehicle = new MockVehicle(container) { MyVehicleSpeed = 50.KMPHtoMeterPerSecond() }; var inPort = clutch.InPort(); var outPort = new MockTnOutPort();