diff --git a/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs b/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs index ff40004e03237935706c7f85bda59f6bc1ce6391..811d85d59d5067959c6bc1bff0f03c8929f578de 100644 --- a/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs +++ b/VectoCore/VectoCore/Models/Simulation/DataBus/IEngineInfo.cs @@ -54,5 +54,7 @@ namespace TUGraz.VectoCore.Models.Simulation.DataBus PerSecond EngineRatedSpeed { get; } PerSecond EngineN95hSpeed { get; } + + PerSecond EngineN80hSpeed { get; } } } \ No newline at end of file diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs index db8744b4c095771924e7ab10dcf762b73c2ab72f..e7f0816225e9e50690560264fa26d7475530df30 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs @@ -174,6 +174,11 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl get { return Engine.EngineN95hSpeed; } } + public PerSecond EngineN80hSpeed + { + get { return Engine.EngineN80hSpeed; } + } + #endregion #region IVehicleCockpit diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs index f9a3e5520b96d2902a66f455f5022bef254fc523..1009b46606557d6567b2ed72d110b75ed3d4aecb 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs @@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine private PerSecond _engineSpeedLo; // 55% of Pmax private PerSecond _engineSpeedHi; // 70% of Pmax private PerSecond _n95hSpeed; // 95% of Pmax + private PerSecond _n80hSpeed; // 80% of Pmax public static EngineFullLoadCurve ReadFromFile(string fileName, bool declarationMode = false) { @@ -94,6 +95,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Engine } } + public PerSecond N80hSpeed + { + get { return _n80hSpeed ?? (_n80hSpeed = FindEngineSpeedForPower(0.8 * MaxPower).Last()); } + } + public PerSecond N95hSpeed { get { return _n95hSpeed ?? (_n95hSpeed = FindEngineSpeedForPower(0.95 * MaxPower).Last()); } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index 983ce5cf3fcfe1a50c5df6597d71cd7b1f98a09d..bca7a14a5f3893b80c523e8eec2116c76a37dd35 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -126,6 +126,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl get { return ModelData.FullLoadCurve.N95hSpeed; } } + public PerSecond EngineN80hSpeed + { + get { return ModelData.FullLoadCurve.N80hSpeed; } + } + public ICombustionEngineIdleController IdleController { get { return EngineIdleController ?? (EngineIdleController = new CombustionEngineIdleController(this)); }