From 4286a4de7b4a28ce70e7e9e7794c77cd6ae4c890 Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Tue, 17 Jun 2014 16:30:00 +0200
Subject: [PATCH] * Added new VCDV files for Declaration Mode. * Updated
cDeclaration and Segment Table to deal with multiple VCDV files for each
class (depending on Long Haul with or w/o Trailer) * Expanded transmission
loss maps of generic vehicles to prevent extrapolation errors
---
CHANGES.md | 8 +-
Declaration/SegmentTable.csv | 52 +--
Declaration/VCDV/CoachBus.vcdv | 27 ++
Declaration/VCDV/RigidSolo.vcdv | 27 ++
Declaration/VCDV/RigidTrailer.vcdv | 27 ++
Declaration/VCDV/TractorSemitrailer.vcdv | 27 ++
Declaration/VCDV/Truck.vcdv | 24 --
.../12t Delivery Truck/Direct Gear.vtlm | 221 ++++++-----
.../12t Delivery Truck/Indirect Gear.vtlm | 221 ++++++-----
.../40t Long Haul Truck/Direct Gear.vtlm | 374 +++++++++---------
.../40t Long Haul Truck/Indirect Gear.vtlm | 374 +++++++++---------
.../24t Coach/Direct Gear.vtlm | 341 ++++++++--------
.../24t Coach/Indirect Gear.vtlm | 341 ++++++++--------
VECTO/Input Files/cVEH.vb | 2 +-
VECTO/cDeclaration.vb | 23 +-
15 files changed, 1129 insertions(+), 960 deletions(-)
create mode 100644 Declaration/VCDV/CoachBus.vcdv
create mode 100644 Declaration/VCDV/RigidSolo.vcdv
create mode 100644 Declaration/VCDV/RigidTrailer.vcdv
create mode 100644 Declaration/VCDV/TractorSemitrailer.vcdv
delete mode 100644 Declaration/VCDV/Truck.vcdv
diff --git a/CHANGES.md b/CHANGES.md
index e79296ce3f..9cc661307b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,15 @@
### VECTO x.x (current source)
-* Alternative engine inertia power calculation (due to Torque converter calculation)
+### VECTO 2.0.2-beta2
+* AT/TC Update
+* Various smaller fixes
+### VECTO 2.0.2-beta1
+* AT/TC Update
+* Engine inertia power demand (PaEng) is now always calculated based on the previous engine speed rather than vehicle acceleration.
+* Various smaller fixes
### VECTO 2.0.1-beta1-hotfix.VECTO-33
* Fixed VECTO-34
diff --git a/Declaration/SegmentTable.csv b/Declaration/SegmentTable.csv
index e3ed046d7e..14f6a58f61 100644
--- a/Declaration/SegmentTable.csv
+++ b/Declaration/SegmentTable.csv
@@ -1,26 +1,26 @@
-Valid,tVehCat,tAxleConf,GVW_Min,GVW_Max,HDV_Class,VACC,VCDV,Rigid/Truck Axles - Long haul,Rigid/Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,LongHaul,RegionalDelivery,UrbanDelivery,MunicipalUtility,Construction,HeavyUrban,Urban,Suburban,Interurban,Coach,MassExtra - LongHaul,MassExtra - RegionalDelivery,MassExtra - UrbanDelivery,MassExtra - MunicipalUtility,MassExtra - Construction,MassExtra - HeavyUrban,MassExtra - Urban,MassExtra - Suburban,MassExtra - Interurban,MassExtra - Coach,RefLoad - LongHaul,RefLoad - RegionalDelivery,RefLoad - UrbanDelivery,RefLoad - MunicipalUtility,RefLoad - Construction,RefLoad - HeavyUrban,RefLoad - Urban,RefLoad - Suburban,RefLoad - Interurban,RefLoad - Coach,WHTCWF - LongHaul,WHTCWF - RegionalDelivery,WHTCWF - UrbanDelivery,WHTCWF - MunicipalUtility,WHTCWF - Construction,WHTCWF - HeavyUrban,WHTCWF - Urban,WHTCWF - Suburban,WHTCWF - Interurban,WHTCWF - Coach
-0,RigidTruck,4x2,0,7.5,0,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,RigidTruck,4x2,7.5,10,1,Truck.vacc,Truck.vcdv,-,45/55,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,1600,1600,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,RigidTruck,4x2,10,12,2,Truck.vacc,Truck.vcdv,40/60,45/55,0/0,0/0,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,RigidTruck,4x2,12,16,3,Truck.vacc,Truck.vcdv,-,40/60,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,2000,2000,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,RigidTruck,4x2,16,99,4,Truck.vacc,Truck.vcdv,20/30,45/55,50/2,0/0,1,1,0,1,0,0,0,0,0,0,7500,2100,-,2100,-,-,-,-,-,-,14000,4400,-,4400,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,Tractor,4x2,16,99,5,Truck.vacc,Truck.vcdv,20/25,25/25,55/3,50/3,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,4x4,7.5,16,6,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,1,1,0,0,0,0,0,-,-,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,4x4,16,99,7,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B5,-,-,-,-,-,-,-,-,-,4300,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,Tractor,4x4,16,99,8,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,RigidTruck,6x2,0,99,9,Truck.vacc,Truck.vcdv,20/30/15,35/40/25,35/2,0/0,1,1,0,1,0,0,0,0,0,0,7600,2200,-,2200,-,-,-,-,-,-,17900,7100,-,7100,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-1,Tractor,6x2,0,99,10,Truck.vacc,Truck.vcdv,15/10/20,20/10/20,55/2,50/2,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19000,12700,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,6x4,0,99,11,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B7,-,-,-,-,-,-,-,-,-,7600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,Tractor,6x4,0,99,12,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,ST2,-,-,-,-,-,-,-,-,-,12100,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,6x6,0,99,13,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,Tractor,6x6,0,99,14,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,8x2,0,99,15,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,1,0,0,0,0,0,0,0,0,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,8x4,0,99,16,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B9,-,-,-,-,-,-,-,-,-,11600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,8x6,0,99,17,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,RigidTruck,8x8,0,99,17,Truck.vacc,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,CityBus,4x2,0,18,B1,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,InterurbanBus,4x2,0,18,B2,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,Coach,4x2,0,18,B3,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,CityBus,6x2,18,99,B4,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,InterurbanBus,6x2,18,99,B5,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
-0,Coach,6x2,18,99,B6,N/A,Truck.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+Valid,tVehCat,tAxleConf,GVW_Min,GVW_Max,HDV_Class,VACC,VCDV - Long Haul,VCDV - Other,Rigid/Truck Axles - Long haul,Rigid/Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,LongHaul,RegionalDelivery,UrbanDelivery,MunicipalUtility,Construction,HeavyUrban,Urban,Suburban,Interurban,Coach,MassExtra - LongHaul,MassExtra - RegionalDelivery,MassExtra - UrbanDelivery,MassExtra - MunicipalUtility,MassExtra - Construction,MassExtra - HeavyUrban,MassExtra - Urban,MassExtra - Suburban,MassExtra - Interurban,MassExtra - Coach,RefLoad - LongHaul,RefLoad - RegionalDelivery,RefLoad - UrbanDelivery,RefLoad - MunicipalUtility,RefLoad - Construction,RefLoad - HeavyUrban,RefLoad - Urban,RefLoad - Suburban,RefLoad - Interurban,RefLoad - Coach,WHTCWF - LongHaul,WHTCWF - RegionalDelivery,WHTCWF - UrbanDelivery,WHTCWF - MunicipalUtility,WHTCWF - Construction,WHTCWF - HeavyUrban,WHTCWF - Urban,WHTCWF - Suburban,WHTCWF - Interurban,WHTCWF - Coach
+0,RigidTruck,4x2,0,7.5,0,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,RigidTruck,4x2,7.5,10,1,Truck.vacc,-,RigidSolo.vcdv,-,45/55,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,1600,1600,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,RigidTruck,4x2,10,12,2,Truck.vacc,RigidSolo.vcdv,RigidSolo.vcdv,40/60,45/55,0/0,0/0,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,RigidTruck,4x2,12,16,3,Truck.vacc,-,RigidSolo.vcdv,-,40/60,0/0,0/0,0,1,1,0,0,0,0,0,0,0,-,2000,2000,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,RigidTruck,4x2,16,99,4,Truck.vacc,RigidTrailer.vcdv,RigidSolo.vcdv,20/30,45/55,50/2,0/0,1,1,0,1,0,0,0,0,0,0,7500,2100,-,2100,-,-,-,-,-,-,14000,4400,-,4400,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,Tractor,4x2,16,99,5,Truck.vacc,TractorSemitrailer.vcdv,TractorSemitrailer.vcdv,20/25,25/25,55/3,50/3,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,4x4,7.5,16,6,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,1,1,0,0,0,0,0,-,-,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,4x4,16,99,7,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B5,-,-,-,-,-,-,-,-,-,4300,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,Tractor,4x4,16,99,8,Truck.vacc,-,TractorSemitrailer.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,RigidTruck,6x2,0,99,9,Truck.vacc,RigidTrailer.vcdv,RigidSolo.vcdv,20/30/15,35/40/25,35/2,0/0,1,1,0,1,0,0,0,0,0,0,7600,2200,-,2200,-,-,-,-,-,-,17900,7100,-,7100,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+1,Tractor,6x2,0,99,10,Truck.vacc,TractorSemitrailer.vcdv,TractorSemitrailer.vcdv,15/10/20,20/10/20,55/2,50/2,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19000,12700,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,6x4,0,99,11,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B7,-,-,-,-,-,-,-,-,-,7600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,Tractor,6x4,0,99,12,Truck.vacc,-,TractorSemitrailer.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,ST2,-,-,-,-,-,-,-,-,-,12100,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,6x6,0,99,13,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,Tractor,6x6,0,99,14,Truck.vacc,-,TractorSemitrailer.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,0,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,8x2,0,99,15,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,1,0,0,0,0,0,0,0,0,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,8x4,0,99,16,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,B9,-,-,-,-,-,-,-,-,-,11600,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,8x6,0,99,17,Truck.vacc,-,RigidSolo.vcdv,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,RigidTruck,8x8,0,99,17,Truck.vacc,-,-,???,???,0/0,0/0,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,CityBus,4x2,0,18,B1,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,InterurbanBus,4x2,0,18,B2,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,Coach,4x2,0,18,B3,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,CityBus,6x2,18,99,B4,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,InterurbanBus,6x2,18,99,B5,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
+0,Coach,6x2,18,99,B6,N/A,-,CoachBus.vcdv,???,???,0/0,0/0,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,11/0/89,17/30/53,69/27/4,98/0/2,62/32/6,100/0/0,100/0/0,100/0/0,45/36/19,0/22/78
diff --git a/Declaration/VCDV/CoachBus.vcdv b/Declaration/VCDV/CoachBus.vcdv
new file mode 100644
index 0000000000..39a23feda9
--- /dev/null
+++ b/Declaration/VCDV/CoachBus.vcdv
@@ -0,0 +1,27 @@
+# Crosswind influence on CdxA as a function of vehicle speed
+# Vehicle category: coach bus
+# Absolute yaw angle influence from ACEA Whitebook April 2014
+# Average crosswind: 3 m/s
+# Baseline CdxA assumed with: 4.68 [m²]
+v_veh [km/h],cdx_rel [-]
+0,1.16368917057624
+5,1.16368917057624
+10,1.16368917057624
+15,1.16368917057624
+20,1.16368917057624
+25,1.16368917057624
+30,1.16368917057624
+35,1.16368917057624
+40,1.16368917057624
+45,1.16368917057624
+50,1.16368917057624
+55,1.16368917057624
+60,1.16368917057624
+65,1.14636945173252
+70,1.13130108969249
+75,1.11820564231065
+80,1.10682947645795
+85,1.09694460329622
+90,1.08828107916225
+95,1.08068278133074
+100,1.07400028829548
diff --git a/Declaration/VCDV/RigidSolo.vcdv b/Declaration/VCDV/RigidSolo.vcdv
new file mode 100644
index 0000000000..934c3e5825
--- /dev/null
+++ b/Declaration/VCDV/RigidSolo.vcdv
@@ -0,0 +1,27 @@
+# Crosswind influence on CdxA as a function of vehicle speed
+# Vehicle category: rigid solo
+# Absolute yaw angle influence from ACEA Whitebook April 2014
+# Average crosswind: 3 m/s
+# Baseline CdxA assumed with: 5.3 [m²]
+v_veh [km/h],cdx_rel (v_veh) [-]
+0,1.16995889058525
+5,1.16995889058525
+10,1.16995889058525
+15,1.16995889058525
+20,1.16995889058525
+25,1.16995889058525
+30,1.16995889058525
+35,1.16995889058525
+40,1.16995889058525
+45,1.16995889058525
+50,1.16995889058525
+55,1.16995889058525
+60,1.16995889058525
+65,1.14969968431834
+70,1.13284015316129
+75,1.11867388752005
+80,1.10667545890928
+85,1.09644348982345
+90,1.08762853580613
+95,1.07999428002092
+100,1.07334468074717
diff --git a/Declaration/VCDV/RigidTrailer.vcdv b/Declaration/VCDV/RigidTrailer.vcdv
new file mode 100644
index 0000000000..205473b64f
--- /dev/null
+++ b/Declaration/VCDV/RigidTrailer.vcdv
@@ -0,0 +1,27 @@
+# Crosswind influence on CdxA as a function of vehicle speed
+# Vehicle category: rigid trailer
+# Absolute yaw angle influence from ACEA Whitebook April 2014
+# Average crosswind: 3 m/s
+# Baseline CdxA assumed with: 6.33 [m²]
+v_veh [km/h],cdx_rel (v_veh) [-]
+0,1.35547110023335
+5,1.35547110023335
+10,1.35547110023335
+15,1.35547110023335
+20,1.35547110023335
+25,1.35547110023335
+30,1.35547110023335
+35,1.35547110023335
+40,1.35547110023335
+45,1.35547110023335
+50,1.35547110023335
+55,1.35547110023335
+60,1.35547110023335
+65,1.32382413546552
+70,1.29486615012693
+75,1.26877023747113
+80,1.24548620694966
+85,1.22484426801493
+90,1.20642747216762
+95,1.19005025706557
+100,1.17548319913321
diff --git a/Declaration/VCDV/TractorSemitrailer.vcdv b/Declaration/VCDV/TractorSemitrailer.vcdv
new file mode 100644
index 0000000000..50cfff436b
--- /dev/null
+++ b/Declaration/VCDV/TractorSemitrailer.vcdv
@@ -0,0 +1,27 @@
+# Crosswind influence on CdxA as a function of vehicle speed
+# Vehicle category: tractor semitrailer
+# Absolute yaw angle influence from ACEA Whitebook April 2014
+# Average crosswind: 3 m/s
+# Baseline CdxA assumed with: 5.7 [m²]
+v_veh [km/h],cdx_rel [-]
+0,1.27614894491372
+5,1.27614894491372
+10,1.27614894491372
+15,1.27614894491372
+20,1.27614894491372
+25,1.27614894491372
+30,1.27614894491372
+35,1.27614894491372
+40,1.27614894491372
+45,1.27614894491372
+50,1.27614894491372
+55,1.27614894491372
+60,1.27614894491372
+65,1.24890735180796
+70,1.22499288657568
+75,1.20405384590645
+80,1.18574578066132
+85,1.1697448123524
+90,1.15564641074318
+95,1.14321982822533
+100,1.13223910374519
diff --git a/Declaration/VCDV/Truck.vcdv b/Declaration/VCDV/Truck.vcdv
deleted file mode 100644
index e5b122f18e..0000000000
--- a/Declaration/VCDV/Truck.vcdv
+++ /dev/null
@@ -1,24 +0,0 @@
-# Cross-wind sensitivity for rigid vehicle (Mitschke)
-# average cross wind: 3m/s
-v_veh [km/h],cdx_rel [-]
-0,1.09879105165478
-5,1.09879105165478
-10,1.09879105165478
-15,1.09879105165478
-20,1.09879105165478
-25,1.09879105165478
-30,1.09879105165478
-35,1.09879105165478
-40,1.09879105165478
-45,1.09879105165478
-50,1.09879105165478
-55,1.09879105165478
-60,1.09879105165478
-65,1.08880328691127
-70,1.08053379303156
-75,1.07361197884146
-80,1.06774118921044
-85,1.0627044915251
-90,1.05833988168619
-95,1.05452412535638
-100,1.05116194011008
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
index 356c80c87a..9f3166c05f 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
@@ -1,105 +1,118 @@
Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,3.73
-0,-150,2.73
-0,50,2.23
-0,250,3.23
-0,450,4.23
-0,650,5.23
-0,850,6.23
-0,1050,7.23
-200,-350,4.126
-200,-150,3.126
-200,50,2.626
-200,250,3.626
-200,450,4.626
-200,650,5.626
-200,850,6.626
-200,1050,7.626
-400,-350,4.522
-400,-150,3.522
-400,50,3.022
-400,250,4.022
-400,450,5.022
-400,650,6.022
-400,850,7.022
-400,1050,8.022
-600,-350,4.918
-600,-150,3.918
-600,50,3.418
-600,250,4.418
-600,450,5.418
-600,650,6.418
-600,850,7.418
-600,1050,8.418
-800,-350,5.314
-800,-150,4.314
-800,50,3.814
-800,250,4.814
-800,450,5.814
-800,650,6.814
-800,850,7.814
-800,1050,8.814
-1000,-350,5.71
-1000,-150,4.71
-1000,50,4.21
-1000,250,5.21
-1000,450,6.21
-1000,650,7.21
-1000,850,8.21
-1000,1050,9.21
-1200,-350,6.106
-1200,-150,5.106
-1200,50,4.606
-1200,250,5.606
-1200,450,6.606
-1200,650,7.606
-1200,850,8.606
-1200,1050,9.606
-1400,-350,6.502
-1400,-150,5.502
-1400,50,5.002
-1400,250,6.002
-1400,450,7.002
-1400,650,8.002
-1400,850,9.002
-1400,1050,10.002
-1600,-350,6.898
-1600,-150,5.898
-1600,50,5.398
-1600,250,6.398
-1600,450,7.398
-1600,650,8.398
-1600,850,9.398
-1600,1050,10.398
-1800,-350,7.294
-1800,-150,6.294
-1800,50,5.794
-1800,250,6.794
-1800,450,7.794
-1800,650,8.794
-1800,850,9.794
-1800,1050,10.794
-2000,-350,7.69
-2000,-150,6.69
-2000,50,6.19
-2000,250,7.19
-2000,450,8.19
-2000,650,9.19
-2000,850,10.19
-2000,1050,11.19
-2200,-350,8.086
-2200,-150,7.086
-2200,50,6.586
-2200,250,7.586
-2200,450,8.586
-2200,650,9.586
-2200,850,10.586
-2200,1050,11.586
-2400,-350,8.482
-2400,-150,7.482
-2400,50,6.982
-2400,250,7.982
-2400,450,8.982
-2400,650,9.982
-2400,850,10.982
-2400,1050,11.982
+0,-350,3.73,
+0,-150,2.73,
+0,50,2.23,
+0,250,3.23,
+0,450,4.23,
+0,650,5.23,
+0,850,6.23,
+0,1050,7.23,
+200,-350,4.126,
+200,-150,3.126,
+200,50,2.626,
+200,250,3.626,
+200,450,4.626,
+200,650,5.626,
+200,850,6.626,
+200,1050,7.626,
+400,-350,4.522,
+400,-150,3.522,
+400,50,3.022,
+400,250,4.022,
+400,450,5.022,
+400,650,6.022,
+400,850,7.022,
+400,1050,8.022,
+600,-350,4.918,
+600,-150,3.918,
+600,50,3.418,
+600,250,4.418,
+600,450,5.418,
+600,650,6.418,
+600,850,7.418,
+600,1050,8.418,
+800,-350,5.314,
+800,-150,4.314,
+800,50,3.814,
+800,250,4.814,
+800,450,5.814,
+800,650,6.814,
+800,850,7.814,
+800,1050,8.814,
+1000,-350,5.71,
+1000,-150,4.71,
+1000,50,4.21,
+1000,250,5.21,
+1000,450,6.21,
+1000,650,7.21,
+1000,850,8.21,
+1000,1050,9.21,
+1200,-350,6.106,
+1200,-150,5.106,
+1200,50,4.606,
+1200,250,5.606,
+1200,450,6.606,
+1200,650,7.606,
+1200,850,8.606,
+1200,1050,9.606,
+1400,-350,6.502,
+1400,-150,5.502,
+1400,50,5.002,
+1400,250,6.002,
+1400,450,7.002,
+1400,650,8.002,
+1400,850,9.002,
+1400,1050,10.002,
+1600,-350,6.898,
+1600,-150,5.898,
+1600,50,5.398,
+1600,250,6.398,
+1600,450,7.398,
+1600,650,8.398,
+1600,850,9.398,
+1600,1050,10.398,
+1800,-350,7.294,
+1800,-150,6.294,
+1800,50,5.794,
+1800,250,6.794,
+1800,450,7.794,
+1800,650,8.794,
+1800,850,9.794,
+1800,1050,10.794,
+2000,-350,7.69,
+2000,-150,6.69,
+2000,50,6.19,
+2000,250,7.19,
+2000,450,8.19,
+2000,650,9.19,
+2000,850,10.19,
+2000,1050,11.19,
+2200,-350,8.086,
+2200,-150,7.086,
+2200,50,6.586,
+2200,250,7.586,
+2200,450,8.586,
+2200,650,9.586,
+2200,850,10.586,
+2200,1050,11.586,
+2400,-350,8.482,
+2400,-150,7.482,
+2400,50,6.982,
+2400,250,7.982,
+2400,450,8.982,
+2400,650,9.982,
+2400,850,10.982,
+2400,1050,11.982,
+0,-1000,6.98,
+200,-1000,7.376,
+400,-1000,7.772,
+600,-1000,8.168,
+800,-1000,8.564,
+1000,-1000,8.96,
+1200,-1000,9.356,
+1400,-1000,9.752,
+1600,-1000,10.148,
+1800,-1000,10.544,
+2000,-1000,10.94,
+2200,-1000,11.336,
+2400,-1000,11.732,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
index e6e0c5093c..af2f2572aa 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
@@ -1,105 +1,118 @@
Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,8.98
-0,-150,4.98
-0,50,2.98
-0,250,6.98
-0,450,10.98
-0,650,14.98
-0,850,18.98
-0,1050,22.98
-200,-350,9.376
-200,-150,5.376
-200,50,3.376
-200,250,7.376
-200,450,11.376
-200,650,15.376
-200,850,19.376
-200,1050,23.376
-400,-350,9.772
-400,-150,5.772
-400,50,3.772
-400,250,7.772
-400,450,11.772
-400,650,15.772
-400,850,19.772
-400,1050,23.772
-600,-350,10.168
-600,-150,6.168
-600,50,4.168
-600,250,8.168
-600,450,12.168
-600,650,16.168
-600,850,20.168
-600,1050,24.168
-800,-350,10.564
-800,-150,6.564
-800,50,4.564
-800,250,8.564
-800,450,12.564
-800,650,16.564
-800,850,20.564
-800,1050,24.564
-1000,-350,10.96
-1000,-150,6.96
-1000,50,4.96
-1000,250,8.96
-1000,450,12.96
-1000,650,16.96
-1000,850,20.96
-1000,1050,24.96
-1200,-350,11.356
-1200,-150,7.356
-1200,50,5.356
-1200,250,9.356
-1200,450,13.356
-1200,650,17.356
-1200,850,21.356
-1200,1050,25.356
-1400,-350,11.752
-1400,-150,7.752
-1400,50,5.752
-1400,250,9.752
-1400,450,13.752
-1400,650,17.752
-1400,850,21.752
-1400,1050,25.752
-1600,-350,12.148
-1600,-150,8.148
-1600,50,6.148
-1600,250,10.148
-1600,450,14.148
-1600,650,18.148
-1600,850,22.148
-1600,1050,26.148
-1800,-350,12.544
-1800,-150,8.544
-1800,50,6.544
-1800,250,10.544
-1800,450,14.544
-1800,650,18.544
-1800,850,22.544
-1800,1050,26.544
-2000,-350,12.94
-2000,-150,8.94
-2000,50,6.94
-2000,250,10.94
-2000,450,14.94
-2000,650,18.94
-2000,850,22.94
-2000,1050,26.94
-2200,-350,13.336
-2200,-150,9.336
-2200,50,7.336
-2200,250,11.336
-2200,450,15.336
-2200,650,19.336
-2200,850,23.336
-2200,1050,27.336
-2400,-350,13.732
-2400,-150,9.732
-2400,50,7.732
-2400,250,11.732
-2400,450,15.732
-2400,650,19.732
-2400,850,23.732
-2400,1050,27.732
+0,-350,8.98,
+0,-150,4.98,
+0,50,2.98,
+0,250,6.98,
+0,450,10.98,
+0,650,14.98,
+0,850,18.98,
+0,1050,22.98,
+200,-350,9.376,
+200,-150,5.376,
+200,50,3.376,
+200,250,7.376,
+200,450,11.376,
+200,650,15.376,
+200,850,19.376,
+200,1050,23.376,
+400,-350,9.772,
+400,-150,5.772,
+400,50,3.772,
+400,250,7.772,
+400,450,11.772,
+400,650,15.772,
+400,850,19.772,
+400,1050,23.772,
+600,-350,10.168,
+600,-150,6.168,
+600,50,4.168,
+600,250,8.168,
+600,450,12.168,
+600,650,16.168,
+600,850,20.168,
+600,1050,24.168,
+800,-350,10.564,
+800,-150,6.564,
+800,50,4.564,
+800,250,8.564,
+800,450,12.564,
+800,650,16.564,
+800,850,20.564,
+800,1050,24.564,
+1000,-350,10.96,
+1000,-150,6.96,
+1000,50,4.96,
+1000,250,8.96,
+1000,450,12.96,
+1000,650,16.96,
+1000,850,20.96,
+1000,1050,24.96,
+1200,-350,11.356,
+1200,-150,7.356,
+1200,50,5.356,
+1200,250,9.356,
+1200,450,13.356,
+1200,650,17.356,
+1200,850,21.356,
+1200,1050,25.356,
+1400,-350,11.752,
+1400,-150,7.752,
+1400,50,5.752,
+1400,250,9.752,
+1400,450,13.752,
+1400,650,17.752,
+1400,850,21.752,
+1400,1050,25.752,
+1600,-350,12.148,
+1600,-150,8.148,
+1600,50,6.148,
+1600,250,10.148,
+1600,450,14.148,
+1600,650,18.148,
+1600,850,22.148,
+1600,1050,26.148,
+1800,-350,12.544,
+1800,-150,8.544,
+1800,50,6.544,
+1800,250,10.544,
+1800,450,14.544,
+1800,650,18.544,
+1800,850,22.544,
+1800,1050,26.544,
+2000,-350,12.94,
+2000,-150,8.94,
+2000,50,6.94,
+2000,250,10.94,
+2000,450,14.94,
+2000,650,18.94,
+2000,850,22.94,
+2000,1050,26.94,
+2200,-350,13.336,
+2200,-150,9.336,
+2200,50,7.336,
+2200,250,11.336,
+2200,450,15.336,
+2200,650,19.336,
+2200,850,23.336,
+2200,1050,27.336,
+2400,-350,13.732,
+2400,-150,9.732,
+2400,50,7.732,
+2400,250,11.732,
+2400,450,15.732,
+2400,650,19.732,
+2400,850,23.732,
+2400,1050,27.732,
+0,-1000,21.98,
+200,-1000,22.376,
+400,-1000,22.772,
+600,-1000,23.168,
+800,-1000,23.564,
+1000,-1000,23.96,
+1200,-1000,24.356,
+1400,-1000,24.752,
+1600,-1000,25.148,
+1800,-1000,25.544,
+2000,-1000,25.94,
+2200,-1000,26.336,
+2400,-1000,26.732,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
index 167c31491b..938654e43e 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
@@ -1,181 +1,193 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,6.81,0.980914212045627
-0,-150,5.81,0.962710994159553
-0,50,5.31,0.8938
-0,250,6.31,0.97476
-0,450,7.31,0.983755555555556
-0,650,8.31,0.987215384615385
-0,850,9.31,0.98904705882353
-0,1050,10.31,0.990180952380952
-0,1250,11.31,0.990952
-0,1450,12.31,0.991510344827586
-0,1650,13.31,0.991933333333333
-0,1850,14.31,0.992264864864865
-0,2050,15.31,0.992531707317073
-0,2250,16.31,0.992751111111111
-0,2450,17.31,0.992934693877551
-100,-350,7.316,0.979525126218809
-100,-150,6.316,0.959594667212569
-100,50,5.816,0.88368
-100,250,6.816,0.972736
-100,450,7.816,0.982631111111111
-100,650,8.816,0.986436923076923
-100,850,9.816,0.988451764705882
-100,1050,10.816,0.989699047619048
-100,1250,11.816,0.9905472
-100,1450,12.816,0.991161379310345
-100,1650,13.816,0.991626666666667
-100,1850,14.816,0.991991351351351
-100,2050,15.816,0.992284878048781
-100,2250,16.816,0.992526222222222
-100,2450,17.816,0.992728163265306
-300,-350,8.328,0.976758723850774
-300,-150,7.328,0.953422149903387
-300,50,6.828,0.86344
-300,250,7.828,0.968688
-300,450,8.828,0.980382222222222
-300,650,9.828,0.98488
-300,850,10.828,0.987261176470588
-300,1050,11.828,0.988735238095238
-300,1250,12.828,0.9897376
-300,1450,13.828,0.990463448275862
-300,1650,14.828,0.991013333333333
-300,1850,15.828,0.991444324324324
-300,2050,16.828,0.991791219512195
-300,2250,17.828,0.992076444444444
-300,2450,18.828,0.992315102040816
-500,-350,9.34,0.974007903378416
-500,-150,8.34,0.94732853353543
-500,50,7.84,0.8432
-500,250,8.84,0.96464
-500,450,9.84,0.978133333333333
-500,650,10.84,0.983323076923077
-500,850,11.84,0.986070588235294
-500,1050,12.84,0.987771428571429
-500,1250,13.84,0.988928
-500,1450,14.84,0.989765517241379
-500,1650,15.84,0.9904
-500,1850,16.84,0.990897297297297
-500,2050,17.84,0.99129756097561
-500,2250,18.84,0.991626666666667
-500,2450,19.84,0.991902040816326
-700,-350,10.352,0.971272533522778
-700,-150,9.352,0.941312314875245
-700,50,8.852,0.82296
-700,250,9.852,0.960592
-700,450,10.852,0.975884444444445
-700,650,11.852,0.981766153846154
-700,850,12.852,0.98488
-700,1050,13.852,0.986807619047619
-700,1250,14.852,0.9881184
-700,1450,15.852,0.989067586206897
-700,1650,16.852,0.989786666666667
-700,1850,17.852,0.99035027027027
-700,2050,18.852,0.990803902439024
-700,2250,19.852,0.991176888888889
-700,2450,20.852,0.991488979591837
-900,-350,11.364,0.968552484475487
-900,-150,10.364,0.935372028634856
-900,50,9.864,0.80272
-900,250,10.864,0.956544
-900,450,11.864,0.973635555555556
-900,650,12.864,0.980209230769231
-900,850,13.864,0.983689411764706
-900,1050,14.864,0.985843809523809
-900,1250,15.864,0.9873088
-900,1450,16.864,0.988369655172414
-900,1650,17.864,0.989173333333333
-900,1850,18.864,0.989803243243243
-900,2050,19.864,0.990310243902439
-900,2250,20.864,0.990727111111111
-900,2450,21.864,0.991075918367347
-1100,-350,12.376,0.965847627878226
-1100,-150,11.376,0.929506246281975
-1100,50,10.876,0.78248
-1100,250,11.876,0.952496
-1100,450,12.876,0.971386666666667
-1100,650,13.876,0.978652307692308
-1100,850,14.876,0.982498823529412
-1100,1050,15.876,0.98488
-1100,1250,16.876,0.9864992
-1100,1450,17.876,0.987671724137931
-1100,1650,18.876,0.98856
-1100,1850,19.876,0.989256216216216
-1100,2050,20.876,0.989816585365854
-1100,2250,21.876,0.990277333333333
-1100,2450,22.876,0.990662857142857
-1300,-350,13.388,0.963157836802536
-1300,-150,12.388,0.923713574894697
-1300,50,11.888,0.76224
-1300,250,12.888,0.948448
-1300,450,13.888,0.969137777777778
-1300,650,14.888,0.977095384615385
-1300,850,15.888,0.981308235294118
-1300,1050,16.888,0.983916190476191
-1300,1250,17.888,0.9856896
-1300,1450,18.888,0.986973793103448
-1300,1650,19.888,0.987946666666667
-1300,1850,20.888,0.988709189189189
-1300,2050,21.888,0.989322926829268
-1300,2250,22.888,0.989827555555556
-1300,2450,23.888,0.990249795918367
-1500,-350,14.4,0.960482985729967
-1500,-150,13.4,0.917992656058751
-1500,50,12.9,0.742
-1500,250,13.9,0.9444
-1500,450,14.9,0.966888888888889
-1500,650,15.9,0.975538461538462
-1500,850,16.9,0.980117647058824
-1500,1050,17.9,0.982952380952381
-1500,1250,18.9,0.98488
-1500,1450,19.9,0.986275862068965
-1500,1650,20.9,0.987333333333333
-1500,1850,21.9,0.988162162162162
-1500,2050,22.9,0.988829268292683
-1500,2250,23.9,0.989377777777778
-1500,2450,24.9,0.989836734693878
-1700,-350,15.412,0.95782295053255
-1700,-150,14.412,0.912342164805489
-1700,50,13.912,0.72176
-1700,250,14.912,0.940352
-1700,450,15.912,0.96464
-1700,650,16.912,0.973981538461538
-1700,850,17.912,0.978927058823529
-1700,1050,18.912,0.981988571428571
-1700,1250,19.912,0.9840704
-1700,1450,20.912,0.985577931034483
-1700,1650,21.912,0.98672
-1700,1850,22.912,0.987615135135135
-1700,2050,23.912,0.988335609756098
-1700,2250,24.912,0.988928
-1700,2450,25.912,0.989423673469388
-1900,-350,16.424,0.955177608453595
-1900,-150,15.424,0.906760808588838
-1900,50,14.924,0.70152
-1900,250,15.924,0.936304
-1900,450,16.924,0.962391111111111
-1900,650,17.924,0.972424615384615
-1900,850,18.924,0.977736470588235
-1900,1050,19.924,0.981024761904762
-1900,1250,20.924,0.9832608
-1900,1450,21.924,0.98488
-1900,1650,22.924,0.986106666666667
-1900,1850,23.924,0.987068108108108
-1900,2050,24.924,0.987841951219512
-1900,2250,25.924,0.988478222222222
-1900,2450,26.924,0.989010612244898
-2100,-350,17.436,0.95254683808881
-2100,-150,16.436,0.901247326299599
-2100,50,15.936,0.68128
-2100,250,16.936,0.932256
-2100,450,17.936,0.960142222222222
-2100,650,18.936,0.970867692307692
-2100,850,19.936,0.976545882352941
-2100,1050,20.936,0.980060952380952
-2100,1250,21.936,0.9824512
-2100,1450,22.936,0.984182068965517
-2100,1650,23.936,0.985493333333333
-2100,1850,24.936,0.986521081081081
-2100,2050,25.936,0.987348292682927
-2100,2250,26.936,0.988028444444444
-2100,2450,27.936,0.988597551020408
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-350,6.81
+0,-150,5.81
+0,50,5.31
+0,250,6.31
+0,450,7.31
+0,650,8.31
+0,850,9.31
+0,1050,10.31
+0,1250,11.31
+0,1450,12.31
+0,1650,13.31
+0,1850,14.31
+0,2050,15.31
+0,2250,16.31
+0,2450,17.31
+100,-350,7.316
+100,-150,6.316
+100,50,5.816
+100,250,6.816
+100,450,7.816
+100,650,8.816
+100,850,9.816
+100,1050,10.816
+100,1250,11.816
+100,1450,12.816
+100,1650,13.816
+100,1850,14.816
+100,2050,15.816
+100,2250,16.816
+100,2450,17.816
+300,-350,8.328
+300,-150,7.328
+300,50,6.828
+300,250,7.828
+300,450,8.828
+300,650,9.828
+300,850,10.828
+300,1050,11.828
+300,1250,12.828
+300,1450,13.828
+300,1650,14.828
+300,1850,15.828
+300,2050,16.828
+300,2250,17.828
+300,2450,18.828
+500,-350,9.34
+500,-150,8.34
+500,50,7.84
+500,250,8.84
+500,450,9.84
+500,650,10.84
+500,850,11.84
+500,1050,12.84
+500,1250,13.84
+500,1450,14.84
+500,1650,15.84
+500,1850,16.84
+500,2050,17.84
+500,2250,18.84
+500,2450,19.84
+700,-350,10.352
+700,-150,9.352
+700,50,8.852
+700,250,9.852
+700,450,10.852
+700,650,11.852
+700,850,12.852
+700,1050,13.852
+700,1250,14.852
+700,1450,15.852
+700,1650,16.852
+700,1850,17.852
+700,2050,18.852
+700,2250,19.852
+700,2450,20.852
+900,-350,11.364
+900,-150,10.364
+900,50,9.864
+900,250,10.864
+900,450,11.864
+900,650,12.864
+900,850,13.864
+900,1050,14.864
+900,1250,15.864
+900,1450,16.864
+900,1650,17.864
+900,1850,18.864
+900,2050,19.864
+900,2250,20.864
+900,2450,21.864
+1100,-350,12.376
+1100,-150,11.376
+1100,50,10.876
+1100,250,11.876
+1100,450,12.876
+1100,650,13.876
+1100,850,14.876
+1100,1050,15.876
+1100,1250,16.876
+1100,1450,17.876
+1100,1650,18.876
+1100,1850,19.876
+1100,2050,20.876
+1100,2250,21.876
+1100,2450,22.876
+1300,-350,13.388
+1300,-150,12.388
+1300,50,11.888
+1300,250,12.888
+1300,450,13.888
+1300,650,14.888
+1300,850,15.888
+1300,1050,16.888
+1300,1250,17.888
+1300,1450,18.888
+1300,1650,19.888
+1300,1850,20.888
+1300,2050,21.888
+1300,2250,22.888
+1300,2450,23.888
+1500,-350,14.4
+1500,-150,13.4
+1500,50,12.9
+1500,250,13.9
+1500,450,14.9
+1500,650,15.9
+1500,850,16.9
+1500,1050,17.9
+1500,1250,18.9
+1500,1450,19.9
+1500,1650,20.9
+1500,1850,21.9
+1500,2050,22.9
+1500,2250,23.9
+1500,2450,24.9
+1700,-350,15.412
+1700,-150,14.412
+1700,50,13.912
+1700,250,14.912
+1700,450,15.912
+1700,650,16.912
+1700,850,17.912
+1700,1050,18.912
+1700,1250,19.912
+1700,1450,20.912
+1700,1650,21.912
+1700,1850,22.912
+1700,2050,23.912
+1700,2250,24.912
+1700,2450,25.912
+1900,-350,16.424
+1900,-150,15.424
+1900,50,14.924
+1900,250,15.924
+1900,450,16.924
+1900,650,17.924
+1900,850,18.924
+1900,1050,19.924
+1900,1250,20.924
+1900,1450,21.924
+1900,1650,22.924
+1900,1850,23.924
+1900,2050,24.924
+1900,2250,25.924
+1900,2450,26.924
+2100,-350,17.436
+2100,-150,16.436
+2100,50,15.936
+2100,250,16.936
+2100,450,17.936
+2100,650,18.936
+2100,850,19.936
+2100,1050,20.936
+2100,1250,21.936
+2100,1450,22.936
+2100,1650,23.936
+2100,1850,24.936
+2100,2050,25.936
+2100,2250,26.936
+2100,2450,27.936
+0,-1000,10.06
+100,-1000,10.566
+300,-1000,11.578
+500,-1000,12.59
+700,-1000,13.602
+900,-1000,14.614
+1100,-1000,15.626
+1300,-1000,16.638
+1500,-1000,17.65
+1700,-1000,18.662
+1900,-1000,19.674
+2100,-1000,20.686
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
index ab5887932f..e92c034837 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
@@ -1,181 +1,193 @@
-Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,12.06,0.966690603767331
-0,-150,8.06,0.949006706314058
-0,50,6.06,0.8788
-0,250,10.06,0.95976
-0,450,14.06,0.968755555555556
-0,650,18.06,0.972215384615385
-0,850,22.06,0.974047058823529
-0,1050,26.06,0.975180952380952
-0,1250,30.06,0.975952
-0,1450,34.06,0.976510344827586
-0,1650,38.06,0.976933333333333
-0,1850,42.06,0.977264864864865
-0,2050,46.06,0.977531707317073
-0,2250,50.06,0.977751111111111
-0,2450,54.06,0.977934693877551
-100,-350,12.566,0.965341482654193
-100,-150,8.566,0.945978330789703
-100,50,6.566,0.86868
-100,250,10.566,0.957736
-100,450,14.566,0.967631111111111
-100,650,18.566,0.971436923076923
-100,850,22.566,0.973451764705882
-100,1050,26.566,0.974699047619048
-100,1250,30.566,0.9755472
-100,1450,34.566,0.976161379310345
-100,1650,38.566,0.976626666666667
-100,1850,42.566,0.976991351351351
-100,2050,46.566,0.977284878048781
-100,2250,50.566,0.977526222222222
-100,2450,54.566,0.977728163265306
-300,-350,13.578,0.962654506048221
-300,-150,9.578,0.939979195127148
-300,50,7.578,0.84844
-300,250,11.578,0.953688
-300,450,15.578,0.965382222222222
-300,650,19.578,0.96988
-300,850,23.578,0.972261176470588
-300,1050,27.578,0.973735238095238
-300,1250,31.578,0.9747376
-300,1450,35.578,0.975463448275862
-300,1650,39.578,0.976013333333333
-300,1850,43.578,0.976444324324324
-300,2050,47.578,0.976791219512195
-300,2250,51.578,0.977076444444444
-300,2450,55.578,0.977315102040816
-500,-350,14.59,0.959982446035273
-500,-150,10.59,0.934055669717915
-500,50,8.59,0.8282
-500,250,12.59,0.94964
-500,450,16.59,0.963133333333333
-500,650,20.59,0.968323076923077
-500,850,24.59,0.971070588235294
-500,1050,28.59,0.972771428571429
-500,1250,32.59,0.973928
-500,1450,36.59,0.974765517241379
-500,1650,40.59,0.9754
-500,1850,44.59,0.975897297297297
-500,2050,48.59,0.97629756097561
-500,2250,52.59,0.976626666666667
-500,2450,56.59,0.976902040816326
-700,-350,15.602,0.957325178746287
-700,-150,11.602,0.928206334080024
-700,50,9.602,0.80796
-700,250,13.602,0.945592
-700,450,17.602,0.960884444444445
-700,650,21.602,0.966766153846154
-700,850,25.602,0.96988
-700,1050,29.602,0.971807619047619
-700,1250,33.602,0.9731184
-700,1450,37.602,0.974067586206896
-700,1650,41.602,0.974786666666667
-700,1850,45.602,0.97535027027027
-700,2050,49.602,0.975803902439024
-700,2250,53.602,0.976176888888889
-700,2450,57.602,0.976488979591837
-900,-350,16.614,0.954682581679914
-900,-150,12.614,0.922429803091985
-900,50,10.614,0.78772
-900,250,14.614,0.941544
-900,450,18.614,0.958635555555556
-900,650,22.614,0.965209230769231
-900,850,26.614,0.968689411764706
-900,1050,30.614,0.970843809523809
-900,1250,34.614,0.9723088
-900,1450,38.614,0.973369655172414
-900,1650,42.614,0.974173333333333
-900,1850,46.614,0.974803243243243
-900,2050,50.614,0.975310243902439
-900,2250,54.614,0.975727111111111
-900,2450,58.614,0.976075918367347
-1100,-350,17.626,0.952054533683689
-1100,-150,13.626,0.916724725899307
-1100,50,11.626,0.76748
-1100,250,15.626,0.937496
-1100,450,19.626,0.956386666666667
-1100,650,23.626,0.963652307692308
-1100,850,27.626,0.967498823529412
-1100,1050,31.626,0.96988
-1100,1250,35.626,0.9714992
-1100,1450,39.626,0.972671724137931
-1100,1650,43.626,0.97356
-1100,1850,47.626,0.974256216216216
-1100,2050,51.626,0.974816585365854
-1100,2250,55.626,0.975277333333333
-1100,2450,59.626,0.975662857142857
-1300,-350,18.638,0.949440914935519
-1300,-150,14.638,0.911089784861332
-1300,50,12.638,0.74724
-1300,250,16.638,0.933448
-1300,450,20.638,0.954137777777778
-1300,650,24.638,0.962095384615385
-1300,850,28.638,0.966308235294118
-1300,1050,32.638,0.96891619047619
-1300,1250,36.638,0.9706896
-1300,1450,40.638,0.971973793103448
-1300,1650,44.638,0.972946666666667
-1300,1850,48.638,0.973709189189189
-1300,2050,52.638,0.974322926829268
-1300,2250,56.638,0.974827555555556
-1300,2450,60.638,0.975249795918367
-1500,-350,19.65,0.94684160692547
-1500,-150,15.65,0.905523694536674
-1500,50,13.65,0.727
-1500,250,17.65,0.9294
-1500,450,21.65,0.951888888888889
-1500,650,25.65,0.960538461538462
-1500,850,29.65,0.965117647058824
-1500,1050,33.65,0.967952380952381
-1500,1250,37.65,0.96988
-1500,1450,41.65,0.971275862068965
-1500,1650,45.65,0.972333333333333
-1500,1850,49.65,0.973162162162162
-1500,2050,53.65,0.973829268292683
-1500,2250,57.65,0.974377777777778
-1500,2450,61.65,0.974836734693878
-1700,-350,20.662,0.944256492437854
-1700,-150,16.662,0.90002520070562
-1700,50,14.662,0.70676
-1700,250,18.662,0.925352
-1700,450,22.662,0.94964
-1700,650,26.662,0.958981538461538
-1700,850,30.662,0.963927058823529
-1700,1050,34.662,0.966988571428571
-1700,1250,38.662,0.9690704
-1700,1450,42.662,0.970577931034483
-1700,1650,46.662,0.97172
-1700,1850,50.662,0.972615135135135
-1700,2050,54.662,0.973335609756098
-1700,2250,58.662,0.973928
-1700,2450,62.662,0.974423673469388
-1900,-350,21.674,0.941685455533613
-1900,-150,17.674,0.894593079427938
-1900,50,15.674,0.68652
-1900,250,19.674,0.921304
-1900,450,23.674,0.947391111111111
-1900,650,27.674,0.957424615384615
-1900,850,31.674,0.962736470588235
-1900,1050,35.674,0.966024761904762
-1900,1250,39.674,0.9682608
-1900,1450,43.674,0.96988
-1900,1650,47.674,0.971106666666667
-1900,1850,51.674,0.972068108108108
-1900,2050,55.674,0.972841951219512
-1900,2250,59.674,0.973478222222222
-1900,2450,63.674,0.974010612244898
-2100,-350,22.686,0.93912838153298
-2100,-150,18.686,0.889226136134593
-2100,50,16.686,0.66628
-2100,250,20.686,0.917256
-2100,450,24.686,0.945142222222222
-2100,650,28.686,0.955867692307692
-2100,850,32.686,0.961545882352941
-2100,1050,36.686,0.965060952380952
-2100,1250,40.686,0.9674512
-2100,1450,44.686,0.969182068965517
-2100,1650,48.686,0.970493333333333
-2100,1850,52.686,0.971521081081081
-2100,2050,56.686,0.972348292682927
-2100,2250,60.686,0.973028444444444
-2100,2450,64.686,0.973597551020408
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-350,12.06
+0,-150,8.06
+0,50,6.06
+0,250,10.06
+0,450,14.06
+0,650,18.06
+0,850,22.06
+0,1050,26.06
+0,1250,30.06
+0,1450,34.06
+0,1650,38.06
+0,1850,42.06
+0,2050,46.06
+0,2250,50.06
+0,2450,54.06
+100,-350,12.566
+100,-150,8.566
+100,50,6.566
+100,250,10.566
+100,450,14.566
+100,650,18.566
+100,850,22.566
+100,1050,26.566
+100,1250,30.566
+100,1450,34.566
+100,1650,38.566
+100,1850,42.566
+100,2050,46.566
+100,2250,50.566
+100,2450,54.566
+300,-350,13.578
+300,-150,9.578
+300,50,7.578
+300,250,11.578
+300,450,15.578
+300,650,19.578
+300,850,23.578
+300,1050,27.578
+300,1250,31.578
+300,1450,35.578
+300,1650,39.578
+300,1850,43.578
+300,2050,47.578
+300,2250,51.578
+300,2450,55.578
+500,-350,14.59
+500,-150,10.59
+500,50,8.59
+500,250,12.59
+500,450,16.59
+500,650,20.59
+500,850,24.59
+500,1050,28.59
+500,1250,32.59
+500,1450,36.59
+500,1650,40.59
+500,1850,44.59
+500,2050,48.59
+500,2250,52.59
+500,2450,56.59
+700,-350,15.602
+700,-150,11.602
+700,50,9.602
+700,250,13.602
+700,450,17.602
+700,650,21.602
+700,850,25.602
+700,1050,29.602
+700,1250,33.602
+700,1450,37.602
+700,1650,41.602
+700,1850,45.602
+700,2050,49.602
+700,2250,53.602
+700,2450,57.602
+900,-350,16.614
+900,-150,12.614
+900,50,10.614
+900,250,14.614
+900,450,18.614
+900,650,22.614
+900,850,26.614
+900,1050,30.614
+900,1250,34.614
+900,1450,38.614
+900,1650,42.614
+900,1850,46.614
+900,2050,50.614
+900,2250,54.614
+900,2450,58.614
+1100,-350,17.626
+1100,-150,13.626
+1100,50,11.626
+1100,250,15.626
+1100,450,19.626
+1100,650,23.626
+1100,850,27.626
+1100,1050,31.626
+1100,1250,35.626
+1100,1450,39.626
+1100,1650,43.626
+1100,1850,47.626
+1100,2050,51.626
+1100,2250,55.626
+1100,2450,59.626
+1300,-350,18.638
+1300,-150,14.638
+1300,50,12.638
+1300,250,16.638
+1300,450,20.638
+1300,650,24.638
+1300,850,28.638
+1300,1050,32.638
+1300,1250,36.638
+1300,1450,40.638
+1300,1650,44.638
+1300,1850,48.638
+1300,2050,52.638
+1300,2250,56.638
+1300,2450,60.638
+1500,-350,19.65
+1500,-150,15.65
+1500,50,13.65
+1500,250,17.65
+1500,450,21.65
+1500,650,25.65
+1500,850,29.65
+1500,1050,33.65
+1500,1250,37.65
+1500,1450,41.65
+1500,1650,45.65
+1500,1850,49.65
+1500,2050,53.65
+1500,2250,57.65
+1500,2450,61.65
+1700,-350,20.662
+1700,-150,16.662
+1700,50,14.662
+1700,250,18.662
+1700,450,22.662
+1700,650,26.662
+1700,850,30.662
+1700,1050,34.662
+1700,1250,38.662
+1700,1450,42.662
+1700,1650,46.662
+1700,1850,50.662
+1700,2050,54.662
+1700,2250,58.662
+1700,2450,62.662
+1900,-350,21.674
+1900,-150,17.674
+1900,50,15.674
+1900,250,19.674
+1900,450,23.674
+1900,650,27.674
+1900,850,31.674
+1900,1050,35.674
+1900,1250,39.674
+1900,1450,43.674
+1900,1650,47.674
+1900,1850,51.674
+1900,2050,55.674
+1900,2250,59.674
+1900,2450,63.674
+2100,-350,22.686
+2100,-150,18.686
+2100,50,16.686
+2100,250,20.686
+2100,450,24.686
+2100,650,28.686
+2100,850,32.686
+2100,1050,36.686
+2100,1250,40.686
+2100,1450,44.686
+2100,1650,48.686
+2100,1850,52.686
+2100,2050,56.686
+2100,2250,60.686
+2100,2450,64.686
+0,-1000,25.06
+100,-1000,25.566
+300,-1000,26.578
+500,-1000,27.59
+700,-1000,28.602
+900,-1000,29.614
+1100,-1000,30.626
+1300,-1000,31.638
+1500,-1000,32.65
+1700,-1000,33.662
+1900,-1000,34.674
+2100,-1000,35.686
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
index e66778097f..f01578ad9e 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Direct Gear.vtlm
@@ -1,166 +1,177 @@
Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,6.81
-0,-150,5.81
-0,50,5.31
-0,250,6.31
-0,450,7.31
-0,650,8.31
-0,850,9.31
-0,1050,10.31
-0,1250,11.31
-0,1450,12.31
-0,1650,13.31
-0,1850,14.31
-0,2050,15.31
-0,2250,16.31
-0,2450,17.31
-200,-350,7.822
-200,-150,6.822
-200,50,6.322
-200,250,7.322
-200,450,8.322
-200,650,9.322
-200,850,10.322
-200,1050,11.322
-200,1250,12.322
-200,1450,13.322
-200,1650,14.322
-200,1850,15.322
-200,2050,16.322
-200,2250,17.322
-200,2450,18.322
-400,-350,8.834
-400,-150,7.834
-400,50,7.334
-400,250,8.334
-400,450,9.334
-400,650,10.334
-400,850,11.334
-400,1050,12.334
-400,1250,13.334
-400,1450,14.334
-400,1650,15.334
-400,1850,16.334
-400,2050,17.334
-400,2250,18.334
-400,2450,19.334
-600,-350,9.846
-600,-150,8.846
-600,50,8.346
-600,250,9.346
-600,450,10.346
-600,650,11.346
-600,850,12.346
-600,1050,13.346
-600,1250,14.346
-600,1450,15.346
-600,1650,16.346
-600,1850,17.346
-600,2050,18.346
-600,2250,19.346
-600,2450,20.346
-800,-350,10.858
-800,-150,9.858
-800,50,9.358
-800,250,10.358
-800,450,11.358
-800,650,12.358
-800,850,13.358
-800,1050,14.358
-800,1250,15.358
-800,1450,16.358
-800,1650,17.358
-800,1850,18.358
-800,2050,19.358
-800,2250,20.358
-800,2450,21.358
-1000,-350,11.87
-1000,-150,10.87
-1000,50,10.37
-1000,250,11.37
-1000,450,12.37
-1000,650,13.37
-1000,850,14.37
-1000,1050,15.37
-1000,1250,16.37
-1000,1450,17.37
-1000,1650,18.37
-1000,1850,19.37
-1000,2050,20.37
-1000,2250,21.37
-1000,2450,22.37
-1200,-350,12.882
-1200,-150,11.882
-1200,50,11.382
-1200,250,12.382
-1200,450,13.382
-1200,650,14.382
-1200,850,15.382
-1200,1050,16.382
-1200,1250,17.382
-1200,1450,18.382
-1200,1650,19.382
-1200,1850,20.382
-1200,2050,21.382
-1200,2250,22.382
-1200,2450,23.382
-1400,-350,13.894
-1400,-150,12.894
-1400,50,12.394
-1400,250,13.394
-1400,450,14.394
-1400,650,15.394
-1400,850,16.394
-1400,1050,17.394
-1400,1250,18.394
-1400,1450,19.394
-1400,1650,20.394
-1400,1850,21.394
-1400,2050,22.394
-1400,2250,23.394
-1400,2450,24.394
-1600,-350,14.906
-1600,-150,13.906
-1600,50,13.406
-1600,250,14.406
-1600,450,15.406
-1600,650,16.406
-1600,850,17.406
-1600,1050,18.406
-1600,1250,19.406
-1600,1450,20.406
-1600,1650,21.406
-1600,1850,22.406
-1600,2050,23.406
-1600,2250,24.406
-1600,2450,25.406
-1800,-350,15.918
-1800,-150,14.918
-1800,50,14.418
-1800,250,15.418
-1800,450,16.418
-1800,650,17.418
-1800,850,18.418
-1800,1050,19.418
-1800,1250,20.418
-1800,1450,21.418
-1800,1650,22.418
-1800,1850,23.418
-1800,2050,24.418
-1800,2250,25.418
-1800,2450,26.418
-2000,-350,16.93
-2000,-150,15.93
-2000,50,15.43
-2000,250,16.43
-2000,450,17.43
-2000,650,18.43
-2000,850,19.43
-2000,1050,20.43
-2000,1250,21.43
-2000,1450,22.43
-2000,1650,23.43
-2000,1850,24.43
-2000,2050,25.43
-2000,2250,26.43
-2000,2450,27.43
+0,-350,6.81,
+0,-150,5.81,
+0,50,5.31,
+0,250,6.31,
+0,450,7.31,
+0,650,8.31,
+0,850,9.31,
+0,1050,10.31,
+0,1250,11.31,
+0,1450,12.31,
+0,1650,13.31,
+0,1850,14.31,
+0,2050,15.31,
+0,2250,16.31,
+0,2450,17.31,
+200,-350,7.822,
+200,-150,6.822,
+200,50,6.322,
+200,250,7.322,
+200,450,8.322,
+200,650,9.322,
+200,850,10.322,
+200,1050,11.322,
+200,1250,12.322,
+200,1450,13.322,
+200,1650,14.322,
+200,1850,15.322,
+200,2050,16.322,
+200,2250,17.322,
+200,2450,18.322,
+400,-350,8.834,
+400,-150,7.834,
+400,50,7.334,
+400,250,8.334,
+400,450,9.334,
+400,650,10.334,
+400,850,11.334,
+400,1050,12.334,
+400,1250,13.334,
+400,1450,14.334,
+400,1650,15.334,
+400,1850,16.334,
+400,2050,17.334,
+400,2250,18.334,
+400,2450,19.334,
+600,-350,9.846,
+600,-150,8.846,
+600,50,8.346,
+600,250,9.346,
+600,450,10.346,
+600,650,11.346,
+600,850,12.346,
+600,1050,13.346,
+600,1250,14.346,
+600,1450,15.346,
+600,1650,16.346,
+600,1850,17.346,
+600,2050,18.346,
+600,2250,19.346,
+600,2450,20.346,
+800,-350,10.858,
+800,-150,9.858,
+800,50,9.358,
+800,250,10.358,
+800,450,11.358,
+800,650,12.358,
+800,850,13.358,
+800,1050,14.358,
+800,1250,15.358,
+800,1450,16.358,
+800,1650,17.358,
+800,1850,18.358,
+800,2050,19.358,
+800,2250,20.358,
+800,2450,21.358,
+1000,-350,11.87,
+1000,-150,10.87,
+1000,50,10.37,
+1000,250,11.37,
+1000,450,12.37,
+1000,650,13.37,
+1000,850,14.37,
+1000,1050,15.37,
+1000,1250,16.37,
+1000,1450,17.37,
+1000,1650,18.37,
+1000,1850,19.37,
+1000,2050,20.37,
+1000,2250,21.37,
+1000,2450,22.37,
+1200,-350,12.882,
+1200,-150,11.882,
+1200,50,11.382,
+1200,250,12.382,
+1200,450,13.382,
+1200,650,14.382,
+1200,850,15.382,
+1200,1050,16.382,
+1200,1250,17.382,
+1200,1450,18.382,
+1200,1650,19.382,
+1200,1850,20.382,
+1200,2050,21.382,
+1200,2250,22.382,
+1200,2450,23.382,
+1400,-350,13.894,
+1400,-150,12.894,
+1400,50,12.394,
+1400,250,13.394,
+1400,450,14.394,
+1400,650,15.394,
+1400,850,16.394,
+1400,1050,17.394,
+1400,1250,18.394,
+1400,1450,19.394,
+1400,1650,20.394,
+1400,1850,21.394,
+1400,2050,22.394,
+1400,2250,23.394,
+1400,2450,24.394,
+1600,-350,14.906,
+1600,-150,13.906,
+1600,50,13.406,
+1600,250,14.406,
+1600,450,15.406,
+1600,650,16.406,
+1600,850,17.406,
+1600,1050,18.406,
+1600,1250,19.406,
+1600,1450,20.406,
+1600,1650,21.406,
+1600,1850,22.406,
+1600,2050,23.406,
+1600,2250,24.406,
+1600,2450,25.406,
+1800,-350,15.918,
+1800,-150,14.918,
+1800,50,14.418,
+1800,250,15.418,
+1800,450,16.418,
+1800,650,17.418,
+1800,850,18.418,
+1800,1050,19.418,
+1800,1250,20.418,
+1800,1450,21.418,
+1800,1650,22.418,
+1800,1850,23.418,
+1800,2050,24.418,
+1800,2250,25.418,
+1800,2450,26.418,
+2000,-350,16.93,
+2000,-150,15.93,
+2000,50,15.43,
+2000,250,16.43,
+2000,450,17.43,
+2000,650,18.43,
+2000,850,19.43,
+2000,1050,20.43,
+2000,1250,21.43,
+2000,1450,22.43,
+2000,1650,23.43,
+2000,1850,24.43,
+2000,2050,25.43,
+2000,2250,26.43,
+2000,2450,27.43,
+0,-1000,10.06,
+200,-1000,11.072,
+400,-1000,12.084,
+600,-1000,13.096,
+800,-1000,14.108,
+1000,-1000,15.12,
+1200,-1000,16.132,
+1400,-1000,17.144,
+1600,-1000,18.156,
+1800,-1000,19.168,
+2000,-1000,20.18,
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
index f3a7ed78b9..90e4beee5b 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
+++ b/Generic Vehicles/Engineering Mode/24t Coach/Indirect Gear.vtlm
@@ -1,166 +1,177 @@
Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
-0,-350,12.06
-0,-150,8.06
-0,50,6.06
-0,250,10.06
-0,450,14.06
-0,650,18.06
-0,850,22.06
-0,1050,26.06
-0,1250,30.06
-0,1450,34.06
-0,1650,38.06
-0,1850,42.06
-0,2050,46.06
-0,2250,50.06
-0,2450,54.06
-200,-350,13.072
-200,-150,9.072
-200,50,7.072
-200,250,11.072
-200,450,15.072
-200,650,19.072
-200,850,23.072
-200,1050,27.072
-200,1250,31.072
-200,1450,35.072
-200,1650,39.072
-200,1850,43.072
-200,2050,47.072
-200,2250,51.072
-200,2450,55.072
-400,-350,14.084
-400,-150,10.084
-400,50,8.084
-400,250,12.084
-400,450,16.084
-400,650,20.084
-400,850,24.084
-400,1050,28.084
-400,1250,32.084
-400,1450,36.084
-400,1650,40.084
-400,1850,44.084
-400,2050,48.084
-400,2250,52.084
-400,2450,56.084
-600,-350,15.096
-600,-150,11.096
-600,50,9.096
-600,250,13.096
-600,450,17.096
-600,650,21.096
-600,850,25.096
-600,1050,29.096
-600,1250,33.096
-600,1450,37.096
-600,1650,41.096
-600,1850,45.096
-600,2050,49.096
-600,2250,53.096
-600,2450,57.096
-800,-350,16.108
-800,-150,12.108
-800,50,10.108
-800,250,14.108
-800,450,18.108
-800,650,22.108
-800,850,26.108
-800,1050,30.108
-800,1250,34.108
-800,1450,38.108
-800,1650,42.108
-800,1850,46.108
-800,2050,50.108
-800,2250,54.108
-800,2450,58.108
-1000,-350,17.12
-1000,-150,13.12
-1000,50,11.12
-1000,250,15.12
-1000,450,19.12
-1000,650,23.12
-1000,850,27.12
-1000,1050,31.12
-1000,1250,35.12
-1000,1450,39.12
-1000,1650,43.12
-1000,1850,47.12
-1000,2050,51.12
-1000,2250,55.12
-1000,2450,59.12
-1200,-350,18.132
-1200,-150,14.132
-1200,50,12.132
-1200,250,16.132
-1200,450,20.132
-1200,650,24.132
-1200,850,28.132
-1200,1050,32.132
-1200,1250,36.132
-1200,1450,40.132
-1200,1650,44.132
-1200,1850,48.132
-1200,2050,52.132
-1200,2250,56.132
-1200,2450,60.132
-1400,-350,19.144
-1400,-150,15.144
-1400,50,13.144
-1400,250,17.144
-1400,450,21.144
-1400,650,25.144
-1400,850,29.144
-1400,1050,33.144
-1400,1250,37.144
-1400,1450,41.144
-1400,1650,45.144
-1400,1850,49.144
-1400,2050,53.144
-1400,2250,57.144
-1400,2450,61.144
-1600,-350,20.156
-1600,-150,16.156
-1600,50,14.156
-1600,250,18.156
-1600,450,22.156
-1600,650,26.156
-1600,850,30.156
-1600,1050,34.156
-1600,1250,38.156
-1600,1450,42.156
-1600,1650,46.156
-1600,1850,50.156
-1600,2050,54.156
-1600,2250,58.156
-1600,2450,62.156
-1800,-350,21.168
-1800,-150,17.168
-1800,50,15.168
-1800,250,19.168
-1800,450,23.168
-1800,650,27.168
-1800,850,31.168
-1800,1050,35.168
-1800,1250,39.168
-1800,1450,43.168
-1800,1650,47.168
-1800,1850,51.168
-1800,2050,55.168
-1800,2250,59.168
-1800,2450,63.168
-2000,-350,22.18
-2000,-150,18.18
-2000,50,16.18
-2000,250,20.18
-2000,450,24.18
-2000,650,28.18
-2000,850,32.18
-2000,1050,36.18
-2000,1250,40.18
-2000,1450,44.18
-2000,1650,48.18
-2000,1850,52.18
-2000,2050,56.18
-2000,2250,60.18
-2000,2450,64.18
+0,-350,12.06,
+0,-150,8.06,
+0,50,6.06,
+0,250,10.06,
+0,450,14.06,
+0,650,18.06,
+0,850,22.06,
+0,1050,26.06,
+0,1250,30.06,
+0,1450,34.06,
+0,1650,38.06,
+0,1850,42.06,
+0,2050,46.06,
+0,2250,50.06,
+0,2450,54.06,
+200,-350,13.072,
+200,-150,9.072,
+200,50,7.072,
+200,250,11.072,
+200,450,15.072,
+200,650,19.072,
+200,850,23.072,
+200,1050,27.072,
+200,1250,31.072,
+200,1450,35.072,
+200,1650,39.072,
+200,1850,43.072,
+200,2050,47.072,
+200,2250,51.072,
+200,2450,55.072,
+400,-350,14.084,
+400,-150,10.084,
+400,50,8.084,
+400,250,12.084,
+400,450,16.084,
+400,650,20.084,
+400,850,24.084,
+400,1050,28.084,
+400,1250,32.084,
+400,1450,36.084,
+400,1650,40.084,
+400,1850,44.084,
+400,2050,48.084,
+400,2250,52.084,
+400,2450,56.084,
+600,-350,15.096,
+600,-150,11.096,
+600,50,9.096,
+600,250,13.096,
+600,450,17.096,
+600,650,21.096,
+600,850,25.096,
+600,1050,29.096,
+600,1250,33.096,
+600,1450,37.096,
+600,1650,41.096,
+600,1850,45.096,
+600,2050,49.096,
+600,2250,53.096,
+600,2450,57.096,
+800,-350,16.108,
+800,-150,12.108,
+800,50,10.108,
+800,250,14.108,
+800,450,18.108,
+800,650,22.108,
+800,850,26.108,
+800,1050,30.108,
+800,1250,34.108,
+800,1450,38.108,
+800,1650,42.108,
+800,1850,46.108,
+800,2050,50.108,
+800,2250,54.108,
+800,2450,58.108,
+1000,-350,17.12,
+1000,-150,13.12,
+1000,50,11.12,
+1000,250,15.12,
+1000,450,19.12,
+1000,650,23.12,
+1000,850,27.12,
+1000,1050,31.12,
+1000,1250,35.12,
+1000,1450,39.12,
+1000,1650,43.12,
+1000,1850,47.12,
+1000,2050,51.12,
+1000,2250,55.12,
+1000,2450,59.12,
+1200,-350,18.132,
+1200,-150,14.132,
+1200,50,12.132,
+1200,250,16.132,
+1200,450,20.132,
+1200,650,24.132,
+1200,850,28.132,
+1200,1050,32.132,
+1200,1250,36.132,
+1200,1450,40.132,
+1200,1650,44.132,
+1200,1850,48.132,
+1200,2050,52.132,
+1200,2250,56.132,
+1200,2450,60.132,
+1400,-350,19.144,
+1400,-150,15.144,
+1400,50,13.144,
+1400,250,17.144,
+1400,450,21.144,
+1400,650,25.144,
+1400,850,29.144,
+1400,1050,33.144,
+1400,1250,37.144,
+1400,1450,41.144,
+1400,1650,45.144,
+1400,1850,49.144,
+1400,2050,53.144,
+1400,2250,57.144,
+1400,2450,61.144,
+1600,-350,20.156,
+1600,-150,16.156,
+1600,50,14.156,
+1600,250,18.156,
+1600,450,22.156,
+1600,650,26.156,
+1600,850,30.156,
+1600,1050,34.156,
+1600,1250,38.156,
+1600,1450,42.156,
+1600,1650,46.156,
+1600,1850,50.156,
+1600,2050,54.156,
+1600,2250,58.156,
+1600,2450,62.156,
+1800,-350,21.168,
+1800,-150,17.168,
+1800,50,15.168,
+1800,250,19.168,
+1800,450,23.168,
+1800,650,27.168,
+1800,850,31.168,
+1800,1050,35.168,
+1800,1250,39.168,
+1800,1450,43.168,
+1800,1650,47.168,
+1800,1850,51.168,
+1800,2050,55.168,
+1800,2250,59.168,
+1800,2450,63.168,
+2000,-350,22.18,
+2000,-150,18.18,
+2000,50,16.18,
+2000,250,20.18,
+2000,450,24.18,
+2000,650,28.18,
+2000,850,32.18,
+2000,1050,36.18,
+2000,1250,40.18,
+2000,1450,44.18,
+2000,1650,48.18,
+2000,1850,52.18,
+2000,2050,56.18,
+2000,2250,60.18,
+2000,2450,64.18,
+0,-1000,25.06,
+200,-1000,26.072,
+400,-1000,27.084,
+600,-1000,28.096,
+800,-1000,29.108,
+1000,-1000,30.12,
+1200,-1000,31.132,
+1400,-1000,32.144,
+1600,-1000,33.156,
+1800,-1000,34.168,
+2000,-1000,35.18,
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index 505edf03dc..0c434b9ebe 100644
--- a/VECTO/Input Files/cVEH.vb
+++ b/VECTO/Input Files/cVEH.vb
@@ -379,7 +379,7 @@ Public Class cVEH
CdMode = tCdMode.CdOfV
- CdFile.Init(MyPath, Declaration.SegRef.VCDVfile)
+ CdFile.Init(MyPath, Declaration.SegRef.VCDVfile(MissionID))
If Declaration.SegRef.TrailerOnlyInLongHaul Then
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index fd295e970f..fffe0bb9d2 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -229,21 +229,28 @@ Public Class cDeclaration
ste0.MaxGVW = CSng(line(4))
ste0.HDVclass = line(5)
ste0.VACCfile = MyDeclPath & "VACC\" & line(6)
- ste0.VCDVfile = MyDeclPath & "VCDV\" & line(7)
- AxleShares.Add(line(8)) 'Long Haul
+ For Each mt0 In SegmentTable.MissionList
+ If mt0 = tMission.LongHaul Then
+ ste0.VCDVfile.Add(mt0, MyDeclPath & "VCDV\" & line(7))
+ Else
+ ste0.VCDVfile.Add(mt0, MyDeclPath & "VCDV\" & line(8))
+ End If
+ Next
+
+ AxleShares.Add(line(9)) 'Long Haul
For Each mt0 In SegmentTable.MissionList 'Other cycles
- If mt0 <> tMission.LongHaul Then AxleShares.Add(line(9))
+ If mt0 <> tMission.LongHaul Then AxleShares.Add(line(10))
Next
- AxleSharesTr.Add(line(10)) 'Long Haul
+ AxleSharesTr.Add(line(11)) 'Long Haul
For Each mt0 In SegmentTable.MissionList 'Other cycles
- If mt0 <> tMission.LongHaul Then AxleSharesTr.Add(line(11))
+ If mt0 <> tMission.LongHaul Then AxleSharesTr.Add(line(12))
Next
- ste0.TrailerOnlyInLongHaul = (Trim(line(10)) <> "0/0" And Trim(line(11)) = "0/0" And ste0.VehCat = tVehCat.RigidTruck)
+ ste0.TrailerOnlyInLongHaul = (Trim(line(11)) <> "0/0" And Trim(line(12)) = "0/0" And ste0.VehCat = tVehCat.RigidTruck)
- i = 11
+ i = 12
For Each mt0 In SegmentTable.MissionList
i += 1
ste0.UseMission.Add(CBool(line(i)))
@@ -1179,7 +1186,7 @@ Public Class cSegmentTableEntry
Public UseMission As New List(Of Boolean)
Public HDVclass As String
Public VACCfile As String
- Public VCDVfile As String
+ Public VCDVfile As New Dictionary(Of tMission, String)
Public BodyTrWeight As New Dictionary(Of tMission, String)
Public Loading As New Dictionary(Of tMission, String)
Public AxleShares As New Dictionary(Of tMission, List(Of Single))
--
GitLab