diff --git a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index d9d564d55c817ce0cb0372963ccf254c2efccf63..d557dc06cd7357aa1bc7bfbb6a14dd49972507cb 100644 --- a/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -116,7 +116,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl _currentState.EngineSpeed = engineSpeed; _currentState.AbsTime = absTime; - var requestedPower = VectoMath.ConvertRpmToPower(engineSpeed, torque); + var requestedPower = VectoMath.ConvertRpmTorqueToPower(engineSpeed, torque); var enginePowerLoss = InertiaPowerLoss(torque, engineSpeed); var requestedEnginePower = requestedPower + enginePowerLoss; diff --git a/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs b/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs index 5c5476a589693f5345d1a05d661c33e59971818b..b71342950aeeb739a15c298b0c683321b4480dfe 100644 --- a/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs +++ b/VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs @@ -62,6 +62,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent var vehicle = new VehicleContainer(); var engineData = CombustionEngineData.ReadFromFile(CoachEngine); var engine = new CombustionEngine(vehicle, engineData); + new EngineOnlyGearbox(vehicle); var port = engine.OutShaft(); var absTime = new TimeSpan(seconds: 0, minutes: 0, hours: 0); @@ -86,7 +87,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent //Assert.AreEqual(dataWriter[ModalResultField.FC], 13000); //Assert.AreEqual(dataWriter[ModalResultField.FCAUXc], 14000); //Assert.AreEqual(dataWriter[ModalResultField.FCWHTCc], 15000); - Assert.AreEqual(2.906175, dataWriter[ModalResultField.PaEng]); + Assert.AreEqual(1152.404, dataWriter[ModalResultField.PaEng]); } [DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "|DataDirectory|\\TestData\\EngineTests.csv", "EngineTests#csv", DataAccessMethod.Sequential)]