Merge branch 'develop' of...
Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into develop # Conflicts: # VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
No related branches found
No related tags found
Showing
- VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs 2 additions, 2 deletionsVectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
- VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs 1 addition, 1 deletionVectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs 9 additions, 1 deletion...mulationComponent/Data/ElectricMotor/ElectricMotorData.cs
- VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs 1 addition, 1 deletion...reTest/Integration/BatteryElectric/BatteryElectricTest.cs
- VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml 604 additions, 577 deletions...actorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
- VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml 0 additions, 681 deletions...on/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
Loading
Please register or sign in to comment