diff --git a/CHANGES.md b/CHANGES.md
index 97eaf1fc9536638f454596c007a75736182b0c23..7a24374e865ff5b5ac376f3f91b9dcfca591cebb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,15 @@
### VECTO x.x (current source)
TODO
-- Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)
+* Traction interruption: No engine rev down - hold rpm until new gear engaged (Allison)
+
+### VECTO 2.1.4
+* Bugfixes in start gear and (A)MT shift model
+* Updated Coach .vcdv file for higher speeds to avoid extrapolation
+* Renamed output "FC" to "FC-Map" for better clarification
+* Same header for g/h and g/km output
+* Reduced minimum turbine speed for 1C-to-2C AT up-shift condition from 900 to 700rpm.
+* Updated cross wind correction parameters to current White Book values
### VECTO 2.1.3
* PwheelPos output in VSUM file.
diff --git a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv
index f739a3d532b2559d1b48b95ad04369d2c91630df..ec81cff161820618abe871c3174c7ff12c3d970e 100644
--- a/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv
+++ b/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vcdv
@@ -20,3 +20,5 @@
90,1.06160070824245
95,1.05601203497592
100,1.05120696831716
+105,1.0477
+110,1.045
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 0cd97831c6e825bfa4d9d07717ea901ff0f47f31..7a19b9b8861dc8943ddc09e14f11af72f6dc4857 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -552,7 +552,7 @@ Public Class cMOD
End If
- HeaderList.Add(New String() {"FC", "g/h"})
+ HeaderList.Add(New String() {"FC-Map", "g/h"})
HeaderList.Add(New String() {"FC-AUXc", "g/h"})
HeaderList.Add(New String() {"FC-WHTCc", "g/h"})
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index b4bb32b16ca0d529ae0935f1a3b1697520e54cc5..aafcc28d469de7193ed7e1b31a12c6a776a04a2c 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -1988,13 +1988,13 @@ lb_nOK:
If DEV.TCshiftModeNew Then
If _
- fnUout(Vact, LastGear + 1) > Math.Min(900, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
+ fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
FLD(LastGear + 1).Pfull(nU * iRatio) >= fPeGearMod(LastGear + 1, t, MODdata.Vh.V(t), TCaccmin, Grad) Then
Return LastGear + 1
End If
Else
If _
- fnUout(Vact, LastGear + 1) > Math.Min(900, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
+ fnUout(Vact, LastGear + 1) > Math.Min(700, iRatio * (FLD(LastGear).N80h - 150)) AndAlso
FLD(LastGear + 1).Pfull(nU * iRatio) > 0.7 * FLD(LastGear).Pfull(nU) Then
Return LastGear + 1
End If
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index 1fc1bf63fdccd8c4413af4bdfca175f15400fb53..b2512db355386236a41c15cdf0acb190929ed92b 100644
--- a/VECTO/My Project/AssemblyInfo.vb
+++ b/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.3.0")>
-<Assembly: AssemblyFileVersion("2.1.3.0")>
+<Assembly: AssemblyVersion("2.1.4.0")>
+<Assembly: AssemblyFileVersion("2.1.4.0")>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 587ac4ab853d7021fa1e6991e619cc0c7c542d92..3f6b1ef950c2c868dd479f4859249ea63b682f4e 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -11,7 +11,7 @@
Imports System.Collections.Generic
Module VECTO_Global
- Public Const VECTOvers As String = "2.1.3"
+ Public Const VECTOvers As String = "2.1.4"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
diff --git a/VECTO/cVSUM.vb b/VECTO/cVSUM.vb
index 0ea5e684203f0370220ddfa24111cf0e35074938..bf00a90827d8ff9417617ef4a23b686d0ccd21cf 100644
--- a/VECTO/cVSUM.vb
+++ b/VECTO/cVSUM.vb
@@ -393,18 +393,18 @@ Class cVSUM
If VSUMentries(key).Multi Then
- If dic1.ContainsKey(VSUMentries(key).Head) Then
- ls0 = dic1(VSUMentries(key).Head)
- Else
- ls0 = New List(Of Dictionary(Of String, Object))
- dic1.Add(VSUMentries(key).Head, ls0)
- End If
+ If dic1.ContainsKey(VSUMentries(key).Head) Then
+ ls0 = dic1(VSUMentries(key).Head)
+ Else
+ ls0 = New List(Of Dictionary(Of String, Object))
+ dic1.Add(VSUMentries(key).Head, ls0)
+ End If
ls0.Add(dic0)
Else
- dic1.Add(VSUMentries(key).Head, dic0)
+ dic1.Add(VSUMentries(key).Head, dic0)
End If
@@ -436,13 +436,13 @@ Class cVSUM
End Function
- Private Sub AddToVSUM(ByVal IDstring As String, ByVal Head As String, ByVal Unit As String, Optional Multi As Boolean = False)
- If Not VSUMentries.ContainsKey(IDstring) Then
- VSUMentries.Add(IDstring, New cVSUMentry(Head, Unit))
- VSUMentryList.Add(IDstring)
- If Multi Then VSUMentries(IDstring).Multi = True
- End If
- End Sub
+ Private Sub AddToVSUM(ByVal IDstring As String, ByVal Head As String, ByVal Unit As String, Optional Multi As Boolean = False)
+ If Not VSUMentries.ContainsKey(IDstring) Then
+ VSUMentries.Add(IDstring, New cVSUMentry(Head, Unit))
+ VSUMentryList.Add(IDstring)
+ If Multi Then VSUMentries(IDstring).Multi = True
+ End If
+ End Sub
Public Function Init(ByVal JobFile As String) As Boolean
@@ -628,15 +628,15 @@ Class cVSUM
Return False
End Try
- AddToVSUM("FC_h", "FCh", "[g/h]")
- AddToVSUM("FC-AUXc_h", "FCh-AUXc", "[g/h]")
- AddToVSUM("FC-WHTCc_h", "FCh-WHTCc", "[g/h]")
+ AddToVSUM("FC_h", "FC-Map", "[g/h]", True)
+ AddToVSUM("FC-AUXc_h", "FC-AUXc", "[g/h]", True)
+ AddToVSUM("FC-WHTCc_h", "FC-WHTCc", "[g/h]", True)
If Not VEC0.EngOnly Then
- AddToVSUM("FC_km", "FC", "[g/km]")
- AddToVSUM("FC-AUXc_km", "FC-AUXc", "[g/km]")
- AddToVSUM("FC-WHTCc_km", "FC-WHTCc", "[g/km]")
+ AddToVSUM("FC_km", "FC-Map", "[g/km]", True)
+ AddToVSUM("FC-AUXc_km", "FC-AUXc", "[g/km]", True)
+ AddToVSUM("FC-WHTCc_km", "FC-WHTCc", "[g/km]", True)
AddToVSUM("CO2_km", "CO2", "[g/km]", True)
AddToVSUM("CO2_tkm", "CO2", "[g/tkm]", True)
@@ -678,7 +678,7 @@ Class cVSUM
'CylceKin
CylceKin = New cCycleKin
For Each VSUMentry In CylceKin.VSUMentries
- AddToVSUM("\\" & VSUMentry.Head, VSUMentry.Head, VSUMentry.Unit)
+ AddToVSUM("\\" & VSUMentry.Head, VSUMentry.Head, VSUMentry.Unit)
Next
End If
@@ -722,8 +722,8 @@ Class cVSUM
End Class
Public Class cVSUMentry
- Public Head As String
- Public Unit As String
+ Public Head As String
+ Public Unit As String
Public MyVal As Object
Public Multi As Boolean
@@ -731,8 +731,8 @@ Public Class cVSUMentry
Head = HeadStr
Unit = UnitStr
MyVal = Nothing
- Multi = False
- End Sub
+ Multi = False
+ End Sub
Public Property ValueString As Object
Get