- Added N80h engine speed for 1C>2C shifting (instead of N95h)

- Added AT Bus to Generic Vehicles
- Shift model updated

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT Bus Demo.vecto

+{
+  "Header": {
+    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+    "Date": "17.06.2014 13:48:52",
+    "AppVersion": "2.0.2-beta2",
+    "FileVersion": 1
+  },
+  "Body": {
+    "VehicleFile": "Vehicle.vveh",
+    "EngineFile": "Engine.veng",
+    "GearboxFile": "Gearbox.vgbx",
+    "Cycles": [
+      "zykl_Citybus_1_Heavy_Urban.vdri",
+      "zykl_Citybus_2_Urban.vdri",
+      "zykl_Citybus_3_Suburban.vdri"
+    ],
+    "Aux": [
+      {
+        "ID": "ALT",
+        "Type": "Alternator",
+        "Path": "Alt.vaux",
+        "Technology": ""
+      }
+    ],
+    "VACC": "test.vacc",
+    "EngineOnlyMode": false,
+    "StartStop": {
+      "Enabled": false,
+      "MaxSpeed": 5.0,
+      "MinTime": 5.0,
+      "Delay": 0
+    },
+    "LAC": {
+      "Enabled": false,
+      "Dec": -0.5,
+      "MinSpeed": 50.0
+    },
+    "OverSpeedEcoRoll": {
+      "Mode": "Off",
+      "MinSpeed": 0.0,
+      "OverSpeed": 0.0,
+      "UnderSpeed": 0.0
+    }
+  }
+}
\ No newline at end of file

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/AT-Shift.vgbs

+M_shift in Nm,n_down in rpm,n_up in rpm
+-200,600,660
+0,600,660
+350,600,660
+1200,1250,1500

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Alt.vaux

+Transmission ration to engine rpm [-]
+4.5
+Efficiency to engine [-]
+0.98
+Efficiency auxiliary to supply [-]
+1
+Auxiliary speed,Mechanical power,Supply power ]
+1630,0.03,0
+2000,0.04,0
+2000,0.32,0.2
+2000,0.6,0.4
+2000,0.87,0.6
+2000,1.11,0.8
+2000,1.36,1
+2000,1.59,1.2
+2000,1.83,1.4
+2000,1.95,1.51
+2500,0.04,0
+2500,0.31,0.2
+2500,0.58,0.4
+2500,0.83,0.6
+2500,1.08,0.8
+2500,1.32,1
+2500,1.56,1.2
+2500,1.79,1.4
+2500,2.04,1.6
+2500,2.29,1.8
+2500,2.56,2
+2500,2.84,2.2
+2500,3.14,2.4
+2500,3.31,2.51
+3000,0.05,0
+3000,0.31,0.2
+3000,0.57,0.4
+3000,0.81,0.6
+3000,1.06,0.8
+3000,1.3,1
+3000,1.54,1.2
+3000,1.78,1.4
+3000,2.01,1.6
+3000,2.27,1.8
+3000,2.54,2
+3000,2.82,2.2
+3000,3.12,2.4
+3000,3.42,2.6
+3000,3.76,2.8
+3000,4.13,3.02
+3500,0.06,0
+3500,0.31,0.2
+3500,0.56,0.4
+3500,0.81,0.6
+3500,1.05,0.8
+3500,1.29,1
+3500,1.54,1.2
+3500,1.78,1.4
+3500,2.01,1.6
+3500,2.27,1.8
+3500,2.54,2
+3500,2.82,2.2
+3500,3.11,2.4
+3500,3.41,2.6
+3500,3.74,2.8
+3500,4.08,3
+3500,4.44,3.2
+3500,4.64,3.31
+4000,0.07,0
+4000,0.32,0.2
+4000,0.57,0.4
+4000,0.81,0.6
+4000,1.05,0.8
+4000,1.29,1
+4000,1.54,1.2
+4000,1.78,1.4
+4000,2.04,1.6
+4000,2.29,1.8
+4000,2.55,2
+4000,2.83,2.2
+4000,3.12,2.4
+4000,3.41,2.6
+4000,3.74,2.8
+4000,4.06,3
+4000,4.41,3.2
+4000,4.77,3.4
+4000,4.95,3.51
+4500,0.1,0
+4500,0.34,0.2
+4500,0.58,0.4
+4500,0.82,0.6
+4500,1.06,0.8
+4500,1.3,1
+4500,1.55,1.2
+4500,1.79,1.4
+4500,2.05,1.6
+4500,2.31,1.8
+4500,2.58,2
+4500,2.85,2.2
+4500,3.14,2.4
+4500,3.43,2.6
+4500,3.76,2.8
+4500,4.08,3
+4500,4.4,3.2
+4500,4.77,3.4
+4500,5.17,3.62
+5000,0.11,0
+5000,0.35,0.2
+5000,0.59,0.4
+5000,0.83,0.6
+5000,1.07,0.8
+5000,1.31,1
+5000,1.56,1.2
+5000,1.81,1.4
+5000,2.07,1.6
+5000,2.33,1.8
+5000,2.6,2
+5000,2.88,2.2
+5000,3.16,2.4
+5000,3.47,2.6
+5000,3.78,2.8
+5000,4.09,3
+5000,4.43,3.2
+5000,4.78,3.4
+5000,5.13,3.6
+5000,5.34,3.7
+5500,0.13,0
+5500,0.37,0.2
+5500,0.6,0.4
+5500,0.84,0.6
+5500,1.09,0.8
+5500,1.33,1
+5500,1.58,1.2
+5500,1.83,1.4
+5500,2.09,1.6
+5500,2.36,1.8
+5500,2.63,2
+5500,2.91,2.2
+5500,3.2,2.4
+5500,3.5,2.6
+5500,3.81,2.8
+5500,4.12,3
+5500,4.46,3.2
+5500,4.8,3.4
+5500,5.15,3.6
+5500,5.46,3.76
+6000,0.15,0
+6000,0.39,0.2
+6000,0.62,0.4
+6000,0.86,0.6
+6000,1.11,0.8
+6000,1.35,1
+6000,1.6,1.2
+6000,1.86,1.4
+6000,2.12,1.6
+6000,2.39,1.8
+6000,2.66,2
+6000,2.95,2.2
+6000,3.24,2.4
+6000,3.53,2.6
+6000,3.84,2.8
+6000,4.16,3
+6000,4.49,3.2
+6000,4.83,3.4
+6000,5.18,3.6
+6000,5.57,3.81
+6500,0.17,0
+6500,0.41,0.2
+6500,0.65,0.4
+6500,0.89,0.6
+6500,1.13,0.8
+6500,1.38,1
+6500,1.63,1.2
+6500,1.89,1.4
+6500,2.15,1.6
+6500,2.42,1.8
+6500,2.7,2
+6500,2.99,2.2
+6500,3.28,2.4
+6500,3.58,2.6
+6500,3.9,2.8
+6500,4.21,3
+6500,4.54,3.2
+6500,4.89,3.4
+6500,5.24,3.6
+6500,5.7,3.85
+7000,0.21,0
+7000,0.44,0.2
+7000,0.68,0.4
+7000,0.91,0.6
+7000,1.16,0.8
+7000,1.41,1
+7000,1.66,1.2
+7000,1.92,1.4
+7000,2.19,1.6
+7000,2.46,1.8
+7000,2.74,2
+7000,3.03,2.2
+7000,3.32,2.4
+7000,3.63,2.6
+7000,3.94,2.8
+7000,4.26,3
+7000,4.59,3.2
+7000,4.95,3.4
+7000,5.3,3.6
+7000,5.78,3.87
+7500,0.25,0
+7500,0.48,0.2
+7500,0.71,0.4
+7500,0.94,0.6
+7500,1.19,0.8
+7500,1.44,1
+7500,1.69,1.2
+7500,1.95,1.4
+7500,2.22,1.6
+7500,2.5,1.8
+7500,2.78,2
+7500,3.07,2.2
+7500,3.37,2.4
+7500,3.68,2.6
+7500,3.99,2.8
+7500,4.32,3
+7500,4.65,3.2
+7500,5,3.4
+7500,5.35,3.6
+7500,5.9,3.9
+8000,0.28,0
+8000,0.51,0.2
+8000,0.74,0.4
+8000,0.97,0.6
+8000,1.22,0.8
+8000,1.47,1
+8000,1.72,1.2
+8000,1.99,1.4
+8000,2.27,1.6
+8000,2.54,1.8
+8000,2.82,2
+8000,3.12,2.2
+8000,3.42,2.4
+8000,3.73,2.6
+8000,4.06,2.8
+8000,4.38,3
+8000,4.72,3.2
+8000,5.06,3.4
+8000,5.42,3.6
+8000,5.79,3.8
+8000,6,3.91
+8500,0.32,0
+8500,0.55,0.2
+8500,0.77,0.4
+8500,1.01,0.6
+8500,1.25,0.8
+8500,1.51,1
+8500,1.76,1.2
+8500,2.03,1.4
+8500,2.31,1.6
+8500,2.58,1.8
+8500,2.87,2
+8500,3.16,2.2
+8500,3.48,2.4
+8500,3.79,2.6
+8500,4.11,2.8
+8500,4.44,3
+8500,4.78,3.2
+8500,5.14,3.4
+8500,5.5,3.6
+8500,5.87,3.8
+8500,6.12,3.93
+9000,0.35,0
+9000,0.58,0.2
+9000,0.81,0.4
+9000,1.05,0.6
+9000,1.29,0.8
+9000,1.54,1
+9000,1.8,1.2
+9000,2.07,1.4
+9000,2.35,1.6
+9000,2.63,1.8
+9000,2.92,2
+9000,3.22,2.2
+9000,3.53,2.4
+9000,3.85,2.6
+9000,4.17,2.8
+9000,4.51,3
+9000,4.86,3.2
+9000,5.21,3.4
+9000,5.58,3.6
+9000,5.96,3.8
+9000,6.21,3.94
+9500,0.4,0
+9500,0.63,0.2
+9500,0.85,0.4
+9500,1.09,0.6
+9500,1.33,0.8
+9500,1.59,1
+9500,1.85,1.2
+9500,2.12,1.4
+9500,2.39,1.6
+9500,2.68,1.8
+9500,2.97,2
+9500,3.28,2.2
+9500,3.59,2.4
+9500,3.91,2.6
+9500,4.24,2.8
+9500,4.58,3
+9500,4.93,3.2
+9500,5.3,3.4
+9500,5.67,3.6
+9500,6.05,3.8
+9500,6.32,3.95
+12000,0.43,0
+12000,0.67,0.2
+12000,0.89,0.4
+12000,1.13,0.6
+12000,1.37,0.8
+12000,1.63,1
+12000,1.9,1.2
+12000,2.16,1.4
+12000,2.45,1.6
+12000,2.73,1.8
+12000,3.02,2
+12000,3.34,2.2
+12000,3.65,2.4
+12000,3.97,2.6
+12000,4.31,2.8
+12000,4.65,3
+12000,5.01,3.2
+12000,5.39,3.4
+12000,5.76,3.6
+12000,6.14,3.8
+12000,6.38,3.95

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Engine.veng

+{
+  "Header": {
+    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+    "Date": "17.06.2014 12:26:40",
+    "AppVersion": "2.0.2-beta1",
+    "FileVersion": 1
+  },
+  "Body": {
+    "ModelName": "Demo Engine",
+    "Displacement": 7700.0,
+    "IdlingSpeed": 600.0,
+    "Inertia": 3.8,
+    "FullLoadCurves": [
+      {
+        "Path": "FullLoad.vfld",
+        "Gears": "0-99"
+      }
+    ],
+    "FuelMap": "FCMap.vmap",
+    "WHTC-Urban": 0.0,
+    "WHTC-Rural": 0.0,
+    "WHTC-Motorway": 0.0
+  }
+}
\ No newline at end of file

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/FCMap.vmap

+n in rpm,M in Nm,FC in g/h,
+600,-45,0,
+600,0,767,
+600,100,1759,
+600,200,2890,
+600,300,4185,
+600,400,5404,
+600,500,6535,
+600,600,7578,
+800,-55,0,
+800,0,951,
+800,100,2346,
+800,200,3653,
+800,300,5328,
+800,400,6903,
+800,500,8503,
+800,600,10003,
+800,700,11641,
+800,836,13867,
+1000,-63,0,
+1000,0,1006,
+1000,100,2932,
+1000,200,4503,
+1000,300,6472,
+1000,400,8503,
+1000,500,10472,
+1000,600,12504,
+1000,700,14514,
+1000,800,16546,
+1000,900,18567,
+1000,1000,20577,
+1000,1070,21962,
+1100,-69,0,
+1100,0,1235,
+1200,-75,0,
+1200,0,1467,
+1200,100,3063,
+1200,200,5359,
+1200,300,7701,
+1200,400,10082,
+1200,500,12504,
+1200,600,14902,
+1200,700,17182,
+1200,800,19569,
+1200,900,21989,
+1200,1000,24411,
+1200,1100,26819,
+1200,1200,29601,
+1300,-81,0,
+1300,0,1684,
+1300,100,3302,
+1300,200,5828,
+1300,300,8367,
+1300,400,10926,
+1300,500,13533,
+1300,600,16046,
+1300,700,18591,
+1300,800,21172,
+1300,900,23733,
+1300,1000,26321,
+1300,1100,28756,
+1300,1200,31288,
+1400,-88,0,
+1400,0,1943,
+1400,100,3660,
+1400,200,6304,
+1400,300,9031,
+1400,400,11783,
+1400,500,14466,
+1400,600,17180,
+1400,700,20015,
+1400,800,22828,
+1400,900,25498,
+1400,1000,28127,
+1400,1100,30815,
+1400,1200,33609,
+1500,-93,0,
+1500,0,2167,
+1500,100,3963,
+1500,200,6793,
+1500,300,9721,
+1500,400,12670,
+1500,500,15534,
+1500,600,18413,
+1500,700,21467,
+1500,800,24495,
+1500,900,27363,
+1500,1000,30056,
+1500,1100,33082,
+1500,1200,36100,
+1600,-98,0,
+1600,0,2391,
+1600,100,4272,
+1600,200,7257,
+1600,300,10398,
+1600,400,13535,
+1600,500,16711,
+1600,600,19835,
+1600,700,22965,
+1600,800,26115,
+1600,900,29164,
+1600,1000,32057,
+1600,1100,35231,
+1600,1200,38423,
+1700,-101,0,
+1700,0,2641,
+1700,100,4578,
+1700,200,7768,
+1700,300,11114,
+1700,400,14439,
+1700,500,17759,
+1700,600,21069,
+1700,700,24380,
+1700,800,27739,
+1700,900,31000,
+1700,1000,34205,
+1700,1100,37738,
+1700,1165,40006,
+1800,-104,0,
+1800,0,2890,
+1800,100,4965,
+1800,200,8233,
+1800,300,11783,
+1800,400,15307,
+1800,500,18849,
+1800,600,22267,
+1800,700,25749,
+1800,800,29389,
+1800,900,32951,
+1800,1000,36568,
+1800,1124,41263,
+1900,-108,0,
+1900,0,3192,
+1900,100,5416,
+1900,200,8777,
+1900,300,12531,
+1900,400,16204,
+1900,500,19993,
+1900,600,23620,
+1900,700,27255,
+1900,800,31168,
+1900,900,35024,
+1900,1000,38907,
+1900,1080,41993,
+2000,-112,0,
+2000,0,3496,
+2000,100,5853,
+2000,200,9345,
+2000,300,13315,
+2000,400,17188,
+2000,500,21137,
+2000,600,25058,
+2000,700,28927,
+2000,800,33026,
+2000,900,37178,
+2000,1038,42689,
+2100,-119,0,
+2100,0,3873,
+2100,100,6296,
+2100,200,9929,
+2100,300,14095,
+2100,400,18157,
+2100,500,22233,
+2100,600,26479,
+2100,700,30774,
+2100,800,35001,
+2100,900,39377,
+2100,997,43557,
+2200,-126,0,
+2200,0,4247,
+2200,100,6689,
+2200,200,10535,
+2200,300,14855,
+2200,400,19151,
+2200,500,23395,
+2200,600,27834,
+2200,700,32507,
+2200,800,37130,
+2200,900,41619,
+2200,954,44014,
+2300,-131,0,
+2300,0,4523,
+2300,100,7178,
+2300,200,11221,
+2300,300,15658,
+2300,400,20237,
+2300,500,24761,
+2300,600,29476,
+2300,700,34611,
+2300,800,39599,
+2300,898,44083,
+2400,-136,0,
+2400,0,4945,
+2400,100,7525,
+2400,200,11830,
+2400,300,16443,
+2400,400,21307,
+2400,500,26324,
+2400,600,31334,
+2400,700,36714,
+2400,815,42842,
+2500,-141,0,
+2500,0,5338,
+2500,100,7731,
+2500,200,12385,
+2500,300,17231,
+2500,400,22333,
+2500,500,27940,
+2500,600,33195,
+2500,711,39440,
+2600,-149,0,
+2600,0,5700,

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/FullLoad.vfld

+n in rpm,M_FL in Nm,M_frict in Nm,PT1 in s
+575,570,-12,0.21
+800,834,-16,0.47
+1000,1068,-24,0.58
+1200,1198,-33,0.53
+1400,1198,-44,0.46
+1600,1198,-56,0.35
+1800,1122,-67,0.20
+2000,1036,-82,0.11
+2100,995,-89,0.11
+2200,952,-97,0.11
+2400,813,-119,0.11
+2500,709,-134,0.11
+2600,0,-148,0.11

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Gearbox.vgbx

+{
+  "Header": {
+    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+    "Date": "23.06.2014 13:46:07",
+    "AppVersion": "2.0.2-beta3",
+    "FileVersion": 3
+  },
+  "Body": {
+    "ModelName": "Gearbox",
+    "Inertia": 0.0,
+    "TracInt": 0.0,
+    "Gears": [
+      {
+        "Ratio": 6.2,
+        "Efficiency": "0.95"
+      },
+      {
+        "Ratio": 3.0,
+        "Efficiency": "0.96",
+        "TCactive": true,
+        "ShiftPolygon": "AT-Shift.vgbs"
+      },
+      {
+        "Ratio": 3.0,
+        "Efficiency": "0.96",
+        "TCactive": false,
+        "ShiftPolygon": "AT-Shift.vgbs"
+      },
+      {
+        "Ratio": 1.0,
+        "Efficiency": "0.98",
+        "TCactive": false,
+        "ShiftPolygon": "AT-Shift.vgbs"
+      },
+      {
+        "Ratio": 0.8,
+        "Efficiency": "0.96",
+        "TCactive": false,
+        "ShiftPolygon": "AT-Shift.vgbs"
+      }
+    ],
+    "TqReserve": 5.0,
+    "SkipGears": false,
+    "ShiftTime": 1,
+    "EaryShiftUp": false,
+    "StartTqReserve": 40.0,
+    "StartSpeed": 4.0,
+    "StartAcc": 0.8,
+    "GearboxType": "AT",
+    "TorqueConverter": {
+      "Enabled": true,
+      "File": "TorqueConverter.vtcc",
+      "RefRPM": 1000.0,
+      "Inertia": 0.5
+    }
+  }
+}
\ No newline at end of file

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/TorqueConverter.vtcc

+Speed Ratio, Torque Ratio,MP1000
+0,3.935741,563.6598
+0.1,3.296827,534.1364
+0.2,2.701476,504.6129
+0.3,2.265852,472.1372
+0.4,1.931875,421.9474
+0.5,1.554335,354.0435
+0.6,1.249399,268.4255
+0.7,1.075149,114.9037

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/Vehicle.vveh

+{
+  "Header": {
+    "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+    "Date": "17.06.2014 12:25:51",
+    "AppVersion": "2.0.2-beta1",
+    "FileVersion": 4
+  },
+  "Body": {
+    "VehCat": "Citybus",
+    "CurbWeight": 11500.0,
+    "CurbWeightExtra": 0.0,
+    "Loading": 2000.0,
+    "MassMax": 18.0,
+    "Cd": 0.67,
+    "CrossSecArea": 8.0,
+    "rdyn": 465.0,
+    "Rim": "-",
+    "CdCorrMode": "Off",
+    "CdCorrFile": "<NOFILE>",
+    "Retarder": {
+      "Type": "None",
+      "Ratio": 1.0,
+      "File": "<NOFILE>"
+    },
+    "AxleConfig": {
+      "Type": "4x2",
+      "Axles": [
+        {
+          "Inertia": 20.0,
+          "Wheels": "-",
+          "AxleWeightShare": 0.38,
+          "TwinTyres": false,
+          "RRCISO": 0.007,
+          "FzISO": 30436.0
+        },
+        {
+          "Inertia": 18.0,
+          "Wheels": "-",
+          "AxleWeightShare": 0.62,
+          "TwinTyres": true,
+          "RRCISO": 0.007,
+          "FzISO": 30436.0
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file

Generic Vehicles/Engineering Mode/AT-TC Demo Vehicle/test.vacc

+v,a_desmax,a_brake
+0,0.70,-0.80
+2,1.00,-1.10
+4,1.30,-1.50
+6,1.50,-1.70
+8,1.60,-1.90
+10,1.60,-2.00
+12,1.60,-2.00
+14,1.60,-2.00
+16,1.50,-2.00
+18,1.40,-2.00
+20,1.30,-2.00
+25,1.10,-1.90
+30,0.90,-1.70
+35,0.75,-1.50
+40,0.60,-1.20
+45,0.50,-0.90
+50,0.40,-0.60
+55,0.35,-0.40
+60,0.30,-0.30
+70,0.30,-0.30
+80,0.30,-0.30
+90,0.30,-0.30
+100,0.30,-0.30

VECTO/Input Files/cFLD.vb

@@ -76,6 +76,12 @@ Public Class cFLD
     ''' <remarks></remarks>
     Public N95h As Single
 
+    ''' <summary>
+    ''' N80h [1/min]. Highest engine speed with 80% of max. power. Defined in Init.
+    ''' </summary>
+    ''' <remarks></remarks>
+    Public N80h As Single
+
     ''' <summary>
     ''' Read file. FilePath must be set before calling. 
     ''' </summary>
@@ -553,6 +559,13 @@ lbInt:
             Return False
         End If
 
+        N80h = fnUofPfull(0.8 * Pmax, False)
+
+        If N80h < 0 Then
+            WorkerMsg(tMsgID.Err, "Failed to calculate N80h! Expand full load curve!", MsgSrc)
+            Return False
+        End If
+
         Npref = fNpref(Nidle)
 
         If Npref < 0 Then

VECTO/Input Files/cGBX.vb

@@ -477,7 +477,7 @@ Public Class cGBX
         End If
 
         'Reduce step size if nu-range is too low
-        Do While (nuMax - nuMin) / nuStep < 10 And nuStep > 0.00001
+        Do While (nuMax - nuMin) / nuStep < 10 And nuStep > 0.0001
             nuStep *= 0.1
         Loop
 

VECTO/MODcalc/cPower.vb

@@ -486,6 +486,8 @@ Public Class cPower
         Dim LastPmax As Single
         Dim dist As Double
         Dim dist0 As Double
+        Dim Tq As Single
+        Dim LastGear As Integer
 
         Dim MsgSrc As String
 
@@ -544,6 +546,8 @@ Public Class cPower
         ClutchNorm = 0.03
         ClutchEta = 1
 
+        Tq = 0
+        LastGear = 0
 
         LastClutch = tEngClutch.Opened
 
@@ -713,7 +717,10 @@ lbGschw:
 
                     'Gear-shifting Model
                     If GBX.TCon Then
-                        Gear = fGearTC(jz, Vh.fGrad(dist))
+
+                        If jz > 0 Then Tq = nPeToM(fnU(Vact, LastGear, False), fPeGearMod(LastGear, jz, Vh.fGrad(dist)))
+
+                        Gear = fGearTC(jz, Vh.fGrad(dist), Tq)
                     Else
                         Gear = fGearVECTO(jz, Vh.fGrad(dist))
                     End If
@@ -989,7 +996,7 @@ lb_nOK:
 
             'Internal Engine Power (Pclutch plus Aux plus Inertia)
             P = Pclutch + Paux + PaMot
-
+            Tq = nPeToM(nU, P)
 
             'EngState
             If Clutch = tEngClutch.Opened Then
@@ -1181,6 +1188,13 @@ lb_nOK:
             '--------------------------------------------------------------------------------------------------
             '   Finish Second
 
+
+            'If Gear = GBX.GearCount Then
+            '    Debug.Print(jz + 1 & ",-")
+            'Else
+            '    Debug.Print(jz + 1 & "," & fnU(Vact, Gear + 1, False))
+            'End If
+
             'distance 
             dist0 += Vact
 
@@ -1322,6 +1336,8 @@ lb_nOK:
 
             LastPmax = Pmax
 
+            LastGear = Gear
+
         Loop Until jz >= MODdata.tDim
 
         '***********************************************************************************************
@@ -1800,14 +1816,13 @@ lb_nOK:
 
     End Function
 
-    Private Function fGearTC(ByVal t As Int16, ByVal Grad As Single) As Integer
+    Private Function fGearTC(ByVal t As Int16, ByVal Grad As Single, ByVal Tq As Single) As Integer
         Dim LastGear As Int16
         Dim tx As Int16
         Dim nU As Single
         Dim nUup As Single
         Dim nUdown As Single
-        Dim Tq As Single
-        Dim LastPe As Single
+        Dim Pe As Single
         Dim nUnext As Single
         Dim OutOfRpmRange As Boolean
         Dim PlusGearLockUp As Boolean
@@ -1867,10 +1882,7 @@ lb_nOK:
             If Not OutOfRpmRange AndAlso t - LastGearChange <= GBX.gs_ShiftTime And t > GBX.gs_ShiftTime - 1 Then Return LastGear
         End If
 
-        'previous power demand
-        LastPe = MODdata.Pe(t - 1)
-        'Torque
-        Tq = LastPe * 1000 / (nU * 2 * Math.PI / 60)
+        Pe = Tq * (nU * 2 * Math.PI / 60) / 1000
 
         'Up/Downshift rpms
         nUup = GBX.Shiftpolygons(LastGear).fGSnUup(Tq)
@@ -1878,7 +1890,7 @@ lb_nOK:
 
         'Upshift
         If PlusGearLockUp Then
-            If nUnext > nUup AndAlso LastPe <= FLD(LastGear + 1).Pfull(nUnext) Then
+            If nUnext > nUup AndAlso Pe <= FLD(LastGear + 1).Pfull(nUnext) Then
                 Return LastGear + 1
             End If
         Else
@@ -1887,7 +1899,7 @@ lb_nOK:
 
                 iRatio = GBX.Igetr(LastGear + 1) / GBX.Igetr(LastGear)
 
-                If fnUout(Vact, LastGear + 1) > Math.Min(900, iRatio * (FLD(LastGear).N95h - 150)) AndAlso FLD(LastGear + 1).Pfull(nU * iRatio, LastPe) > 0.7 * FLD(LastGear).Pfull(nU, LastPe) Then
+                If fnUout(Vact, LastGear + 1) > Math.Min(900, iRatio * (FLD(LastGear).N80h - 150)) AndAlso FLD(LastGear + 1).Pfull(nU * iRatio, Pe) > 0.7 * FLD(LastGear).Pfull(nU, Pe) Then
                     Return LastGear + 1
                 End If
             End If

VECTO/VECTO_Global.vb

@@ -12,7 +12,7 @@ Imports System.Collections.Generic
 
 Module VECTO_Global
 
-    Public Const VECTOvers As String = "2.0.4-beta4 Test"
+    Public Const VECTOvers As String = "2.0.4-beta4 Test2"
     Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
     Public MyAppPath As String
     Public MyConfPath As String