diff --git a/Declaration/SegmentTable.csv b/Declaration/SegmentTable.csv
index 940e70e4f8dfa186ee3fe2568909804e9107ebd5..b7cdfef9777066c13528aeec4b0ea51147716a1a 100644
--- a/Declaration/SegmentTable.csv
+++ b/Declaration/SegmentTable.csv
@@ -1,26 +1,26 @@
-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,???,???,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,-,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,RigidSolo,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,-,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,RigidSolo,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,TractorSemitrailer,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,???,???,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,???,???,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,???,???,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,RigidSolo,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,TractorSemitrailer,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,???,???,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,Vehicle Category ,Axle Conf.,GVW_Min,GVW_Max,HDV class,.vacc file ,Cross Wind Correction - Long haul,Cross Wind Correction - Other,Truck Axles - Long haul,Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,Long haul,Regional delivery,Urban delivery,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach,Mass Extra - Long haul,Mass Extra - Regional delivery,Mass Extra - Urban delivery,Mass Extra - Municipal utility,Mass Extra - Construction,Mass Extra - Heavy Urban,Mass Extra - Urban,Mass Extra - Suburban,Mass Extra - Interurban,Mass Extra - Coach,Payload - Long haul,Payload - Regional delivery,Payload - Urban delivery,Payload - Municipal utility,Payload - Construction,Payload - Heavy Urban,Payload - Urban,Payload - Suburban,Payload - Interurban,Payload - Coach
+0,RigidTruck,4x2,0,7.5,0,Truck.vacc,-,RigidSolo,-,-,-,-,0,1,1,0,0,0,0,0,0,0,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-,-,-
+1,RigidTruck,4x2,7.5,10,1,Truck.vacc,-,RigidSolo,-,45/55,-,-,0,1,1,0,0,0,0,0,0,0,-,1600,1600,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-
+1,RigidTruck,4x2,10,12,2,Truck.vacc,RigidSolo,RigidSolo,40/60,45/55,-,-,1,1,1,0,0,0,0,0,0,0,1900,1900,1900,-,-,-,-,-,-,-,f,f,f,-,-,-,-,-,-,-
+1,RigidTruck,4x2,12,16,3,Truck.vacc,-,RigidSolo,-,40/60,-,-,0,1,1,0,0,0,0,0,0,0,-,2000,2000,-,-,-,-,-,-,-,-,f,f,-,-,-,-,-,-,-
+1,RigidTruck,4x2,16,99,4,Truck.vacc,RigidTrailer,RigidSolo,20/30,45/55,50/2,-,1,1,0,1,0,0,0,0,0,0,7500,2100,-,2100,-,-,-,-,-,-,14000,4400,-,4400,-,-,-,-,-,-
+1,Tractor,4x2,16,99,5,Truck.vacc,TractorSemitrailer,TractorSemitrailer,20/25,25/25,55/3,50/3,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-
+0,RigidTruck,4x4,7.5,16,6,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,1,1,0,0,0,0,0,-,-,-,???,???,-,-,-,-,-,-,-,-,???,???,-,-,-,-,-
+0,RigidTruck,4x4,16,99,7,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+0,Tractor,4x4,16,99,8,Truck.vacc,-,TractorSemitrailer,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+1,RigidTruck,6x2,0,99,9,Truck.vacc,RigidTrailer,RigidSolo,20/30/15,35/40/25,35/2,-,1,1,0,1,0,0,0,0,0,0,7600,2200,-,2200,-,-,-,-,-,-,19300,7100,-,7100,-,-,-,-,-,-
+1,Tractor,6x2,0,99,10,Truck.vacc,TractorSemitrailer,TractorSemitrailer,15/10/20,20/10/20,55/2,50/2,1,1,0,0,0,0,0,0,0,0,7500,7500,-,-,-,-,-,-,-,-,19300,12900,-,-,-,-,-,-,-,-
+0,RigidTruck,6x4,0,99,11,Truck.vacc,-,RigidSolo,-,35/35/30,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,7100,-,-,-,-,-
+0,Tractor,6x4,0,99,12,Truck.vacc,-,TractorSemitrailer,-,20/15/15,-,50/2,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,12900,-,-,-,-,-
+0,RigidTruck,6x6,0,99,13,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+0,Tractor,6x6,0,99,14,Truck.vacc,-,TractorSemitrailer,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+0,RigidTruck,8x2,0,99,15,Truck.vacc,-,RigidSolo,-,-,-,-,0,1,0,0,0,0,0,0,0,0,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-
+0,RigidTruck,8x4,0,99,16,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,12900,-,-,-,-,-
+0,RigidTruck,8x6,0,99,17,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+0,RigidTruck,8x8,0,99,17,Truck.vacc,-,RigidSolo,-,-,-,-,0,0,0,0,1,0,0,0,0,0,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-
+0,CityBus,4x2,0,18,B1,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-
+0,InterurbanBus,4x2,0,18,B2,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-
+0,Coach,4x2,0,18,B3,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???
+0,CityBus,6x2,18,99,B4,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,1,1,1,0,0,-,-,-,-,-,???,???,???,-,-,-,-,-,-,-,???,???,???,-,-
+0,InterurbanBus,6x2,18,99,B5,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,0,0,0,1,0,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???,-
+0,Coach,6x2,18,99,B6,N/A,-,CoachBus,-,-,-,-,0,0,0,0,0,0,0,0,0,1,-,-,-,-,-,-,-,-,-,???,-,-,-,-,-,-,-,-,-,???
diff --git a/Declaration/VCDV/CoachBus.vcdv b/Declaration/VCDV/CoachBus.vcdv
deleted file mode 100644
index 39a23feda955735a6a80ec920e23e4a083236708..0000000000000000000000000000000000000000
--- a/Declaration/VCDV/CoachBus.vcdv
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index 934c3e582527884496e7e091a521ab55ba2e10bf..0000000000000000000000000000000000000000
--- a/Declaration/VCDV/RigidSolo.vcdv
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index 205473b64f696c4117669451ea1cbd9321a4a0c2..0000000000000000000000000000000000000000
--- a/Declaration/VCDV/RigidTrailer.vcdv
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index 50cfff436b7dfae4677e65b86ed30f12e59f9136..0000000000000000000000000000000000000000
--- a/Declaration/VCDV/TractorSemitrailer.vcdv
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/Wheels.csv b/Declaration/Wheels.csv
index 3c01c43e64217d44b4aac1c60bed2d1e8be03cb6..f49a335209e44ff9951ed5e98a2785bd226be895 100644
--- a/Declaration/Wheels.csv
+++ b/Declaration/Wheels.csv
@@ -1,41 +1,41 @@
-Wheel,Inertia,d,Size-Class(0/1)
-9 R 22.5,8.9,970,0
-9.00 R 20,10.5,1018,0
-9.5 R 17.5,4.9,842,0
-10 R 17.5,5,858,0
-10 R 22.5,11,1020,0
-10.00 R 20,13.1,1025,0
-11 R 22.5,14.4,1050,0
-11.00 R 20,14.6,1082,0
-12 R 22.5,16.8,1084,0
-12.00 R 20,19.5,1122,0
-12.00 R 24,27.7,1226,0
-12.5 R 20,12.7,1120,0
-13 R 22.5,20,1124,0
-14.00 R 20,30.8,1238,0
-14.5 R 20,14.8,1092,0
-16.00 R 20,47.5,1343,0
-215/75 R 17.5,3.9,767,0
-225/70 R 17.5,4,759.5,0
-225/75 R 17.5,4,782,0
-235/75 R 17.5,4.5,797,0
-245/70 R 17.5,5.2,787.5,0
-245/70 R 19.5,6,838.3,0
-255/70 R 22.5,9.5,928.5,0
-265/70 R 19.5,6.5,866.3,0
-275/70 R 22.5,11.9,956.5,0
-275/80 R 22.5,12.8,1011.5,0
-285/70 R 19.5,7.9,894.3,0
-295/55 R 22.5,10.2,896,1
-295/60 R 22.5,10.8,925.5,1
-295/80 R 22.5,15.5,1043.5,0
-305/70 R 19.5,9.2,922.3,0
-305/70 R 22.5,13.9,998.5,0
-315/45 R22.5,9.9,347,1
-315/60 R 22.5,12.8,949.5,1
-315/70 R 22.5,14.9,1012.5,0
-315/80 R 22.5,17.6,1075.5,0
-365/80 R 20,17.2,1092,0
-365/85 R 20,22.5,1128.5,0
-385/55 R 22.5,15.9,995,1
-385/65 R 22.5,19.2,1072,1
+Wheel,Inertia,d,Size-Class (0/1)
+9 R22.5,8.9,970,b
+9.00 R20,10.5,1018,b
+9.5 R17.5,4.9,842,b
+10 R17.5,5,858,b
+10 R22.5,11,1020,b
+10.00 R20,13.1,1025,b
+11 R22.5,14.4,1050,b
+11.00 R20,14.6,1082,b
+12 R22.5,16.8,1084,b
+12.00 R20,19.5,1122,b
+12.00 R24,27.7,1226,b
+12.5 R20,12.7,1120,b
+13 R22.5,20,1124,b
+14.00 R20,30.8,1238,b
+14.5 R20,14.8,1092,b
+16.00 R20,47.5,1343,b
+215/75 R17.5,3.9,767,b
+225/70 R17.5,4,759.5,b
+225/75 R17.5,4,782,b
+235/75 R17.5,4.5,797,b
+245/70 R17.5,5.2,787.5,b
+245/70 R19.5,6,838.3,b
+255/70 R22.5,9.5,928.5,b
+265/70 R19.5,6.5,866.3,b
+275/70 R22.5,11.9,956.5,b
+275/80 R22.5,12.8,1011.5,b
+285/70 R19.5,7.9,894.3,b
+295/55 R22.5,10.2,896,a
+295/60 R22.5,10.8,925.5,a
+295/80 R22.5,15.5,1043.5,b
+305/70 R19.5,9.2,922.3,b
+305/70 R22.5,13.9,998.5,b
+315/45 R22.5,9.9,855,a
+315/60 R22.5,12.8,949.5,a
+315/70 R22.5,14.9,1012.5,b
+315/80 R22.5,17.6,1075.5,b
+365/80 R20,17.2,1092,b
+365/85 R20,22.5,1128.5,b
+385/55 R22.5,15.9,995,a
+385/65 R22.5,19.2,1072,a
diff --git a/User Manual/GUI/VEH-Editor.html b/User Manual/GUI/VEH-Editor.html
index bebadf2561c4c8b6005974a048deb50f1edb8691..340f1e77f924dcb8bf646a2d3bc6803701983a41 100644
--- a/User Manual/GUI/VEH-Editor.html
+++ b/User Manual/GUI/VEH-Editor.html
@@ -98,17 +98,17 @@ Wind Correction</span></a>.<br>
<hr style="height: 1px; width: 100%;">For each axle the parameters <span style="font-weight: bold;">Relative axle load</span>, <span style="font-weight: bold;">RRC</span><sub style="font-weight: bold;">ISO</sub> and <span style="font-weight: bold;">F</span><sub style="font-weight: bold;">zISO</sub> have to be defined in order to calculate the total <a href="../general/RRC.html">Rolling Resistance Coefficient</a>.<br>
-Furthermore the <span style="font-weight: bold;">Wheels Inertia [kgm²]</span> has to be set <span style="text-decoration: underline;">per wheel</span> for each axle. In <a href="../general/calc_Declaration.html">Declaration Mode</a> the inertia is defined automatically according to the selected tires.<br>
+Furthermore the <span style="font-weight: bold;">Wheels Inertia [kgm²]</span> has to be set <span style="text-decoration: underline;">per wheel</span> for each axle. In <a href="../general/calc_Declaration.html">Declaration Mode</a> the inertia is defined automatically according to the selected tyres.<br>
Use the <img style="width: 16px; height: 16px;" alt="add" src="../pics/icons/plus-circle-icon.png"> and <img style="width: 16px; height: 16px;" alt="remove" src="../pics/icons/minus-circle-icon.png"> buttons to add or
remove axles form the vehicle. Doubleclick entries to edit existing
axle configurations.<br>
<br>
-<span style="font-weight: bold;">Dynamic Tire Radius [mm]</span><br>
-<div style="margin-left: 40px;">Effective (dynamic) wheel radius used to calculate engine speed. In <a href="../general/calc_Declaration.html">Declaration Mode</a> the radius calculated automatically using tires/rims of the powered axle.<br>
+<span style="font-weight: bold;">Dynamic Tyre Radius [mm]</span><br>
+<div style="margin-left: 40px;">Effective (dynamic) wheel radius used to calculate engine speed. In <a href="../general/calc_Declaration.html">Declaration Mode</a> the radius calculated automatically using tyres/rims of the powered axle.<br>
</div>
<br>
<span style="font-weight: bold;">Powered axle tyres/rims</span><br>
-<div style="margin-left: 40px;">Needed for <a href="../general/calc_Declaration.html">Declaration Mode</a> to calculate the dynamic tire radius.</div>
+<div style="margin-left: 40px;">Needed for <a href="../general/calc_Declaration.html">Declaration Mode</a> to calculate the dynamic tyre radius.</div>
<br>
<br>
<big><big style="font-weight: bold;">Retarder Losses</big></big><br>
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index 28b561b1acd3fa6ba42a751c4b85e4dc70dde43e..0d1706142937b7e8774096020b6b121e3c79f7a7 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -98,7 +98,6 @@ Public Class cDeclaration
Dim i As Integer
Dim a As Integer
Dim s0 As String
- Dim s As String()
Dim TrS As Single
Dim TrA As Single
Dim stl As String()
@@ -109,7 +108,6 @@ Public Class cDeclaration
Dim AxleShares As List(Of String)
Dim AxleSharesTr As List(Of String)
Dim l0 As List(Of Single)
- Dim WHTCWF As List(Of String)
Dim dWHTCWF As Dictionary(Of tWHTCpart, Single)
Dim at0 As List(Of String)
@@ -252,7 +250,6 @@ Public Class cDeclaration
LoadingList = New List(Of String)
AxleShares = New List(Of String)
AxleSharesTr = New List(Of String)
- WHTCWF = New List(Of String)
ste0.VehCat = ConvVehCat(line(1))
@@ -294,7 +291,7 @@ Public Class cDeclaration
If mt0 <> tMission.LongHaul Then AxleSharesTr.Add(line(12))
Next
- ste0.TrailerOnlyInLongHaul = (Trim(line(11)) <> "0/0" And Trim(line(12)) = "0/0" And ste0.VehCat = tVehCat.RigidTruck)
+ ste0.TrailerOnlyInLongHaul = (Trim(line(11)) <> "-" And Trim(line(12)) = "-" And ste0.VehCat = tVehCat.RigidTruck)
i = 12
For Each mt0 In SegmentTable.MissionList
@@ -310,11 +307,6 @@ Public Class cDeclaration
LoadingList.Add(line(i))
Next
- For Each mt0 In SegmentTable.MissionList
- i += 1
- WHTCWF.Add(line(i))
- Next
-
For i = 0 To SegmentTable.MissionList.Count - 1
If ste0.UseMission(i) Then
ste0.Missions.Add(SegmentTable.MissionList(i))
@@ -329,8 +321,14 @@ Public Class cDeclaration
l0 = New List(Of Single)
- TrS = AxleSharesTr(i).Split("/")(0)
- TrA = AxleSharesTr(i).Split("/")(1)
+ If AxleSharesTr(i) = "-" Then
+ TrS = 0
+ TrA = 0
+ Else
+ TrS = AxleSharesTr(i).Split("/")(0)
+ TrA = AxleSharesTr(i).Split("/")(1)
+ End If
+
For a = 1 To TrA
l0.Add(TrS / TrA)
@@ -338,11 +336,10 @@ Public Class cDeclaration
ste0.AxleSharesTr.Add(SegmentTable.MissionList(i), l0)
- s = WHTCWF(i).Split("/")
dWHTCWF = New Dictionary(Of tWHTCpart, Single)
- dWHTCWF.Add(tWHTCpart.Urban, CSng(s(0)) / 100)
- dWHTCWF.Add(tWHTCpart.Rural, CSng(s(1)) / 100)
- dWHTCWF.Add(tWHTCpart.Motorway, CSng(s(2)) / 100)
+ dWHTCWF.Add(tWHTCpart.Urban, 0)
+ dWHTCWF.Add(tWHTCpart.Rural, 0)
+ dWHTCWF.Add(tWHTCpart.Motorway, 0)
ste0.WHTCWF.Add(SegmentTable.MissionList(i), dWHTCWF)
@@ -668,7 +665,7 @@ Public Class cDeclaration
w0 = New cWheel
w0.Inertia = CSng(line(1))
w0.Diam = CSng(line(2))
- w0.SizeA = (CInt(line(3)) = 1)
+ w0.SizeA = (line(3) = "a")
Wheels.Add(line(0), w0)