From 9a643bd940beaa815bc8017e97fc6a8cc2c5802d Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Wed, 25 Oct 2023 10:01:01 +0200
Subject: [PATCH] update repository
---
.../GenericVehicle_Group5_P2/Group5_HEV.vveh | 2 +-
.../GenericVehicle_Group5_P2/P2 Group 5.vecto | 2 +-
.../VectoCore/Models/Simulation/Impl/JobContainer.cs | 9 ++++++---
.../Models/Simulation/Impl/PowertrainBuilder.cs | 9 +++++----
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/Group5_HEV.vveh b/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/Group5_HEV.vveh
index 0583f60a60..32e933c064 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/Group5_HEV.vveh
+++ b/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/Group5_HEV.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2020-09-07T15:36:11.4469594Z",
+ "Date": "2021-08-30T15:57:22.3419254Z",
"AppVersion": "3",
"FileVersion": 10
},
diff --git a/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/P2 Group 5.vecto b/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/P2 Group 5.vecto
index a9afcdad2d..7115f0bfbc 100644
--- a/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/P2 Group 5.vecto
+++ b/Generic Vehicles/Engineering Mode/GenericVehicle_Group5_P2/P2 Group 5.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2020-09-07T15:36:16.4539236Z",
+ "Date": "2021-08-30T15:56:40.8506948Z",
"AppVersion": "3",
"FileVersion": 8
},
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
index 67b7788cd2..92dc66bb4f 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
@@ -93,9 +93,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
factory.JobNumber = Interlocked.Increment(ref _jobNumber);
foreach (var run in factory.SimulationRuns()) {
- var entry = new RunEntry { Run = run, JobContainer = this };
- Runs.Add(entry);
- runIDs.Add(entry.Run.RunIdentifier);
+ if (run.CycleName == "LongHaul")
+ {
+ var entry = new RunEntry { Run = run, JobContainer = this };
+ Runs.Add(entry);
+ runIDs.Add(entry.Run.RunIdentifier);
+ }
//break;
}
return runIDs;
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 9058604b88..50d40a7d9d 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -397,17 +397,18 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
HybridController ctl;
SwitchableClutch clutch = null;
+ var strategy = new FMUSimulinkModelHybridStrategy(data, container);
if (data.GearboxData.Type.ManualTransmission()) {
- var strategy = new HybridStrategy(data, container);
+ //var strategy = new HybridStrategy(data, container);
clutch = new SwitchableClutch(container, data.EngineData);
-
ctl = new HybridController(container, strategy, es);
} else {
- var strategy = new HybridStrategyAT(data, container);
-
+ //var strategy = new HybridStrategyAT(data, container);
ctl = new HybridController(container, strategy, es);
}
+ ctl = new HybridController(container, strategy, es, true);
+
// add engine before gearbox so that gearbox can obtain if an ICE is available already in constructor
var engine = new StopStartCombustionEngine(container, data.EngineData);
var gearbox = GetGearbox(container, ctl.ShiftStrategy);
--
GitLab