Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Verified Commit 9a643bd9 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

update repository

parent fb2eba01
No related branches found
No related tags found
No related merge requests found
{ {
"Header": { "Header": {
"CreatedBy": "", "CreatedBy": "",
"Date": "2020-09-07T15:36:11.4469594Z", "Date": "2021-08-30T15:57:22.3419254Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 10 "FileVersion": 10
}, },
......
{ {
"Header": { "Header": {
"CreatedBy": "", "CreatedBy": "",
"Date": "2020-09-07T15:36:16.4539236Z", "Date": "2021-08-30T15:56:40.8506948Z",
"AppVersion": "3", "AppVersion": "3",
"FileVersion": 8 "FileVersion": 8
}, },
......
...@@ -93,9 +93,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -93,9 +93,12 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
factory.JobNumber = Interlocked.Increment(ref _jobNumber); factory.JobNumber = Interlocked.Increment(ref _jobNumber);
foreach (var run in factory.SimulationRuns()) { foreach (var run in factory.SimulationRuns()) {
if (run.CycleName == "LongHaul")
{
var entry = new RunEntry { Run = run, JobContainer = this }; var entry = new RunEntry { Run = run, JobContainer = this };
Runs.Add(entry); Runs.Add(entry);
runIDs.Add(entry.Run.RunIdentifier); runIDs.Add(entry.Run.RunIdentifier);
}
//break; //break;
} }
return runIDs; return runIDs;
......
...@@ -397,17 +397,18 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -397,17 +397,18 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
HybridController ctl; HybridController ctl;
SwitchableClutch clutch = null; SwitchableClutch clutch = null;
var strategy = new FMUSimulinkModelHybridStrategy(data, container);
if (data.GearboxData.Type.ManualTransmission()) { if (data.GearboxData.Type.ManualTransmission()) {
var strategy = new HybridStrategy(data, container); //var strategy = new HybridStrategy(data, container);
clutch = new SwitchableClutch(container, data.EngineData); clutch = new SwitchableClutch(container, data.EngineData);
ctl = new HybridController(container, strategy, es); ctl = new HybridController(container, strategy, es);
} else { } 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);
} }
ctl = new HybridController(container, strategy, es, true);
// add engine before gearbox so that gearbox can obtain if an ICE is available already in constructor // 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 engine = new StopStartCombustionEngine(container, data.EngineData);
var gearbox = GetGearbox(container, ctl.ShiftStrategy); var gearbox = GetGearbox(container, ctl.ShiftStrategy);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment