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 0583f60a606b4767e4efefec9252b1f147a2db1e..32e933c064b35326dccec492021f7ba898b03508 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 a9afcdad2d09d8307afd18cbbfabcc91e8c13f53..7115f0bfbc800b7f93d10191ed2370d6ce485d75 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 67b7788cd262306691f8f4f7a0d4914371addca4..92dc66bb4f0745c21e7ff6ae4f70c508f91aec6c 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 9058604b88bc3b9a6b7db3d71bec77baa3addf67..50d40a7d9d97013ac23e7ea6ea4954fe460ac6f4 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);