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
No related branches found
No related tags found
Showing
- VectoCore/Exceptions/VectoSimulationException.cs 1 addition, 1 deletionVectoCore/Exceptions/VectoSimulationException.cs
- VectoCore/Models/Connector/Ports/ITnOutPort.cs 8 additions, 1 deletionVectoCore/Models/Connector/Ports/ITnOutPort.cs
- VectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs 3 additions, 0 deletionsVectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs
- VectoCore/Models/Simulation/Data/IModalDataWriter.cs 3 additions, 1 deletionVectoCore/Models/Simulation/Data/IModalDataWriter.cs
- VectoCore/Models/Simulation/Data/ModalResult.cs 8 additions, 1 deletionVectoCore/Models/Simulation/Data/ModalResult.cs
- VectoCore/Models/Simulation/Impl/SimulationFactory.cs 0 additions, 1 deletionVectoCore/Models/Simulation/Impl/SimulationFactory.cs
- VectoCore/Models/Simulation/Impl/VectoJob.cs 0 additions, 1 deletionVectoCore/Models/Simulation/Impl/VectoJob.cs
- VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs 45 additions, 27 deletions...e/Models/SimulationComponent/Data/CombustionEngineData.cs
- VectoCore/Models/SimulationComponent/Data/DrivingCycleData.cs 98 additions, 84 deletions...oCore/Models/SimulationComponent/Data/DrivingCycleData.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FuelConsumptionMap.cs 23 additions, 10 deletions...els/SimulationComponent/Data/Engine/FuelConsumptionMap.cs
- VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs 70 additions, 47 deletions...e/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
- VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs 168 additions, 53 deletions...oCore/Models/SimulationComponent/Impl/CombustionEngine.cs
- VectoCore/Utils/DoubleExtensionMethods.cs 26 additions, 15 deletionsVectoCore/Utils/DoubleExtensionMethods.cs
- VectoCore/Utils/Formulas.cs 10 additions, 10 deletionsVectoCore/Utils/Formulas.cs
- VectoCore/Utils/SI.cs 208 additions, 26 deletionsVectoCore/Utils/SI.cs
- VectoCore/Utils/VectoCSVFile.cs 47 additions, 26 deletionsVectoCore/Utils/VectoCSVFile.cs
- VectoCore/Utils/VectoMath.cs 1 addition, 1 deletionVectoCore/Utils/VectoMath.cs
- VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs 68 additions, 1 deletion...reTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
- VectoCoreTest/Models/SimulationComponent/CombustionEngineTest.cs 30 additions, 65 deletions...reTest/Models/SimulationComponent/CombustionEngineTest.cs
- VectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri 18 additions, 0 deletionsVectoCoreTest/TestData/Cycles/EngineOnly_FullLoad.vdri
Loading
Please register or sign in to comment