Merge pull request #53 in VECTO/vecto-sim from ~EMLUZRAPH/vecto-sim:master to master

* commit '353998ba':
  - Bugfix: Unit error in Cd(v) methods caused incorrect Delta-Cd value being used
  - Implemented new Cd*A(v) method - Small update in TC model
  - updated changelog - updated version number
  -Improved TC iteration for better precision
  cleaned up rpm calculation

CHANGES.md

@@ -5,6 +5,11 @@ TODO
 - Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)
 
 
+### VECTO 2.1.2
+* Improved TC iteration for higher precision
+* Extended possible TC speed ratio 
+
+
 ### VECTO 2.1.1
 * Bugfix: Incorrect torque calculation in AT/TC model caused early up-shifts
 * Updated C-to-C shift strategy with acc_min rule (see V2.1)

Declaration/SegmentTable.csv

 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,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.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
+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

Declaration/VCDV/paramerters.csv

+Parameters,a1,a2,a3
+RigidSolo,0.013526,0.017746,-0.000666
+RigidTrailer,0.017125,0.072275,-0.004148
+TractorSemitrailer,0.030042,0.040817,-0.00213
+CoachBus,-0.000794,0.02109,-0.00109

User Manual/fileformat/VCDB.html

@@ -40,7 +40,7 @@
 <table style="background-color: white; text-align: left; height: 115px; width: 646px; margin-left: 0px;" border="1" cellpadding="2" cellspacing="1">
 
 
-<tbody><tr><th style="text-align: center; width: 227px;"><span style="color: rgb(51, 102, 255);"></span>Vair &amp; Beta []</th>
+<tbody><tr><th style="text-align: center; width: 227px;"><span style="color: rgb(51, 102, 255);"></span>Beta []</th>
 <th style="text-align: center; width: 221px;">cd Scaling Factor [-]</th>
 
 </tr>

VECTO/GUI/F_VEH.Designer.vb

@@ -292,10 +292,10 @@ Partial Class F_VEH
 		'
 		Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.CbCdMode.FormattingEnabled = True
-        Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent", "Vair & Beta Input"})
+		Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
 		Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
 		Me.CbCdMode.Name = "CbCdMode"
-        Me.CbCdMode.Size = New System.Drawing.Size(112, 21)
+		Me.CbCdMode.Size = New System.Drawing.Size(207, 21)
 		Me.CbCdMode.TabIndex = 0
 		'
 		'TbCdFile
@@ -344,7 +344,7 @@ Partial Class F_VEH
 		'LbCdMode
 		'
 		Me.LbCdMode.AutoSize = True
-        Me.LbCdMode.Location = New System.Drawing.Point(124, 22)
+		Me.LbCdMode.Location = New System.Drawing.Point(219, 22)
 		Me.LbCdMode.Name = "LbCdMode"
 		Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
 		Me.LbCdMode.TabIndex = 28

VECTO/GUI/F_VEH.vb

@@ -156,7 +156,8 @@ Public Class F_VEH
 
         Me.TbMassExtra.Text = "-"
         Me.TbLoad.Text = "-"
-        Me.CbCdMode.SelectedIndex = 1
+		Me.CbCdMode.SelectedIndex = CType(tCdMode.CdOfVdecl, Integer)
+		Me.TbCdFile.Text = ""
 
 		If Me.LvRRC.Items.Count > 0 Then
 			rdyn = Declaration.rdyn(Me.LvRRC.Items(1).SubItems(5).Text, Me.CbRim.Text)
@@ -493,17 +494,17 @@ Public Class F_VEH
 
 		Select Case CType(Me.CbCdMode.SelectedIndex, tCdMode)
 
-            Case tCdMode.ConstCd0
-                bEnabled = False
-                Me.LbCdMode.Text = ""
+			Case tCdMode.CdOfBeta
+				bEnabled = True
+				Me.LbCdMode.Text = "Input file: Yaw Angle [°], Cd Scaling Factor [-]"
 
-            Case tCdMode.CdOfV
+			Case tCdMode.CdOfVeng
 				bEnabled = True
 				Me.LbCdMode.Text = "Input file: Vehicle Speed [km/h], Cd Scaling Factor [-]"
 
-            Case Else ' tCdMode.CdOfBeta
-                bEnabled = True
-                Me.LbCdMode.Text = "Input file: Yaw Angle [°], Cd Scaling Factor [-]"
+			Case Else ' tCdMode.ConstCd0, tCdMode.CdOfVdecl
+				bEnabled = False
+				Me.LbCdMode.Text = ""
 
 		End Select
 

VECTO/Input Files/cGBX.vb

@@ -349,8 +349,9 @@ Public Class cGBX
 		Try
 			Do While Not file.EndOfFile
 				line = file.ReadLine
+				TCnuMax = CSng(line(0))
 				If CSng(line(0)) < 1 Then
-					TCnu.Add(CSng(line(0)))
+					TCnu.Add(TCnuMax)
 					TCmu.Add(CSng(line(1)))
 					TCtorque.Add(CSng(line(2)))
 					TCdim += 1
@@ -369,8 +370,7 @@ Public Class cGBX
 			Return False
 		End If
 
-		TCnuMax = TCnu(TCdim)
-
+		If TCnuMax > 1 Then TCnuMax = 1
 
 		'Add default values for nu>1
 		If Not file.OpenRead(MyDeclPath & "DefaultTC.vtcc") Then
@@ -435,13 +435,14 @@ Public Class cGBX
 
 		Dim rpmLimit As Single
 
+		Dim iOptPassed As Integer
+
 		Dim MsgSrc As String
 
 		MsgSrc = "GBX/TCiteration/t= " & t + 1
 
 		TC_PeBrake = 0
 		TCReduce = False
-		nuStep = 0.001
 		Brake = False
 		TCNeutral = False
 
@@ -483,13 +484,21 @@ Public Class cGBX
 		End If
 
 		'Reduce step size if nu-range is too low
-		Do While (nuMax - nuMin)/nuStep < 10 And nuStep > 0.0001
+		nuStep = 0.01
+		Do While (nuMax - nuMin) / nuStep < 10 And nuStep > 0.00001
 			nuStep *= 0.1
 		Loop
 
+
+
+		Do
+
+			iOptPassed = -1
 			FirstDone = False
 			nu = nuMin - nuStep
 			iDim = -1
+			nuList.Clear()
+			McalcRatio.Clear()
 			Do While nu + nuStep <= nuMax
 
 				'nu
@@ -539,16 +548,19 @@ Public Class cGBX
 
 				'Calc smallest error for each mu value
 				If FirstDone Then
-				If Math.Abs(1 - McalcRatio(i)) < ErrMin Then
-					ErrMin = Math.Abs(1 - McalcRatio(i))
-					iMin = i
+					If Math.Abs(1 - McalcRatio(iDim)) < ErrMin Then
+						ErrMin = Math.Abs(1 - McalcRatio(iDim))
+						iMin = iDim
+					End If
+					If McalcRatio(iDim) > McalcRatMax Then McalcRatMax = McalcRatio(iDim)
+					If (McalcRatio(iDim) > 1 AndAlso McalcRatio(iDim - 1) < 1) OrElse (McalcRatio(iDim) < 1 AndAlso McalcRatio(iDim - 1) > 1) Then
+						iOptPassed = iDim
 					End If
-				If McalcRatio(i) > McalcRatMax Then McalcRatMax = McalcRatio(i)
 				Else
 					FirstDone = True
-				ErrMin = Math.Abs(1 - McalcRatio(i))
-				iMin = i
-				McalcRatMax = McalcRatio(i)
+					ErrMin = Math.Abs(1 - McalcRatio(iDim))
+					iMin = iDim
+					McalcRatMax = McalcRatio(iDim)
 				End If
 
 				'Abort if error is small enough
@@ -561,6 +573,15 @@ Public Class cGBX
 				Return True
 			End If
 
+			If ErrMin > DEV.TCiterPrec AndAlso iOptPassed > -1 AndAlso nuStep > 0.00001 Then
+				nuMin = nuList(iOptPassed - 1)
+				nuMax = nuList(iOptPassed)
+				nuStep = Math.Max((nuMax - nuMin) / 10, 0.00001)
+			Else
+				Exit Do
+			End If
+
+		Loop
 
 		If ErrMin > DEV.TCiterPrec Then
 

VECTO/Input Files/cVEH.vb

@@ -340,7 +340,7 @@ Public Class cVEH
     End Function
 
 
-    Public Function DeclInit() As Boolean
+	Public Function DeclInitCycle() As Boolean
 		Dim al As List(Of Single)
 		Dim i As Integer
 		Dim a As Single
@@ -405,11 +405,11 @@ Public Class cVEH
 
 		Next
 
-
-
-        CdMode = tCdMode.CdOfV
-
-        CdFile.Init(MyPath, Declaration.SegRef.VCDVfile(MissionID))
+		CdMode = tCdMode.CdOfVdecl
+		If Not Declaration.SegRef.VCDVparam.ContainsKey(MissionID) Then
+			WorkerMsg(tMsgID.Err, "No Cross Wind Correction parameters defined for current vehicle & mission profile!", MsgSrc)
+			Return False
+		End If
 
 		If Declaration.SegRef.TrailerOnlyInLongHaul Then
 
@@ -590,6 +590,10 @@ Public Class cVEH
         'If Cd-value is constant then do nothing
 		If CdMode = tCdMode.ConstCd0 Then Return True
 
+		'Declaration Mode
+		If CdMode = tCdMode.CdOfVdecl Then Return CdofVdeclInit()
+
+
 		'Read Inputfile
 		file = New cFile_V3
 
@@ -601,6 +605,8 @@ Public Class cVEH
 		'Skip Header
 		file.ReadLine()
 
+		CdX.Clear()
+		CdY.Clear()
 		CdDim = -1
 		Do While Not file.EndOfFile
 
@@ -629,10 +635,112 @@ Public Class cVEH
 
 	End Function
 
+	Private Function CdofVdeclInit() As Boolean
+		Dim lBeta As New List(Of Single)
+		Dim lDeltaCdA As New List(Of Single)
+		Dim i As Integer
+		Dim j As Integer
+		Dim k As Integer
+		Dim vveh As Single
+		Dim alpha As Single
+		Dim beta As Single
+		Dim CdA0 As Single
+		Dim CdA As Single
+		Dim CdAsum As Single
+		Dim Vwind As Single
+		Dim VwindX As Single
+		Dim VwindY As Single
+		Dim vair As Single
+		Dim vairX As Single
+		Dim vairY As Single
+		Dim a As List(Of Single)
+		Dim iDim As Integer
+		Dim DeltaCdA As Single
+		Dim share As Single
+
+		CdA0 = Cd0Act * AquersAct
+		Vwind = cDeclaration.Vwind * 3.6
+
+		Try
+			If Cfg.DeclMode Then
+				a = Declaration.SegRef.VCDVparam(Declaration.CurrentMission.MissionID)
+			Else
+				a = Declaration.VCDVparamPerCat(VEH.VehCat)
+			End If
+		Catch ex As Exception
+			Return False
+		End Try
+
+		For i = 0 To 12
+			beta = CSng(i)
+			lBeta.Add(beta)
+			lDeltaCdA.Add(a(0) * beta + a(1) * beta ^ 2 + a(2) * beta ^ 3)
+		Next
+
+		iDim = lBeta.Count - 1
+
+		CdX.Clear()
+		CdY.Clear()
+		CdDim = -1
+
+		CdX.Add(0)
+		CdY.Add(0)
+		For i = 60 To 100 Step 5
+			vveh = CSng(i)
+
+			CdAsum = 0
+			For j = 0 To 180 Step 10
+				alpha = CSng(j)
+				VwindX = Vwind * Math.Cos(alpha * Math.PI / 180)
+				VwindY = Vwind * Math.Sin(alpha * Math.PI / 180)
+				vairX = vveh + VwindX
+				vairY = VwindY
+				vair = Math.Sqrt(vairX ^ 2 + vairY ^ 2)
+				beta = Math.Atan(vairY / vairX) * 180 / Math.PI
+
+				If lBeta(0) >= beta Then
+					k = 1
+				Else
+					k = 0
+					Do While lBeta(k) < beta And k < iDim
+						k += 1
+					Loop
+				End If
+				DeltaCdA = (beta - lBeta(k - 1)) * (lDeltaCdA(k) - lDeltaCdA(k - 1)) / (lBeta(k) - lBeta(k - 1)) + lDeltaCdA(k - 1)
+
+				CdA = CdA0 + DeltaCdA
+
+				If j = 0 OrElse j = 180 Then
+					share = 5 / 180
+				Else
+					share = 10 / 180
+				End If
+
+				CdAsum += share * CdA * (vair ^ 2 / vveh ^ 2)
+
+			Next
+
+			CdX.Add(vveh)
+			CdY.Add(CdAsum)
+
+		Next
+
+		CdY(0) = CdY(1)
+		CdDim = CdX.Count - 1
+
+		Return True
+
+
+	End Function
+
     Public Function Cd(ByVal x As Single) As Single
         Return CdIntpol(x) * Cd0Act
 	End Function
 
+	Public Function CdA(ByVal vveh As Single) As Single
+		Return CdIntpol(vveh)
+	End Function
+
     Public Function Cd() As Single
         Return Cd0Act
     End Function

VECTO/MODcalc/cPower.vb

@@ -2330,7 +2330,7 @@ lb10:
 	Private Function fnU(ByVal V As Single, ByVal Gear As Integer, ByVal ClutchSlip As Boolean) As Single
 		Dim akn As Single
 		Dim U As Single
-		U = CSng(V * 60.0 * GBX.Igetr(0) * GBX.Igetr(Gear) / (2 * VEH.rdyn * Math.PI / 1000))
+		U = fnUout(V, Gear)
 		If U < ENG.Nidle Then U = ENG.Nidle
 		If ClutchSlip Then
 			akn = ClutchNorm / ((ENG.Nidle + ClutchNorm * (ENG.Nrated - ENG.Nidle)) / ENG.Nrated)
@@ -2344,7 +2344,7 @@ lb10:
 	End Function
 
 	Private Function fnUout(ByVal V As Single, ByVal Gear As Integer) As Single
-		Return V * 60.0 * GBX.Igetr(0) * GBX.Igetr(Gear) / (2 * VEH.rdyn * Math.PI / 1000)
+		Return V * 60.0 * GBX.Igetr(0) * GBX.Igetr(Gear) / (2 * Math.PI * VEH.rdyn / 1000)
 	End Function
 
 #End Region
@@ -2374,25 +2374,33 @@ lb10:
 	'----------------Drag-resistance----------------
 	Private Function fPair(ByVal v As Single, ByVal t As Integer) As Single
 		Dim vair As Single
-		Dim Cd As Single
+		Dim Vkmh As Single
+		Dim CdA As Single
+
+		Vkmh = v * 3.6
 
 		Select Case VEH.CdMode
 
 			Case tCdMode.ConstCd0
 				vair = v
-				Cd = VEH.Cd
+				CdA = VEH.Cd * VEH.CrossSecArea
+
+			Case tCdMode.CdOfVeng
+				vair = v
+				CdA = VEH.Cd(Vkmh) * VEH.CrossSecArea
 
-			Case tCdMode.CdOfV
+			Case tCdMode.CdOfVdecl
 				vair = v
-				Cd = VEH.Cd(v)
+				CdA = VEH.CdA(Vkmh)
 
 			Case Else 'tCdType.CdOfBeta
 				vair = MODdata.Vh.VairVres(t)
-				Cd = VEH.Cd(Math.Abs(MODdata.Vh.VairBeta(t)))
+				CdA = VEH.Cd(Math.Abs(MODdata.Vh.VairBeta(t))) * VEH.CrossSecArea
 
 		End Select
 
-		Return CSng((Cd * VEH.CrossSecArea * Cfg.AirDensity / 2 * ((vair) ^ 2)) * v * 0.001)
+		Return CSng((CdA * Cfg.AirDensity / 2 * ((vair) ^ 2)) * v * 0.001)
+
 	End Function
 
 	'--------Vehicle Acceleration-capability(Beschleunigungsleistung) --------

VECTO/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by entering "*" in them:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.1.0")> 
-<Assembly: AssemblyFileVersion("2.1.1.0")> 
+<Assembly: AssemblyVersion("2.1.2.0")> 
+<Assembly: AssemblyFileVersion("2.1.2.0")> 

VECTO/VECTO_Global.vb

@@ -11,7 +11,7 @@
 Imports System.Collections.Generic
 
 Module VECTO_Global
-	Public Const VECTOvers As String = "2.1.1"
+	Public Const VECTOvers As String = "2.1.2"
 	Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
 	Public MyAppPath As String
 	Public MyConfPath As String
@@ -341,8 +341,10 @@ Module VECTO_Global
 		Select Case CdMode
 			Case tCdMode.CdOfBeta
 				Return "CdOfBeta"
-			Case tCdMode.CdOfV
-				Return "CdOfV"
+			Case tCdMode.CdOfVeng
+				Return "CdOfVeng"
+			Case tCdMode.CdOfVdecl
+				Return "CdOfVdecl"
 			Case Else 'tCdMode.ConstCd0
 				Return "Off"
 		End Select
@@ -352,8 +354,10 @@ Module VECTO_Global
 		Select Case UCase(Trim(CdMode))
 			Case "CDOFBETA"
 				Return tCdMode.CdOfBeta
-			Case "CDOFV"
-				Return tCdMode.CdOfV
+			Case "CDOFV", "CDOFVENG"
+				Return tCdMode.CdOfVeng
+			Case "CDOFVDECL"
+				Return tCdMode.CdOfVdecl
 			Case Else '"OFF"
 				Return tCdMode.ConstCd0
 		End Select

VECTO/VECTO_Types.vb

@@ -100,8 +100,9 @@ End Enum
 
 Public Enum tCdMode
     ConstCd0 = 0
-    CdOfV = 1
-    CdOfBeta = 2
+	CdOfVeng = 1
+	CdOfVdecl = 2
+	CdOfBeta = 3
 End Enum
 
 Public Enum tRtType

VECTO/cDeclaration.vb

@@ -12,6 +12,7 @@
 Imports System.Collections.Generic
 Imports iTextSharp.text.pdf
 Imports System.IO
+Imports System.Linq
 
 Public Class cDeclaration
 	Public CurrentMission As cMission
@@ -44,6 +45,8 @@ Public Class cDeclaration
 
 	Public Const AuxESeff As Single = 0.7
 
+	Public Const Vwind As Single = 3.0
+
 	Private lPT1nU As List(Of Single)
 	Private lPT1 As List(Of Single)
 	Private PT1dim As Integer
@@ -69,10 +72,22 @@ Public Class cDeclaration
 
 	Private AuxPSpower As Dictionary(Of String, Dictionary(Of tMission, Single))
 
-
 	Private Wheels As Dictionary(Of String, cWheel)
 	Private Rims As Dictionary(Of String, cRim)
 
+	Private VCDVvehClassParam As Dictionary(Of String, List(Of Single))
+
+	Public Function VCDVparamPerCat(ByVal VehCat As tVehCat) As List(Of Single)
+		Select Case VehCat
+			Case tVehCat.Citybus, tVehCat.Coach, tVehCat.InterurbanBus
+				Return VCDVvehClassParam("CoachBus")
+			Case tVehCat.Tractor
+				Return VCDVvehClassParam("TractorSemitrailer")
+			Case Else 'tVehCat.RigidTruck, tVehCat.Undef
+				Return VCDVvehClassParam("RigidSolo")
+		End Select
+	End Function
+
 	Public Function Init() As Boolean
 
 		Dim file As New cFile_V3
@@ -186,6 +201,36 @@ Public Class cDeclaration
 		Missions.Add(mc0.MissionID, mc0)
 		SegmentTable.MissionList.Add(mc0.MissionID)
 
+		'Cross Wind Correction parameters  (BEFORE Segment Table!)
+		VCDVvehClassParam = New Dictionary(Of String, List(Of Single))
+
+		If Not file.OpenRead(MyDeclPath & "VCDV\paramerters.csv") Then
+			GUImsg(tMsgID.Err, "Failed to load Declaration Config (VCDV\paramerters)!")
+			Return False
+		End If
+
+		'Skip Header
+		file.ReadLine()
+
+		Try
+
+			Do While Not file.EndOfFile
+				line = file.ReadLine
+				VCDVvehClassParam.Add(line(0), New List(Of Single))
+				VCDVvehClassParam(line(0)).Add(line(1))
+				VCDVvehClassParam(line(0)).Add(line(2))
+				VCDVvehClassParam(line(0)).Add(line(3))
+			Loop
+
+		Catch ex As Exception
+			file.Close()
+			GUImsg(tMsgID.Err, "Error in VCDV\paramerters! " & ex.Message)
+			Return False
+		End Try
+
+		file.Close()
+
+
 
 		'Segment Table
 		If Not file.OpenRead(MyDeclPath & "SegmentTable.csv") Then
@@ -232,10 +277,11 @@ Public Class cDeclaration
 
 					For Each mt0 In SegmentTable.MissionList
 						If mt0 = tMission.LongHaul Then
-                            ste0.VCDVfile.Add(mt0, MyDeclPath & "VCDV\" & line(7))
+							s0 = line(7)
 						Else
-                            ste0.VCDVfile.Add(mt0, MyDeclPath & "VCDV\" & line(8))
+							s0 = line(8)
 						End If
+						If VCDVvehClassParam.ContainsKey(s0) Then ste0.VCDVparam.Add(mt0, VCDVvehClassParam(s0))
 					Next
 
 					AxleShares.Add(line(9))	   'Long Haul
@@ -603,7 +649,6 @@ Public Class cDeclaration
 		file.Close()
 
 
-
 		'Wheels
 		Wheels = New Dictionary(Of String, cWheel)
 
@@ -829,7 +874,7 @@ Public Class cDeclaration
 			+ Declaration.SegRef.WHTCWF(Declaration.CurrentMission.MissionID)(tWHTCpart.Motorway) * ENG.WHTCmw / Declaration.WHTCresults(tWHTCpart.Motorway)
 
 
-        If Not VEH.DeclInit Then Return False
+		If Not VEH.DeclInitCycle Then Return False
 
 		Return True
 
@@ -1190,12 +1235,11 @@ Public Class cSegmentTableEntry
 	Public AxleConf As tAxleConf
 	Public MinGVW As Single
 	Public MaxGVW As Single
-    Public VehClass As String
 	Public Missions As New List(Of tMission)
 	Public UseMission As New List(Of Boolean)
 	Public HDVclass As String
 	Public VACCfile As String
-    Public VCDVfile As New Dictionary(Of tMission, String)
+	Public VCDVparam As New Dictionary(Of tMission, List(Of Single))
 	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))