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
Commit 231d25c1 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-312-implement-torque-converter-model' into feature/API_adaptations

Conflicts:
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/AccelerationCurve.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TransmissionLossMap.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
parents 8584228d 32472815
Branches
Tags
No related merge requests found
Showing
with 534 additions and 303 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment