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

Skip to content
Snippets Groups Projects
Commit 787e8f00 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'feature/VECTO-390-traction-interruption-double-clutching' of...

Merge branch 'feature/VECTO-390-traction-interruption-double-clutching' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-391-add-gearbox-out-speed-torque-to

Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux_MeasuredSpeedAux.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS_MeasuredSpeedGear_AT-PS.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser_MeasuredSpeedGear_AT-Ser.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux_MeasuredSpeed_Gear_Rural_Aux.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux_MeasuredSpeed_Gear_Rural_VairAux.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair_MeasuredSpeed_Gear_Rural_Vair.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_MeasuredSpeed_Gear_Rural.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux_MeasuredSpeedVairAux.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack_MeasuredSpeedVairBack.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront_MeasuredSpeedVairFront.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind_MeasuredSpeedVairNoWind.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair_MeasuredSpeedVair.vmod
	VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed_MeasuredSpeed.vmod
	VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_Gear2_pt1_rep1_actual.vmod
	VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only1.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only2.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly_Engine Only3.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnly.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyFullLoad.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24tCoach_EngineOnlyPaux.vmod
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/EngineOnlyJob_Coach Engine Only short.vmod
	VectoCore/VectoCoreTest/TestData/Results/Integration/job_1-Gear-Test-dist.vmod
parents e8ed7548 be42a548
No related branches found
No related tags found
No related merge requests found
Showing
with 315 additions and 197 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