From b033233646673b5fcecf3e3c15e75cf690582f8a Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 18 Jan 2023 17:38:06 +0100
Subject: [PATCH] regression fix after refactoring: use testpowertrain to get
fulll-load power
---
VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs | 2 +-
.../Models/SimulationComponent/Impl/HybridController.cs | 2 +-
.../Impl/Shiftstrategies/AMTShiftStrategy.cs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index f1f7084bd1..31f5be7aae 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -1512,7 +1512,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
throw new VectoException("Wrong CycleType for SimplePowertrain");
}
- var engine = new CombustionEngine(container, data.EngineData);
+ var engine = new StopStartCombustionEngine(container, data.EngineData);
vehicle.AddComponent(new Wheels(container, data.VehicleData.DynamicTyreRadius, data.VehicleData.WheelsInertia))
.AddComponent(new Brakes(container))
.AddComponent(new AxleGear(container, data.AxleGearData))
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index 0dde710412..8938ade47e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -403,7 +403,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
true);
var inAngularSpeed = outAngularVelocity * GearboxModelData.Gears[gear.Gear].Ratio;
- var fullLoadPower = DataBus.EngineInfo.EngineStationaryFullPower(response.Engine.EngineSpeed);
+ var fullLoadPower = TestPowertrain.CombustionEngine.EngineStationaryFullPower(response.Engine.EngineSpeed);
var reserve = 1 - response.Engine.PowerRequest / fullLoadPower;
var inTorque = response.Clutch.PowerRequest / inAngularSpeed;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
index 4471dd5e06..5bab4a423b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Shiftstrategies/AMTShiftStrategy.cs
@@ -165,7 +165,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
true);
var inAngularSpeed = outAngularVelocity * GearboxModelData.Gears[gear.Gear].Ratio;
- var fullLoadPower = DataBus.EngineInfo.EngineStationaryFullPower(response.Engine.EngineSpeed);
+ var fullLoadPower = TestPowertrain.CombustionEngine.EngineStationaryFullPower(response.Engine.EngineSpeed);
var reserve = 1 - response.Engine.PowerRequest / fullLoadPower;
var inTorque = response.Clutch.PowerRequest / inAngularSpeed;
--
GitLab