Merge branch 'develop' into feature/VECTO-323-pto-idle-losses
Conflicts: VECTO/File Browser/FB_Global.vb VECTO/GUI/F_VEH.Designer.vb VECTO/GUI/MainForm.vb VECTO/GUI/VehicleForm.vb VECTO/Input Files/cVEH.vb VECTO/VECTO_Types.vb VectoCore/VectoCore/InputData/Reader/ComponentData/RetarderLossMapReader.cs VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs VectoCore/VectoCore/Utils/VectoCSVFile.cs VectoCore/VectoCore/VectoCore.csproj VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
No related branches found
No related tags found
Showing
- Declaration/Body_Trailers_Weights.csv 0 additions, 12 deletionsDeclaration/Body_Trailers_Weights.csv
- Declaration/LAC-DF-Vdrop.csv 0 additions, 5 deletionsDeclaration/LAC-DF-Vdrop.csv
- Declaration/LAC-DF-Vtarget.csv 0 additions, 5 deletionsDeclaration/LAC-DF-Vtarget.csv
- Declaration/MissionCycles/Citybus_Heavy_Urban.vdri 0 additions, 30485 deletionsDeclaration/MissionCycles/Citybus_Heavy_Urban.vdri
- Declaration/MissionCycles/Citybus_Suburban.vdri 0 additions, 23506 deletionsDeclaration/MissionCycles/Citybus_Suburban.vdri
- Declaration/MissionCycles/Citybus_Urban.vdri 0 additions, 39553 deletionsDeclaration/MissionCycles/Citybus_Urban.vdri
- Declaration/MissionCycles/Coach.vdri 0 additions, 6114 deletionsDeclaration/MissionCycles/Coach.vdri
- Declaration/MissionCycles/Construction.vdri 0 additions, 486 deletionsDeclaration/MissionCycles/Construction.vdri
- Declaration/MissionCycles/HeavyUrban.vdri 0 additions, 1408 deletionsDeclaration/MissionCycles/HeavyUrban.vdri
- Declaration/MissionCycles/Interurban.vdri 0 additions, 4200 deletionsDeclaration/MissionCycles/Interurban.vdri
- Declaration/MissionCycles/Interurban_Bus.vdri 0 additions, 123592 deletionsDeclaration/MissionCycles/Interurban_Bus.vdri
- Declaration/MissionCycles/LongHaul.vdri 0 additions, 92938 deletionsDeclaration/MissionCycles/LongHaul.vdri
- Declaration/MissionCycles/Long_Haul.vdri 0 additions, 100187 deletionsDeclaration/MissionCycles/Long_Haul.vdri
- Declaration/MissionCycles/MunicipalUtility.vdri 0 additions, 504 deletionsDeclaration/MissionCycles/MunicipalUtility.vdri
- Declaration/MissionCycles/Municipal_Utility.vdri 0 additions, 9964 deletionsDeclaration/MissionCycles/Municipal_Utility.vdri
- Declaration/MissionCycles/RegionalDelivery.vdri 0 additions, 1789 deletionsDeclaration/MissionCycles/RegionalDelivery.vdri
- Declaration/MissionCycles/Regional_Delivery.vdri 0 additions, 25838 deletionsDeclaration/MissionCycles/Regional_Delivery.vdri
- Declaration/MissionCycles/Suburban.vdri 0 additions, 3695 deletionsDeclaration/MissionCycles/Suburban.vdri
- Declaration/MissionCycles/Urban.vdri 0 additions, 10062 deletionsDeclaration/MissionCycles/Urban.vdri
- Declaration/MissionCycles/UrbanDelivery.vdri 0 additions, 2036 deletionsDeclaration/MissionCycles/UrbanDelivery.vdri
Loading
Please register or sign in to comment