diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs index 57be84629f42a2f49439a60ccd7b5bad02b65a7d..73daa73282fddc587f377c0b226662d456e24e61 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/StopStartCombustionEngine.cs @@ -44,11 +44,34 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl { { if (!outTorque.IsEqual(0)) { if (dryRun) { - return new ResponseOverload(this) { - Delta = outTorque * outAngularVelocity + return new ResponseDryRun(this) { + DeltaFullLoad = outTorque * ModelData.IdleSpeed, + DeltaDragLoad = outTorque * ModelData.IdleSpeed, + Engine = { + TotalTorqueDemand = outTorque, + PowerRequest = outTorque * outAngularVelocity, + DynamicFullLoadPower = 0.SI<Watt>(), + DragPower = 0.SI<Watt>(), + EngineSpeed = 0.RPMtoRad(), + AuxiliariesPowerDemand = 0.SI<Watt>(), + }, + DeltaEngineSpeed = 0.RPMtoRad(), }; } - throw new VectoSimulationException("Combustion engine cannot supply outtorque when switched off (T_out: {0})", outTorque); + + return new ResponseOverload(this) { + Delta = outTorque * outAngularVelocity, + Engine = { + TotalTorqueDemand = outTorque, + PowerRequest = outTorque * outAngularVelocity, + DynamicFullLoadPower = 0.SI<Watt>(), + DragPower = 0.SI<Watt>(), + EngineSpeed = 0.RPMtoRad(), + AuxiliariesPowerDemand = 0.SI<Watt>(), + }, + }; + + //throw new VectoSimulationException("Combustion engine cannot supply outtorque when switched off (T_out: {0})", outTorque); } CurrentState.EngineOn = false; CurrentState.EngineSpeed = ModelData.IdleSpeed; diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs index 6c81ba20d9454e9b265a36a43fee55edfb9857d1..9e1aa9d69f10c34cc3edf9317e72997cfbc33c01 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs @@ -174,7 +174,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies CombustionEngineOn = DataBus.EngineInfo.EngineOn, MechanicalAssistPower = ElectricMotorsOff }, - FuelCosts = double.NaN + FuelCosts = double.NaN, + ICEOff = !DataBus.EngineInfo.EngineOn, }); } if (DataBus.DriverInfo.DrivingAction == DrivingAction.Brake && eval.Count == 0) {