diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index 7b4deb2110c83d14408e09984c09818dcbd39e92..1fc1bf63fdccd8c4413af4bdfca175f15400fb53 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.2.0")>
-<Assembly: AssemblyFileVersion("2.1.2.0")>
+<Assembly: AssemblyVersion("2.1.3.0")>
+<Assembly: AssemblyFileVersion("2.1.3.0")>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 6b269d500c40f335f0498cb99840d5ca80ecadf7..587ac4ab853d7021fa1e6991e619cc0c7c542d92 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.2"
+ Public Const VECTOvers As String = "2.1.3"
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 70f522d149589c8487b104927652c66da0ad66a4..0ea5e684203f0370220ddfa24111cf0e35074938 100644
--- a/VECTO/cVSUM.vb
+++ b/VECTO/cVSUM.vb
@@ -186,104 +186,111 @@ Class cVSUM
'Only Entire-vehicle (not EngOnly)
- If Not VEC.EngOnly Then
-
- 'Pbrake-norm
- sum = 0
- For t = 0 To t1
- sum += MODdata.Pbrake(t)
- Next
- VSUMentries("\\Pbrake").ValueString = (sum / (t1 + 1))
-
- 'Eair
- sum = 0
- For t = 0 To t1
- sum += MODdata.Pair(t)
- Next
- VSUMentries("\\Eair").ValueString = (-sum / 3600)
-
- 'Eroll
- sum = 0
- For t = 0 To t1
- sum += MODdata.Proll(t)
- Next
- VSUMentries("\\Eroll").ValueString = (-sum / 3600)
-
- 'Egrad
- sum = 0
- For t = 0 To t1
- sum += MODdata.Pstg(t)
- Next
- VSUMentries("\\Egrad").ValueString = (-sum / 3600)
-
- 'Eacc
- sum = 0
- For t = 0 To t1
- sum += MODdata.Pa(t) + MODdata.PaGB(t) + MODdata.PaEng(t)
- Next
- VSUMentries("\\Eacc").ValueString = (-sum / 3600)
-
- 'Eaux
- sum = 0
- For t = 0 To t1
- sum += MODdata.PauxSum(t)
- Next
- VSUMentries("\\Eaux").ValueString = (-sum / 3600)
-
- 'Ebrake
- sum = 0
- For t = 0 To t1
- sum += MODdata.Pbrake(t)
- Next
- VSUMentries("\\Ebrake").ValueString = (sum / 3600)
-
- 'Etransm
- sum = 0
- For t = 0 To t1
- sum += MODdata.PlossDiff(t) + MODdata.PlossGB(t)
- Next
- VSUMentries("\\Etransm").ValueString = (-sum / 3600)
-
- 'Retarder
- sum = 0
- For t = 0 To t1
- sum += MODdata.PlossRt(t)
- Next
- VSUMentries("\\Eretarder").ValueString = (-sum / 3600)
-
- 'TC Losses
- sum = 0
- For t = 0 To t1
- sum += MODdata.PlossTC(t)
- Next
- VSUMentries("\\Etorqueconv").ValueString = (-sum / 3600)
-
-
-
- 'Masse, Loading
- VSUMentries("\\Mass").ValueString = (VEH.Mass + VEH.MassExtra)
- VSUMentries("\\Loading").ValueString = VEH.Loading
-
- 'CylceKin
- For Each VSUMentry In MODdata.CylceKin.VSUMentries
- VSUMentries("\\" & VSUMentry.Head).ValueString = MODdata.CylceKin.GetValueString(VSUMentry.Head)
- Next
-
- 'EposICE
- sum = 0
- For t = 0 To t1
- sum += Math.Max(0, MODdata.Pe(t))
- Next
- VSUMentries("\\EposICE").ValueString = (sum / 3600)
-
- 'EnegICE
- sum = 0
- For t = 0 To t1
- sum += Math.Min(0, MODdata.Pe(t))
- Next
- VSUMentries("\\EnegICE").ValueString = (sum / 3600)
-
- End If
+ If Not VEC.EngOnly Then
+
+ 'PwheelPos
+ sum = 0
+ For t = 0 To t1
+ sum += Math.Max(0, MODdata.Psum(t))
+ Next
+ VSUMentries("\\PwheelPos").ValueString = (sum / (t1 + 1))
+
+ 'Pbrake-norm
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Pbrake(t)
+ Next
+ VSUMentries("\\Pbrake").ValueString = (sum / (t1 + 1))
+
+ 'Eair
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Pair(t)
+ Next
+ VSUMentries("\\Eair").ValueString = (-sum / 3600)
+
+ 'Eroll
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Proll(t)
+ Next
+ VSUMentries("\\Eroll").ValueString = (-sum / 3600)
+
+ 'Egrad
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Pstg(t)
+ Next
+ VSUMentries("\\Egrad").ValueString = (-sum / 3600)
+
+ 'Eacc
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Pa(t) + MODdata.PaGB(t) + MODdata.PaEng(t)
+ Next
+ VSUMentries("\\Eacc").ValueString = (-sum / 3600)
+
+ 'Eaux
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.PauxSum(t)
+ Next
+ VSUMentries("\\Eaux").ValueString = (-sum / 3600)
+
+ 'Ebrake
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.Pbrake(t)
+ Next
+ VSUMentries("\\Ebrake").ValueString = (sum / 3600)
+
+ 'Etransm
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.PlossDiff(t) + MODdata.PlossGB(t)
+ Next
+ VSUMentries("\\Etransm").ValueString = (-sum / 3600)
+
+ 'Retarder
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.PlossRt(t)
+ Next
+ VSUMentries("\\Eretarder").ValueString = (-sum / 3600)
+
+ 'TC Losses
+ sum = 0
+ For t = 0 To t1
+ sum += MODdata.PlossTC(t)
+ Next
+ VSUMentries("\\Etorqueconv").ValueString = (-sum / 3600)
+
+
+
+ 'Masse, Loading
+ VSUMentries("\\Mass").ValueString = (VEH.Mass + VEH.MassExtra)
+ VSUMentries("\\Loading").ValueString = VEH.Loading
+
+ 'CylceKin
+ For Each VSUMentry In MODdata.CylceKin.VSUMentries
+ VSUMentries("\\" & VSUMentry.Head).ValueString = MODdata.CylceKin.GetValueString(VSUMentry.Head)
+ Next
+
+ 'EposICE
+ sum = 0
+ For t = 0 To t1
+ sum += Math.Max(0, MODdata.Pe(t))
+ Next
+ VSUMentries("\\EposICE").ValueString = (sum / 3600)
+
+ 'EnegICE
+ sum = 0
+ For t = 0 To t1
+ sum += Math.Min(0, MODdata.Pe(t))
+ Next
+ VSUMentries("\\EnegICE").ValueString = (sum / 3600)
+
+ End If
'Create Output-string:
First = True
@@ -651,7 +658,8 @@ Class cVSUM
If NonEngOnly Then
- 'Vehicle-related fields
+ 'Vehicle-related fields
+ AddToVSUM("\\PwheelPos", "PwheelPos", "[kW]")
AddToVSUM("\\Pbrake", "Pbrake", "[kW]")
AddToVSUM("\\EposICE", "EposICE", "[kWh]")
AddToVSUM("\\EnegICE", "EnegICE", "[kWh]")