Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 67d253e0 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge branch 'develop' into feature/VECTO-80-convert-all-input-data-to-si-units

* develop:
  Engine-only full cycle (3950s) basically works. Open issue: initial engine state at beginning of simulation
  * extending engine model
  * additional engine-only cycle * make engine-tests work
  * renaming conversion method (VectoMath) * changing interface of IModalDataWriter back to its previous form * extending engine model
  * extending engine model, fill more result fields; * add time information to commitSimulationStep in ModalDataWriter
  adding new column to the modal output data: simulation interval [s]
  store engine power in currentState
  move engine speed into engine's state class

Conflicts:
	VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Utils/VectoMath.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs
parents efaef11a b3d840c8
No related branches found
No related tags found
No related merge requests found
Showing
with 835 additions and 371 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment