diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index 4f8619bb8ca28cad2110addc0f2e208753ec454a..3452dbda44e28d23d7a23a6704f3b538dea516c2 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -90,6 +90,21 @@ Partial Class EngineForm
Me.Label14 = New System.Windows.Forms.Label()
Me.BtFLD = New System.Windows.Forms.Button()
Me.BtFLDopen = New System.Windows.Forms.Button()
+ Me.tbRatedSpeed = New System.Windows.Forms.TextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.tbRatedPower = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.tbMaxTorque = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.cbFuelType = New System.Windows.Forms.ComboBox()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.tbNCVCorrFactor = New System.Windows.Forms.TextBox()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.tbRegPerCorrFactor = New System.Windows.Forms.TextBox()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -119,7 +134,7 @@ Partial Class EngineForm
'
'TbInertia
'
- Me.TbInertia.Location = New System.Drawing.Point(120, 2)
+ Me.TbInertia.Location = New System.Drawing.Point(122, 4)
Me.TbInertia.Name = "TbInertia"
Me.TbInertia.Size = New System.Drawing.Size(57, 20)
Me.TbInertia.TabIndex = 3
@@ -127,7 +142,7 @@ Partial Class EngineForm
'Label41
'
Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(183, 5)
+ Me.Label41.Location = New System.Drawing.Point(185, 7)
Me.Label41.Name = "Label41"
Me.Label41.Size = New System.Drawing.Size(36, 13)
Me.Label41.TabIndex = 24
@@ -145,7 +160,7 @@ Partial Class EngineForm
'Label5
'
Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(12, 5)
+ Me.Label5.Location = New System.Drawing.Point(14, 7)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(102, 13)
Me.Label5.TabIndex = 0
@@ -310,7 +325,7 @@ Partial Class EngineForm
'
'TbMAP
'
- Me.TbMAP.Location = New System.Drawing.Point(12, 259)
+ Me.TbMAP.Location = New System.Drawing.Point(12, 271)
Me.TbMAP.Name = "TbMAP"
Me.TbMAP.Size = New System.Drawing.Size(434, 20)
Me.TbMAP.TabIndex = 5
@@ -318,7 +333,7 @@ Partial Class EngineForm
'Label6
'
Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(12, 243)
+ Me.Label6.Location = New System.Drawing.Point(12, 255)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(115, 13)
Me.Label6.TabIndex = 38
@@ -327,7 +342,7 @@ Partial Class EngineForm
'BtMAP
'
Me.BtMAP.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtMAP.Location = New System.Drawing.Point(446, 257)
+ Me.BtMAP.Location = New System.Drawing.Point(446, 269)
Me.BtMAP.Name = "BtMAP"
Me.BtMAP.Size = New System.Drawing.Size(24, 24)
Me.BtMAP.TabIndex = 6
@@ -365,7 +380,7 @@ Partial Class EngineForm
'BtMAPopen
'
Me.BtMAPopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtMAPopen.Location = New System.Drawing.Point(469, 257)
+ Me.BtMAPopen.Location = New System.Drawing.Point(469, 269)
Me.BtMAPopen.Name = "BtMAPopen"
Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
Me.BtMAPopen.TabIndex = 7
@@ -377,9 +392,9 @@ Partial Class EngineForm
Me.PnInertia.Controls.Add(Me.Label5)
Me.PnInertia.Controls.Add(Me.Label41)
Me.PnInertia.Controls.Add(Me.TbInertia)
- Me.PnInertia.Location = New System.Drawing.Point(264, 106)
+ Me.PnInertia.Location = New System.Drawing.Point(258, 184)
Me.PnInertia.Name = "PnInertia"
- Me.PnInertia.Size = New System.Drawing.Size(229, 32)
+ Me.PnInertia.Size = New System.Drawing.Size(229, 30)
Me.PnInertia.TabIndex = 3
'
'GrWHTC
@@ -395,6 +410,10 @@ Partial Class EngineForm
'
'PnWhtcDeclaration
'
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label20)
+ Me.PnWhtcDeclaration.Controls.Add(Me.tbRegPerCorrFactor)
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label19)
+ Me.PnWhtcDeclaration.Controls.Add(Me.tbNCVCorrFactor)
Me.PnWhtcDeclaration.Controls.Add(Me.lblColdHotFactor)
Me.PnWhtcDeclaration.Controls.Add(Me.TbColdHotFactor)
Me.PnWhtcDeclaration.Controls.Add(Me.BtWHTCimport)
@@ -407,13 +426,13 @@ Partial Class EngineForm
Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCrural)
Me.PnWhtcDeclaration.Location = New System.Drawing.Point(3, 19)
Me.PnWhtcDeclaration.Name = "PnWhtcDeclaration"
- Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 87)
+ Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 95)
Me.PnWhtcDeclaration.TabIndex = 8
'
'lblColdHotFactor
'
Me.lblColdHotFactor.AutoSize = True
- Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 63)
+ Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 53)
Me.lblColdHotFactor.Name = "lblColdHotFactor"
Me.lblColdHotFactor.Size = New System.Drawing.Size(177, 13)
Me.lblColdHotFactor.TabIndex = 5
@@ -421,7 +440,7 @@ Partial Class EngineForm
'
'TbColdHotFactor
'
- Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 60)
+ Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 50)
Me.TbColdHotFactor.Name = "TbColdHotFactor"
Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
Me.TbColdHotFactor.TabIndex = 6
@@ -430,15 +449,16 @@ Partial Class EngineForm
'
Me.BtWHTCimport.Location = New System.Drawing.Point(299, 3)
Me.BtWHTCimport.Name = "BtWHTCimport"
- Me.BtWHTCimport.Size = New System.Drawing.Size(170, 28)
+ Me.BtWHTCimport.Size = New System.Drawing.Size(170, 15)
Me.BtWHTCimport.TabIndex = 4
Me.BtWHTCimport.Text = "Import from VECTO-Engine"
Me.BtWHTCimport.UseVisualStyleBackColor = True
+ Me.BtWHTCimport.Visible = False
'
'Label4
'
Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(1, 37)
+ Me.Label4.Location = New System.Drawing.Point(1, 27)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(36, 13)
Me.Label4.TabIndex = 0
@@ -447,7 +467,7 @@ Partial Class EngineForm
'Label7
'
Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(156, 37)
+ Me.Label7.Location = New System.Drawing.Point(156, 27)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(32, 13)
Me.Label7.TabIndex = 0
@@ -465,7 +485,7 @@ Partial Class EngineForm
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(284, 37)
+ Me.Label8.Location = New System.Drawing.Point(284, 27)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(53, 13)
Me.Label8.TabIndex = 0
@@ -473,21 +493,21 @@ Partial Class EngineForm
'
'TbWHTCmw
'
- Me.TbWHTCmw.Location = New System.Drawing.Point(343, 34)
+ Me.TbWHTCmw.Location = New System.Drawing.Point(343, 24)
Me.TbWHTCmw.Name = "TbWHTCmw"
Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20)
Me.TbWHTCmw.TabIndex = 2
'
'TbWHTCurban
'
- Me.TbWHTCurban.Location = New System.Drawing.Point(43, 34)
+ Me.TbWHTCurban.Location = New System.Drawing.Point(43, 24)
Me.TbWHTCurban.Name = "TbWHTCurban"
Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20)
Me.TbWHTCurban.TabIndex = 0
'
'TbWHTCrural
'
- Me.TbWHTCrural.Location = New System.Drawing.Point(194, 34)
+ Me.TbWHTCrural.Location = New System.Drawing.Point(194, 24)
Me.TbWHTCrural.Name = "TbWHTCrural"
Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20)
Me.TbWHTCrural.TabIndex = 1
@@ -496,7 +516,7 @@ Partial Class EngineForm
'
Me.PnWhtcEngineering.Controls.Add(Me.TbWHTCEngineering)
Me.PnWhtcEngineering.Controls.Add(Me.lblWhtcEngineering)
- Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 112)
+ Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 117)
Me.PnWhtcEngineering.Name = "PnWhtcEngineering"
Me.PnWhtcEngineering.Size = New System.Drawing.Size(472, 30)
Me.PnWhtcEngineering.TabIndex = 7
@@ -529,7 +549,7 @@ Partial Class EngineForm
'
'TbFLD
'
- Me.TbFLD.Location = New System.Drawing.Point(12, 202)
+ Me.TbFLD.Location = New System.Drawing.Point(12, 228)
Me.TbFLD.Name = "TbFLD"
Me.TbFLD.Size = New System.Drawing.Size(434, 20)
Me.TbFLD.TabIndex = 5
@@ -537,7 +557,7 @@ Partial Class EngineForm
'Label14
'
Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(12, 186)
+ Me.Label14.Location = New System.Drawing.Point(12, 212)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(128, 13)
Me.Label14.TabIndex = 38
@@ -546,7 +566,7 @@ Partial Class EngineForm
'BtFLD
'
Me.BtFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtFLD.Location = New System.Drawing.Point(446, 200)
+ Me.BtFLD.Location = New System.Drawing.Point(446, 226)
Me.BtFLD.Name = "BtFLD"
Me.BtFLD.Size = New System.Drawing.Size(24, 24)
Me.BtFLD.TabIndex = 6
@@ -556,13 +576,137 @@ Partial Class EngineForm
'BtFLDopen
'
Me.BtFLDopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtFLDopen.Location = New System.Drawing.Point(469, 200)
+ Me.BtFLDopen.Location = New System.Drawing.Point(469, 226)
Me.BtFLDopen.Name = "BtFLDopen"
Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
Me.BtFLDopen.TabIndex = 7
Me.BtFLDopen.TabStop = False
Me.BtFLDopen.UseVisualStyleBackColor = True
'
+ 'tbRatedSpeed
+ '
+ Me.tbRatedSpeed.Location = New System.Drawing.Point(381, 108)
+ Me.tbRatedSpeed.Name = "tbRatedSpeed"
+ Me.tbRatedSpeed.Size = New System.Drawing.Size(57, 20)
+ Me.tbRatedSpeed.TabIndex = 41
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = True
+ Me.Label9.Location = New System.Drawing.Point(304, 111)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(70, 13)
+ Me.Label9.TabIndex = 42
+ Me.Label9.Text = "Rated Speed"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(444, 111)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(30, 13)
+ Me.Label10.TabIndex = 43
+ Me.Label10.Text = "[rpm]"
+ '
+ 'tbRatedPower
+ '
+ Me.tbRatedPower.Location = New System.Drawing.Point(381, 134)
+ Me.tbRatedPower.Name = "tbRatedPower"
+ Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
+ Me.tbRatedPower.TabIndex = 44
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = True
+ Me.Label12.Location = New System.Drawing.Point(304, 137)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(69, 13)
+ Me.Label12.TabIndex = 45
+ Me.Label12.Text = "Rated Power"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Location = New System.Drawing.Point(444, 137)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.TabIndex = 46
+ Me.Label15.Text = "[kW]"
+ '
+ 'tbMaxTorque
+ '
+ Me.tbMaxTorque.Location = New System.Drawing.Point(381, 158)
+ Me.tbMaxTorque.Name = "tbMaxTorque"
+ Me.tbMaxTorque.Size = New System.Drawing.Size(57, 20)
+ Me.tbMaxTorque.TabIndex = 47
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Location = New System.Drawing.Point(309, 161)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(64, 13)
+ Me.Label16.TabIndex = 48
+ Me.Label16.Text = "Max Torque"
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(444, 161)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.TabIndex = 49
+ Me.Label17.Text = "[Nm]"
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(63, 164)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(54, 13)
+ Me.Label18.TabIndex = 50
+ Me.Label18.Text = "Fuel Type"
+ '
+ 'cbFuelType
+ '
+ Me.cbFuelType.FormattingEnabled = True
+ Me.cbFuelType.Location = New System.Drawing.Point(123, 161)
+ Me.cbFuelType.Name = "cbFuelType"
+ Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
+ Me.cbFuelType.TabIndex = 51
+ '
+ 'Label19
+ '
+ Me.Label19.AutoSize = True
+ Me.Label19.Location = New System.Drawing.Point(274, 53)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(66, 13)
+ Me.Label19.TabIndex = 7
+ Me.Label19.Text = "NCV Corr. F."
+ '
+ 'tbNCVCorrFactor
+ '
+ Me.tbNCVCorrFactor.Location = New System.Drawing.Point(343, 50)
+ Me.tbNCVCorrFactor.Name = "tbNCVCorrFactor"
+ Me.tbNCVCorrFactor.Size = New System.Drawing.Size(57, 20)
+ Me.tbNCVCorrFactor.TabIndex = 8
+ '
+ 'Label20
+ '
+ Me.Label20.AutoSize = True
+ Me.Label20.Location = New System.Drawing.Point(99, 76)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(89, 13)
+ Me.Label20.TabIndex = 9
+ Me.Label20.Text = "Reg. Per. Corr. F."
+ '
+ 'tbRegPerCorrFactor
+ '
+ Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(194, 73)
+ Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
+ Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
+ Me.tbRegPerCorrFactor.TabIndex = 10
+ '
'EngineForm
'
Me.AcceptButton = Me.ButOK
@@ -570,6 +714,17 @@ Partial Class EngineForm
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
Me.ClientSize = New System.Drawing.Size(985, 508)
+ Me.Controls.Add(Me.cbFuelType)
+ Me.Controls.Add(Me.Label18)
+ Me.Controls.Add(Me.tbMaxTorque)
+ Me.Controls.Add(Me.Label16)
+ Me.Controls.Add(Me.Label17)
+ Me.Controls.Add(Me.tbRatedPower)
+ Me.Controls.Add(Me.Label12)
+ Me.Controls.Add(Me.Label15)
+ Me.Controls.Add(Me.tbRatedSpeed)
+ Me.Controls.Add(Me.Label9)
+ Me.Controls.Add(Me.Label10)
Me.Controls.Add(Me.PicBox)
Me.Controls.Add(Me.GrWHTC)
Me.Controls.Add(Me.PnInertia)
@@ -672,4 +827,19 @@ Partial Class EngineForm
Friend WithEvents PnWhtcEngineering As System.Windows.Forms.Panel
Friend WithEvents lblColdHotFactor As System.Windows.Forms.Label
Friend WithEvents TbColdHotFactor As System.Windows.Forms.TextBox
+ Friend WithEvents Label20 As System.Windows.Forms.Label
+ Friend WithEvents tbRegPerCorrFactor As System.Windows.Forms.TextBox
+ Friend WithEvents Label19 As System.Windows.Forms.Label
+ Friend WithEvents tbNCVCorrFactor As System.Windows.Forms.TextBox
+ Friend WithEvents tbRatedSpeed As System.Windows.Forms.TextBox
+ Friend WithEvents Label9 As System.Windows.Forms.Label
+ Friend WithEvents Label10 As System.Windows.Forms.Label
+ Friend WithEvents tbRatedPower As System.Windows.Forms.TextBox
+ Friend WithEvents Label12 As System.Windows.Forms.Label
+ Friend WithEvents Label15 As System.Windows.Forms.Label
+ Friend WithEvents tbMaxTorque As System.Windows.Forms.TextBox
+ Friend WithEvents Label16 As System.Windows.Forms.Label
+ Friend WithEvents Label17 As System.Windows.Forms.Label
+ Friend WithEvents Label18 As System.Windows.Forms.Label
+ Friend WithEvents cbFuelType As System.Windows.Forms.ComboBox
End Class
diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index 0c838ae1b9a0253c03fb3577c6f2e4f564c1f1cf..8d9e87efaa1bbcf7242953d89cf58974694dc0f6 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -51,6 +51,13 @@ Public Class EngineForm
PnWhtcDeclaration.Enabled = Cfg.DeclMode
PnWhtcEngineering.Enabled = Not Cfg.DeclMode
+ cbFuelType.Items.Clear()
+ cbFuelType.ValueMember = "Value"
+ cbFuelType.DisplayMember = "Label"
+ cbFuelType.DataSource =
+ [Enum].GetValues(GetType(FuelType)).Cast(Of FuelType).Select(
+ Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
_changed = False
NewEngine()
End Sub
@@ -189,6 +196,13 @@ Public Class EngineForm
TbWHTCmw.Text = engine.WHTCMotorway.ToGUIFormat()
TbWHTCEngineering.Text = engine.WHTCEngineering.ToGUIFormat()
TbColdHotFactor.Text = engine.ColdHotBalancingFactor.ToGUIFormat()
+ tbNCVCorrFactor.Text = engine.CorrectionFactorNCV.ToGUIFormat()
+ tbRegPerCorrFactor.Text = engine.CorrectionFactorRegPer.ToGUIFormat()
+ tbMaxTorque.Text = engine.MaxTorqueDeclared.ToGUIFormat()
+ tbRatedPower.Text = (engine.RatedPowerDeclared.Value() / 1000).ToGUIFormat()
+ tbRatedSpeed.Text = engine.RatedSpeedDeclared.AsRPM.ToGUIFormat()
+
+ cbFuelType.SelectedValue = engine.FuelType
DeclInit()
@@ -234,9 +248,16 @@ Public Class EngineForm
engine.WHTCRuralInput = TbWHTCrural.Text.ToDouble(0)
engine.WHTCMotorwayInput = TbWHTCmw.Text.ToDouble(0)
engine.WHTCEngineeringInput = TbWHTCEngineering.Text.ToDouble(0)
+ engine.correctionFactorNCVInput = tbNCVCorrFactor.Text.ToDouble(0)
+ engine.correctionFactorRegPerInput = tbRegPerCorrFactor.Text.ToDouble(0)
engine.ColdHotBalancingFactorInput = TbColdHotFactor.Text.ToDouble(0)
+ engine.ratedPowerInput = (tbRatedPower.Text.ToDouble(0) * 1000).SI(Of Watt)()
+ engine.ratedSpeedInput = tbRatedSpeed.Text.ToDouble(0).RPMtoRad()
+ engine.maxTorqueInput = tbMaxTorque.Text.ToDouble(0).SI(Of NewtonMeter)()
+
+ engine.FuelTypeInput = CType(cbFuelType.SelectedValue, FuelType)
If Not engine.SaveFile Then
MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index 83e598de7d9d6032c13c54440b37215ee3e9b7af..e3595d6bfcc1a3a9c7c455c5980a6dc293d70a83 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -106,7 +106,7 @@ Public Class GearboxForm
TbMinTimeBetweenShifts.Text = DeclarationData.Gearbox.MinTimeBetweenGearshifts.ToGUIFormat()
'cDeclaration.MinTimeBetweenGearshift(GStype)
- TbTqResv.Text = (DeclarationData.Gearbox.TorqueReserve * 100).ToGUIFormat() ' cDeclaration.TqResv
+ TbTqResv.Text = (DeclarationData.Gearbox.TorqueReserve * 100).ToGUIFormat() ' cDeclaration.TqResv
TbTqResvStart.Text = (DeclarationData.Gearbox.TorqueReserveStart * 100).ToGUIFormat() 'cDeclaration.TqResvStart
TbStartSpeed.Text = DeclarationData.Gearbox.StartSpeed.ToGUIFormat() 'cDeclaration.StartSpeed
TbStartAcc.Text = DeclarationData.Gearbox.StartAcceleration.ToGUIFormat() ' cDeclaration.StartAcc
@@ -897,7 +897,8 @@ Public Class GearboxForm
Private Function GetShiftLines(ByVal idleSpeed As PerSecond, engineFullLoadCurve As EngineFullLoadCurve,
vehicle As IVehicleEngineeringInputData, gears As IList(Of ITransmissionInputData), ByVal gear As Integer) _
As ShiftPolygon
- Dim engine As CombustionEngineData = ConvertToEngineData(engineFullLoadCurve, idleSpeed, gear, LvGears.Items(gear).SubItems(GearboxTbl.MaxTorque).Text.ToDouble(0).SI(Of NewtonMeter))
+ Dim engine As CombustionEngineData = ConvertToEngineData(engineFullLoadCurve, idleSpeed, gear,
+ LvGears.Items(gear).SubItems(GearboxTbl.MaxTorque).Text.ToDouble(0).SI(Of NewtonMeter))
If gears.Count <= 1 Then
Return Nothing
End If
@@ -911,7 +912,8 @@ Public Class GearboxForm
If (rDyn.IsEqual(0)) Then
Return Nothing
End If
- Dim shiftLines As ShiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(gear - 1, engine.FullLoadCurves(CType(gear, UInteger)), gears, engine,
+ Dim shiftLines As ShiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(gear - 1,
+ engine.FullLoadCurves(CType(gear, UInteger)), gears, engine,
Double.Parse(LvGears.Items(0).SubItems(GearboxTbl.Ratio).Text, CultureInfo.InvariantCulture),
(rDyn))
Return shiftLines
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index ea41d4562bda1df0f323667ebb531665b2615d60..49117b8f8a93c82dfd8ac6fcd9eb60ac35dbbaf0 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -107,6 +107,12 @@ Public Class Engine
Public ColdHotBalancingFactorInput As Double
+ Public correctionFactorRegPerInput As Double
+ Public correctionFactorNCVInput As Double
+ Public FuelTypeInput As FuelType
+ Public ratedPowerInput As Watt
+ Public ratedSpeedInput As PerSecond
+ Public maxTorqueInput As NewtonMeter
''' <summary>
@@ -242,10 +248,10 @@ Public Class Engine
If mode = ExecutionMode.Declaration Then
Dim doa As DeclarationDataAdapter = New DeclarationDataAdapter()
Dim dummyGearboxData As IGearboxDeclarationInputData = New Gearbox() With {
- .Type = GearboxType.AMT,
- .MaxTorque = New List(Of String),
- .GearRatios = New List(Of Double)()
- }
+ .Type = GearboxType.AMT,
+ .MaxTorque = New List(Of String),
+ .GearRatios = New List(Of Double)()
+ }
engineData = doa.CreateEngineData(engine, dummyGearboxData, New List(Of ITorqueLimitInputData))
Else
Dim doa As EngineeringDataAdapter = New EngineeringDataAdapter()
@@ -290,12 +296,6 @@ Public Class Engine
End Get
End Property
- Public ReadOnly Property Creator As String Implements IComponentInputData.Creator
- Get
- Return Lic.LicString
- End Get
- End Property
-
Public ReadOnly Property [Date] As String Implements IComponentInputData.[Date]
Get
Return Now.ToUniversalTime().ToString("o")
@@ -370,6 +370,24 @@ Public Class Engine
End Get
End Property
+ Public ReadOnly Property CorrectionFactorRegPer As Double Implements IEngineDeclarationInputData.CorrectionFactorRegPer
+ Get
+ Return correctionFactorRegPerInput
+ End Get
+ End Property
+
+ Public ReadOnly Property CorrectionFactorNCV As Double Implements IEngineDeclarationInputData.CorrectionFactorNCV
+ Get
+ Return correctionFactorNCVInput
+ End Get
+ End Property
+
+ Public ReadOnly Property FuelType As FuelType Implements IEngineDeclarationInputData.FuelType
+ Get
+ Return FuelTypeInput
+ End Get
+ End Property
+
Public ReadOnly Property FuelConsumptionMap As TableData Implements IEngineDeclarationInputData.FuelConsumptionMap
Get
If Not File.Exists(_fuelConsumptionMapPath.FullPath) Then _
@@ -386,6 +404,24 @@ Public Class Engine
End Get
End Property
+ Public ReadOnly Property RatedPowerDeclared As Watt Implements IEngineDeclarationInputData.RatedPowerDeclared
+ Get
+ Return ratedPowerInput
+ End Get
+ End Property
+
+ Public ReadOnly Property RatedSpeedDeclared As PerSecond Implements IEngineDeclarationInputData.RatedSpeedDeclared
+ Get
+ Return ratedSpeedInput
+ End Get
+ End Property
+
+ Public ReadOnly Property MaxTorqueDeclared As NewtonMeter Implements IEngineDeclarationInputData.MaxTorqueDeclared
+ Get
+ Return maxTorqueInput
+ End Get
+ End Property
+
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IEngineEngineeringInputData.Inertia
Get
Return EngineInertia.SI(Of KilogramSquareMeter)()
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index bbf178e3eaeda357416784a185081bbebaa7355a..270a887281d01405aa6a05694baea4f098f2f5eb 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -301,11 +301,6 @@ Public Class Gearbox
End Get
End Property
- Public ReadOnly Property Creator As String Implements IComponentInputData.Creator
- Get
- Return Lic.LicString
- End Get
- End Property
Public ReadOnly Property [Date] As String Implements IComponentInputData.[Date]
Get
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index f9acea20f6c4f731f67b5efdab791f4d72b4386a..1cea72e46c4499257e7a3a6362b6351bb5afba8c 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -272,11 +272,6 @@ Public Class Vehicle
End Get
End Property
- Public ReadOnly Property Creator As String Implements IComponentInputData.Creator
- Get
- Return Lic.LicString
- End Get
- End Property
Public ReadOnly Property [Date] As String Implements IComponentInputData.[Date]
Get
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index 8eef3c084bca195f3e8b8f95b5a4ddb9c2302585..6db99d6830610862e10da8dbfb59bf2dffed4fcb 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -11,7 +11,7 @@ Imports TUGraz.VectoCore.Models.Declaration
Public Class JSONFileWriter
Implements IOutputFileWriter
- Public Const EngineFormatVersion As Integer = 3
+ Public Const EngineFormatVersion As Integer = 4
Public Const GearboxFormatVersion As Integer = 6
@@ -45,15 +45,21 @@ Public Class JSONFileWriter
body.Add("IdlingSpeed", eng.IdleSpeed.AsRPM)
body.Add("Inertia", eng.Inertia.Value())
- body.Add("FullLoadCurve", GetRelativePath(eng.FullLoadCurve.Source, Path.GetDirectoryName(filename)))
-
- body.Add("FuelMap", GetRelativePath(eng.FuelConsumptionMap.Source, Path.GetDirectoryName(filename)))
-
body.Add("WHTC-Urban", eng.WHTCUrban)
body.Add("WHTC-Rural", eng.WHTCRural)
body.Add("WHTC-Motorway", eng.WHTCMotorway)
body.Add("WHTC-Engineering", eng.WHTCEngineering)
body.Add("ColdHotBalancingFactor", eng.ColdHotBalancingFactor)
+ body.Add("CFRegPer", eng.CorrectionFactorRegPer)
+ body.Add("CFNCV", eng.CorrectionFactorNCV)
+ body.Add("RatedPower", eng.RatedPowerDeclared.Value())
+ body.Add("RatedSpeed", eng.RatedSpeedDeclared.AsRPM)
+ body.Add("MaxTorque", eng.MaxTorqueDeclared.Value())
+ body.Add("FuelType", eng.FuelType)
+
+ body.Add("FullLoadCurve", GetRelativePath(eng.FullLoadCurve.Source, Path.GetDirectoryName(filename)))
+
+ body.Add("FuelMap", GetRelativePath(eng.FuelConsumptionMap.Source, Path.GetDirectoryName(filename)))
WriteFile(header, body, filename)
End Sub
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 948fd74c288bd262736adc383e0b16e92782c97b..a76b52edffaade57476912828e6c74733007346c 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -56,8 +56,6 @@ namespace TUGraz.VectoCommon.InputData
string Model { get; }
- string Creator { get; }
-
string Date { get; }
string TechnicalReportId { get; }
@@ -330,6 +328,12 @@ namespace TUGraz.VectoCommon.InputData
/// </summary>
double ColdHotBalancingFactor { get; }
+ double CorrectionFactorRegPer { get; }
+
+ double CorrectionFactorNCV { get; }
+
+ FuelType FuelType { get; }
+
/// <summary>
/// P067
/// P072, P073, P074
@@ -344,6 +348,12 @@ namespace TUGraz.VectoCommon.InputData
/// cf. VECTO Input Parameters.xlsx
/// </summary>
TableData FullLoadCurve { get; }
+
+ Watt RatedPowerDeclared { get; }
+
+ PerSecond RatedSpeedDeclared { get; }
+
+ NewtonMeter MaxTorqueDeclared { get; }
}
public interface IAuxiliariesDeclarationInputData
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 206f60c8d45e5039bba4a3c19374e0b1eb656a83..132c66726adaab2b96a11fca830be940d135a0da 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -62,6 +62,7 @@
<Compile Include="Models\CrossWindCorrectionMode.cs" />
<Compile Include="Models\DriverMode.cs" />
<Compile Include="Models\ExecutionMode.cs" />
+ <Compile Include="Models\FuelType.cs" />
<Compile Include="Models\GearboxType.cs" />
<Compile Include="Models\IResponse.cs" />
<Compile Include="Models\LoggingObject.cs" />
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index af86cfd6c0d97dc1bfc624a936b662b1879e3979..3564f8723015f7d49a0bf51064d77535f2084653 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -33,6 +33,7 @@ using System;
using System.IO;
using Newtonsoft.Json.Linq;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
@@ -67,6 +68,44 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
/// }
/// }
/// </code>
+ public class JSONEngineDataV4 : JSONEngineDataV3
+ {
+ public JSONEngineDataV4(JObject data, string fileName, bool tolerateMissing = false)
+ : base(data, fileName, tolerateMissing) {}
+
+ public override Watt RatedPowerDeclared
+ {
+ get { return Body.GetEx<double>("RatedPower").SI<Watt>(); }
+ }
+
+ public override PerSecond RatedSpeedDeclared
+ {
+ get { return Body.GetEx<double>("RatedSpeed").RPMtoRad(); }
+ }
+
+ public override NewtonMeter MaxTorqueDeclared
+ {
+ get { return Body.GetEx<double>("MaxTorque").SI<NewtonMeter>(); }
+ }
+
+ public override double CorrectionFactorRegPer
+ {
+ get { return Body.GetEx<double>("CFRegPer"); }
+ }
+
+
+ public override double CorrectionFactorNCV
+ {
+ get { return Body.GetEx<double>("CFNCV"); }
+ }
+
+ public override FuelType FuelType
+ {
+ get { return Body.GetEx<string>("FuelType").ParseEnum<FuelType>(); }
+ }
+ }
+
+
public class JSONEngineDataV3 : JSONFile, IEngineEngineeringInputData
{
public JSONEngineDataV3(JObject data, string fileName, bool tolerateMissing = false)
@@ -84,6 +123,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
+ public virtual FuelType FuelType
+ {
+ get { return FuelType.DieselCI; }
+ }
+
public virtual TableData FuelConsumptionMap
{
get {
@@ -116,6 +160,21 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
+ public virtual Watt RatedPowerDeclared
+ {
+ get { return 0.SI<Watt>(); }
+ }
+
+ public virtual PerSecond RatedSpeedDeclared
+ {
+ get { return 0.RPMtoRad(); }
+ }
+
+ public virtual NewtonMeter MaxTorqueDeclared
+ {
+ get { return 0.SI<NewtonMeter>(); }
+ }
+
public virtual KilogramSquareMeter Inertia
{
get { return Body.GetEx<double>(JsonKeys.Engine_Inertia).SI<KilogramSquareMeter>(); }
@@ -156,6 +215,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
+ public virtual double CorrectionFactorRegPer
+ {
+ get { return 1; }
+ }
+
+ public virtual double CorrectionFactorNCV
+ {
+ get { return 1; }
+ }
+
public string Manufacturer
{
get { return "N/A"; }
@@ -166,10 +235,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body.GetEx<string>(JsonKeys.Engine_ModelName); }
}
- public string Creator
- {
- get { return "N/A"; }
- }
public string Date
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index 19a39c5557b66cc6f119f7506c3872e1328e397c..763032db0e060df0e9a120e207b5959b0544a387 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -108,6 +108,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
switch (version) {
case 3:
return new JSONEngineDataV3(json, filename, tolerateMissing);
+ case 4:
+ return new JSONEngineDataV4(json, filename, tolerateMissing);
default:
throw new VectoException("Engine-File: Unsupported FileVersion. Got {0}", version);
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
index 7276fe0b46550124cdc47eff96ababc8d1481048..5b7e33e630da351153174070cb82b5f738f9ad1f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
@@ -1,5 +1,6 @@
using TUGraz.IVT.VectoXML;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Resources;
@@ -8,7 +9,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
public class XMLDeclarationEngineDataProvider : AbstractDeclarationXMLComponentDataProvider,
IEngineDeclarationInputData
{
- public XMLDeclarationEngineDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider) : base(xmlInputDataProvider)
+ public XMLDeclarationEngineDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider)
+ : base(xmlInputDataProvider)
{
XBasePath = Helper.Query(VehiclePath,
XMLNames.Vehicle_Components,
@@ -26,10 +28,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
get { return GetDoubleElementValue(XMLNames.Engine_IdlingSpeed).RPMtoRad(); }
}
+ public FuelType FuelType
+ {
+ get { return GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>(); }
+ }
+
public TableData FuelConsumptionMap
{
- get
- {
+ get {
return ReadTableData(AttributeMappings.FuelConsumptionMapMapping,
Helper.Query(XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry));
}
@@ -37,13 +43,27 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
public TableData FullLoadCurve
{
- get
- {
+ get {
return ReadTableData(AttributeMappings.EngineFullLoadCurveMapping,
Helper.Query(XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FullLoadCurve_Entry));
}
}
+ public Watt RatedPowerDeclared
+ {
+ get { return GetDoubleElementValue(XMLNames.Engine_RatedPower).SI<Watt>(); }
+ }
+
+ public PerSecond RatedSpeedDeclared
+ {
+ get { return GetDoubleElementValue(XMLNames.Engine_RatedSpeed).RPMtoRad(); }
+ }
+
+ public NewtonMeter MaxTorqueDeclared
+ {
+ get { return GetDoubleElementValue(XMLNames.Engine_MaxTorque).SI<NewtonMeter>(); }
+ }
+
public double WHTCMotorway
{
get { return GetDoubleElementValue(XMLNames.Engine_WHTCMotorway); }
@@ -63,5 +83,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
get { return GetDoubleElementValue(XMLNames.Engine_ColdHotBalancingFactor); }
}
+
+ public double CorrectionFactorRegPer
+ {
+ get { return GetDoubleElementValue(XMLNames.Engine_CorrectionFactor_RegPer); }
+ }
+
+ public double CorrectionFactorNCV
+ {
+ get { return GetDoubleElementValue(XMLNames.Engine_CorrecionFactor_NCV); }
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
index ab404df7e2120c5322a15a38914d26634301d3fe..9c43a85bda6dda392a849f9708a64e87731562d7 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
@@ -3,6 +3,7 @@ using System.Xml.XPath;
using TUGraz.IVT.VectoXML;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Resources;
@@ -51,10 +52,29 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
get { throw new VectoException("Property not available in Engineering Mode"); }
}
+ public double CorrectionFactorRegPer
+ {
+ get {
+ return 1;
+ //GetDoubleElementValue(XMLNames.Engine_CorrectionFactor_RegPer);
+ }
+ }
+
+ public double CorrectionFactorNCV
+ {
+ get { return 1; //GetDoubleElementValue(XMLNames.Engine_CorrecionFactor_NCV);
+ }
+ }
+
+ public FuelType FuelType
+ {
+ get { return FuelType.DieselCI; //GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>();
+ }
+ }
+
public TableData FuelConsumptionMap
{
- get
- {
+ get {
if (!ElementExists(Helper.Query(XMLNames.Engine_FuelConsumptionMap, XMLNames.Engine_FuelConsumptionMap_Entry))) {
return ReadCSVResourceFile(XMLNames.Engine_FuelConsumptionMap);
}
@@ -65,22 +85,34 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public TableData FullLoadCurve
{
- get
- {
+ get {
if (!ElementExists(Helper.Query(XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FuelConsumptionMap_Entry))) {
return ReadCSVResourceFile(XMLNames.Engine_FullLoadAndDragCurve);
}
- var columnMap = new Dictionary<string, string> {
- { XMLNames.Engine_EngineFullLoadCurve_EngineSpeed_Attr, FullLoadCurveReader.Fields.EngineSpeed },
- { XMLNames.Engine_FullLoadCurve_MaxTorque_Attr, FullLoadCurveReader.Fields.TorqueFullLoad },
- { XMLNames.Engine_FullLoadCurve_DragTorque_Attr, FullLoadCurveReader.Fields.TorqueDrag },
- { "PT1", "PT1" }
- };
+
return ReadTableData(AttributeMappings.EngineFullLoadCurveMapping,
Helper.Query(XMLNames.Engine_FullLoadAndDragCurve, XMLNames.Engine_FuelConsumptionMap_Entry));
}
}
+ public Watt RatedPowerDeclared
+ {
+ get { return null; //GetDoubleElementValue(XMLNames.Engine_RatedPower).SI<Watt>();
+ }
+ }
+
+ public PerSecond RatedSpeedDeclared
+ {
+ get { return null; //GetDoubleElementValue(XMLNames.Engine_RatedSpeed).RPMtoRad();
+ }
+ }
+
+ public NewtonMeter MaxTorqueDeclared
+ {
+ get { return null; //GetDoubleElementValue(XMLNames.Engine_MaxTorque).SI<NewtonMeter>();
+ }
+ }
+
public KilogramSquareMeter Inertia
{
get { return GetDoubleElementValue(XMLNames.Engine_Inertia).SI<KilogramSquareMeter>(); }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
index 303c8051f027a0567d3e5b2fad4b6e3abfb71dce..80e49d0a0ac37fb7df02a821790d9d4ff38b435b 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
@@ -51,12 +51,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var retVal = new VehicleData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
- Vendor = data.Manufacturer,
+ Manufacturer = data.Manufacturer,
ModelName = data.Model,
- Creator = data.Creator,
Date = data.Date,
- TypeId = data.TechnicalReportId,
- DigestValue = data.DigestValue,
+ CertificationNumber = data.TechnicalReportId,
+ DigestValueInput = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
VehicleCategory = data.VehicleCategory,
AxleConfiguration = data.AxleConfiguration,
@@ -93,12 +92,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return retarder;
}
retarder.SavedInDeclarationMode = data.SavedInDeclarationMode;
- retarder.Vendor = data.Manufacturer;
+ retarder.Manufacturer = data.Manufacturer;
retarder.ModelName = data.Model;
- retarder.Creator = data.Creator;
retarder.Date = data.Date;
- retarder.TypeId = data.TechnicalReportId;
- retarder.DigestValue = data.DigestValue;
+ retarder.CertificationNumber = data.TechnicalReportId;
+ retarder.DigestValueInput = data.DigestValue;
retarder.IntegrityStatus = data.IntegrityStatus;
return retarder;
@@ -111,16 +109,18 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var retVal = new CombustionEngineData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
- Vendor = data.Manufacturer,
+ Manufacturer = data.Manufacturer,
ModelName = data.Model,
- Creator = data.Creator,
Date = data.Date,
- TypeId = data.TechnicalReportId,
- DigestValue = data.DigestValue,
+ CertificationNumber = data.TechnicalReportId,
+ DigestValueInput = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
Displacement = data.Displacement,
IdleSpeed = data.IdleSpeed,
ConsumptionMap = FuelConsumptionMapReader.Create(data.FuelConsumptionMap),
+ RatedPowerDeclared = data.RatedPowerDeclared,
+ RatedSpeedDeclared = data.RatedSpeedDeclared,
+ MaxTorqueDeclared = data.MaxTorqueDeclared,
};
return retVal;
}
@@ -129,12 +129,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
return new GearboxData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
- Vendor = data.Manufacturer,
+ Manufacturer = data.Manufacturer,
ModelName = data.Model,
- Creator = data.Creator,
Date = data.Date,
- TypeId = data.TechnicalReportId,
- DigestValue = data.DigestValue,
+ CertificationNumber = data.TechnicalReportId,
+ DigestValueInput = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
Type = data.Type
};
@@ -157,12 +156,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return new AxleGearData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
- Vendor = data.Manufacturer,
+ Manufacturer = data.Manufacturer,
ModelName = data.Model,
- Creator = data.Creator,
Date = data.Date,
- TypeId = data.TechnicalReportId,
- DigestValue = data.DigestValue,
+ CertificationNumber = data.TechnicalReportId,
+ DigestValueInput = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
AxleGear = new GearData { LossMap = axleLossMap, Ratio = data.Ratio }
};
@@ -186,12 +184,11 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
case AngledriveType.SeparateAngledrive:
var angledriveData = new AngledriveData {
SavedInDeclarationMode = data.SavedInDeclarationMode,
- Vendor = data.Manufacturer,
+ Manufacturer = data.Manufacturer,
ModelName = data.Model,
- Creator = data.Creator,
Date = data.Date,
- TypeId = data.TechnicalReportId,
- DigestValue = data.DigestValue,
+ CertificationNumber = data.TechnicalReportId,
+ DigestValueInput = data.DigestValue,
IntegrityStatus = data.IntegrityStatus,
Type = type,
Angledrive = new TransmissionData { Ratio = data.Ratio }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index e54a855fa295177263f294829e943eedd637d6e9..ca5b47bf0b75a70a9c1741b51b2bcb67f1f87af1 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -146,7 +146,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
}
retVal.FullLoadCurves = fullLoadCurves;
- retVal.WHTCCorrectionFactor = engine.WHTCEngineering;
+ retVal.FuelConsumptionCorrectionFactor = engine.WHTCEngineering;
return retVal;
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index d6a24d93ae32a11c8f07b8f05dfca6b345e6cab5..2e7c1e1a78437f864929f4b56aea4b2bbc0b7acd 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
? municipalPtoTransmissionData
: ptoTransmissionData
};
- simulationRunData.EngineData.WHTCCorrectionFactor = DeclarationData.WHTCCorrection.Lookup(
+ simulationRunData.EngineData.FuelConsumptionCorrectionFactor = DeclarationData.WHTCCorrection.Lookup(
mission.MissionType.GetNonEMSMissionType(), engineData.WHTCRural, engineData.WHTCUrban, engineData.WHTCMotorway) *
engineData.ColdHotCorrectionFactor;
//simulationRunData.Cycle.Name = mission.MissionType.ToString();
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index e5d591f6a0c483db894df202228b5dca8d5b361b..e7770538f299b2bad01c4c6c5c404110a747f0f7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -69,13 +69,30 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[Required, Range(double.MinValue, double.MaxValue)]
public double ColdHotCorrectionFactor { get; internal set; }
- internal double WHTCCorrectionFactor = 1;
+ [Required, Range(double.MinValue, double.MaxValue)]
+ public double CorrectionFactorRegPer { get; internal set; }
+
+ [Required, Range(double.MinValue, double.MaxValue)]
+ public double CorrectionFactorNCV { get; internal set; }
+
+ public double FuelConsumptionCorrectionFactor {get; internal set; }
+
+ public PerSecond RatedSpeedDeclared { get; internal set; }
+
+ public Watt RatedPowerDeclared { get; internal set; }
+
+ public NewtonMeter MaxTorqueDeclared { get; internal set; }
+
+ public FuelType FuelType { get; internal set; }
public CombustionEngineData()
{
WHTCUrban = 1;
WHTCMotorway = 1;
WHTCRural = 1;
+ CorrectionFactorNCV = 1;
+ CorrectionFactorRegPer = 1;
+ FuelConsumptionCorrectionFactor = 1;
}
public CombustionEngineData Copy()
@@ -89,7 +106,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
WHTCMotorway = WHTCMotorway,
ConsumptionMap = ConsumptionMap,
FullLoadCurves = FullLoadCurves,
- WHTCCorrectionFactor = WHTCCorrectionFactor,
+ CorrectionFactorRegPer = CorrectionFactorRegPer,
+ CorrectionFactorNCV = CorrectionFactorNCV,
+ FuelConsumptionCorrectionFactor = FuelConsumptionCorrectionFactor,
+ RatedPowerDeclared = RatedPowerDeclared,
+ RatedSpeedDeclared = RatedSpeedDeclared,
+ MaxTorqueDeclared = MaxTorqueDeclared,
};
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
index 6e55a4fdf29a78cfaed934b4f74e0c6c435e23b7..07e62381ee442de0471acdced853c8ea2d1471e9 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
@@ -40,7 +40,7 @@ using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
{
[CustomValidation(typeof(TorqueConverterData), "ValidateData")]
- public class TorqueConverterData : LoggingObject
+ public class TorqueConverterData : SimulationComponentData
{
protected internal readonly TorqueConverterEntry[] TorqueConverterEntries;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
index 6cb49c1effcb8f81571b27dc8519a560d97aa982..72d66259e26c095b03635101b27beaa6ef229ded 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/SimulationComponentData.cs
@@ -42,16 +42,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public bool SavedInDeclarationMode { get; internal set; }
- public string Vendor { get; internal set; }
+ public string Manufacturer { get; internal set; }
public string ModelName { get; internal set; }
- public string Creator { get; internal set; }
public string Date { get; internal set; }
- public string TypeId { get; internal set; }
+ public string CertificationNumber { get; internal set; }
- public string DigestValue { get; internal set; }
+ public string DigestValueInput { get; internal set; }
+
+ public string DigestValueComputed { get; internal set; }
public IntegrityStatus IntegrityStatus { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
index b9f7ab828b2389ac04dd262bc32eabd77f12dbf6..74a4ae43bdc669618fdd3ea8d76a444435f78aed 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/VehicleData.cs
@@ -48,8 +48,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[CustomValidation(typeof(VehicleData), "ValidateVehicleData")]
public class VehicleData : SimulationComponentData
{
+ public string VIN { get; internal set; }
+
public VehicleCategory VehicleCategory { get; internal set; }
+
public VehicleClass VehicleClass { get; internal set; }
+
public AxleConfiguration AxleConfiguration { get; internal set; }
[Required, ValidateObject]
@@ -59,6 +63,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
private KilogramSquareMeter _wheelsInertia;
private double? _totalRollResistanceCoefficient;
+ private double? _rollResistanceCoefficientWithoutTrailer;
public List<Axle> AxleData
{
@@ -134,6 +139,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
protected internal set { _totalRollResistanceCoefficient = value; }
}
+ public double RollResistanceCoefficientWithoutTrailer
+ {
+ get {
+ if (_rollResistanceCoefficientWithoutTrailer == null) {
+ ComputeRollResistanceAndReducedMassWheels();
+ }
+ return _rollResistanceCoefficientWithoutTrailer.GetValueOrDefault();
+ }
+ protected internal set { _rollResistanceCoefficientWithoutTrailer = value; }
+ }
+
public CrossWindCorrectionMode CrossWindCorrectionMode { get; set; }
public Kilogram TotalVehicleWeight
@@ -155,7 +171,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
get { return CurbWeight ?? 0.SI<Kilogram>(); }
}
-
protected void ComputeRollResistanceAndReducedMassWheels()
{
if (TotalVehicleWeight == 0.SI<Kilogram>()) {
@@ -168,7 +183,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var g = Physics.GravityAccelleration;
var rrc = 0.0.SI<Scalar>();
+ var rrcVehicle = 0.0.SI<Scalar>();
+
var wheelsInertia = 0.0.SI<KilogramSquareMeter>();
+ var vehicleWeightShare = 0.0;
foreach (var axle in _axleData) {
if (axle.AxleWeightShare.IsEqual(0, 1e-12)) {
continue;
@@ -176,14 +194,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var nrWheels = axle.TwinTyres ? 4 : 2;
var baseValue = (axle.AxleWeightShare * TotalVehicleWeight * g / axle.TyreTestLoad / nrWheels).Value();
- rrc += axle.AxleWeightShare * axle.RollResistanceCoefficient *
- Math.Pow(baseValue, Physics.RollResistanceExponent - 1);
+ var rrcShare = axle.AxleWeightShare * axle.RollResistanceCoefficient *
+ Math.Pow(baseValue, Physics.RollResistanceExponent - 1);
+
+ if (axle.AxleType != AxleType.Trailer) {
+ rrcVehicle += rrcShare;
+ vehicleWeightShare += axle.AxleWeightShare;
+ }
+ rrc += rrcShare;
wheelsInertia += nrWheels * axle.Inertia;
}
+ RollResistanceCoefficientWithoutTrailer = rrcVehicle / vehicleWeightShare;
TotalRollResistanceCoefficient = rrc;
WheelsInertia = wheelsInertia;
}
+
// ReSharper disable once UnusedMember.Global -- used via Validation
public static ValidationResult ValidateVehicleData(VehicleData vehicleData, ValidationContext validationContext)
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index fc9023c56f85bcadb529dbc2723a0c2b3a6ac4f6..09c8096309d4317782ccfa6cb0fe438fa977f51f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -392,7 +392,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
//TODO mk-2015-11-11: calculate aux start stop correction
var fcAux = fc;
- var fcWHTC = fcAux * ModelData.WHTCCorrectionFactor;
+ var fcWHTC = fcAux * ModelData.FuelConsumptionCorrectionFactor;
var fcAAUX = fcWHTC;
var advancedAux = EngineAux as BusAuxiliariesAdapter;
if (advancedAux != null) {
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index f481ff32ce7ddbadf2892ffbc49c2edde6bb0ce6..1c9a3644dc2ccc61606ee72a6a0b7651f29bdd93 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -30,6 +30,7 @@
*/
using System;
+using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Runtime.CompilerServices;
@@ -60,22 +61,57 @@ namespace TUGraz.VectoCore.OutputData
public const string CURB_MASS = "Chassis curb mass [kg]";
public const string LOADING = "Loading [kg]";
- public const string HDV_CO2_VEHICLE_CLASS = "HDV CO2 vehicle class [-]";
- public const string TOTAL_VEHICLE_MASS = "Total vehicle mass [kg]";
+ public const string VEHICLE_MANUFACTURER = "Vehicle manufacturer [-]";
+ public const string VIN_NUMBER = "VIN number";
+ public const string VEHICLE_MODEL = "Vehicle model [-]";
+
+ public const string ENGINE_MANUFACTURER = "Engine manufacturer [-]";
+ public const string ENGINE_MODEL = "Engine model [-]";
+ public const string ENGINE_FUEL_TYPE = "Engine fuel type [-]";
+ public const string ENGINE_WHTC_URBAN = "Engine WHTCUrban";
+ public const string ENGINE_WHTC_RURAL = "Engine WHTCRural";
+ public const string ENGINE_WHTC_MOTORWAY = "Engine WHTCMotorway";
+ public const string ENGINE_BF_COLD_HOT = "Engine BFColdHot";
+ public const string ENGINE_CF_REG_PER = "Engine CFRegPer";
+ public const string ENGINE_ACTUAL_CORRECTION_FACTOR = "Engine actual CF";
public const string ENGINE_RATED_POWER = "Engine rated power [kW]";
public const string ENGINE_IDLING_SPEED = "Engine idling speed [rpm]";
public const string ENGINE_RATED_SPEED = "Engine rated speed [rpm]";
public const string ENGINE_DISPLACEMENT = "Engine displacement [ccm]";
- public const string CD_x_A = "CdxA [m²]";
- public const string ROLLING_RESISTANCE_COEFFICIENT = "weighed RRC [-]";
- public const string TRANSMISSION_TYPE = "Transmission type [-]";
+
+ public const string ROLLING_RESISTANCE_COEFFICIENT_W_TRAILER = "total RRC [-]";
+ public const string ROLLING_RESISTANCE_COEFFICIENT_WO_TRAILER = "weighted RRC w/o trailer [-]";
+
+ public const string GEARBOX_MANUFACTURER = "Gearbox manufacturer [-]";
+ public const string GEARBOX_MODEL = "Gearbox model [-]";
+ public const string GEARBOX_TYPE = "Gearbox type [-]";
public const string GEAR_RATIO_FIRST_GEAR = "Gear ratio first gear [-]";
public const string GEAR_RATIO_LAST_GEAR = "Gear ratio last gear [-]";
- public const string AXLE_GEAR_RATIO = "Axle gear ratio [-]";
- public const string R_DYN = "r_dyn [m]";
+
+ public const string TORQUECONVERTER_MANUFACTURER = "Torque converter manufacturer [-]";
+ public const string TORQUECONVERTER_MODEL = "Torque converter model [-]";
+
+ public const string RETARDER_MANUFACTURER = "Retarder manufacturer [-]";
+ public const string RETARDER_MODEL = "Retarder model [-]";
public const string RETARDER_TYPE = "Retarder type [-]";
- public const string VOLUME = "Cargo Volume [m³]";
+ public const string ANGLEDRIVE_MANUFACTURER = "Angledrive manufacturer [-]";
+ public const string ANGLEDRIVE_MODEL = "Angledrive model [-]";
+ public const string ANGLEDRIVE_RATIO = "Angledrive ratio [-]";
+
+ public const string AXLE_MANUFACTURER = "Axle manufacturer [-]";
+ public const string AXLE_MODEL = "Axle model [-]";
+ public const string AXLE_RATIO = "Axle gear ratio [-]";
+
+ public const string AUX_TECH_FORMAT = "Auxiliary technology {0} [-]";
+
+ public const string HDV_CO2_VEHICLE_CLASS = "HDV CO2 vehicle class [-]";
+ public const string TOTAL_VEHICLE_MASS = "Total vehicle mass [kg]";
+ public const string CD_x_A = "CdxA [m²]";
+ //public const string ROLLING_RESISTANCE_COEFFICIENT = "weighed RRC [-]";
+ public const string R_DYN = "r_dyn [m]";
+
+ public const string CARGO_VOLUME = "Cargo Volume [m³]";
public const string TIME = "time [s]";
public const string DISTANCE = "distance [km]";
public const string SPEED = "speed [km/h]";
@@ -149,6 +185,7 @@ namespace TUGraz.VectoCore.OutputData
internal readonly DataTable _table;
private readonly ISummaryWriter _sumWriter;
+
protected SummaryDataContainer() {}
/// <summary>
@@ -160,30 +197,74 @@ namespace TUGraz.VectoCore.OutputData
_sumWriter = writer;
_table = new DataTable();
- _table.Columns.Add(JOB, typeof(string));
- _table.Columns.Add(INPUTFILE, typeof(string));
- _table.Columns.Add(CYCLE, typeof(string));
- _table.Columns.Add(STATUS, typeof(string));
- _table.Columns.Add(HDV_CO2_VEHICLE_CLASS, typeof(string));
_table.Columns.AddRange(new[] {
- CURB_MASS, LOADING, TOTAL_VEHICLE_MASS, ENGINE_RATED_POWER, ENGINE_IDLING_SPEED, ENGINE_RATED_SPEED,
- ENGINE_DISPLACEMENT, CD_x_A,
- ROLLING_RESISTANCE_COEFFICIENT
- }.Select(x => new DataColumn(x, typeof(SI))).ToArray());
- _table.Columns.Add(TRANSMISSION_TYPE, typeof(string));
- _table.Columns.AddRange(new[] {
- GEAR_RATIO_FIRST_GEAR, GEAR_RATIO_LAST_GEAR, AXLE_GEAR_RATIO, R_DYN
- }.Select(x => new DataColumn(x, typeof(SI))).ToArray());
- _table.Columns.Add(RETARDER_TYPE, typeof(string));
+ Tuple.Create(JOB, typeof(string)),
+ Tuple.Create(INPUTFILE, typeof(string)),
+ Tuple.Create(CYCLE, typeof(string)),
+ Tuple.Create(STATUS, typeof(string)),
+ Tuple.Create(VEHICLE_MANUFACTURER, typeof(string)),
+ Tuple.Create(VIN_NUMBER, typeof(string)),
+ Tuple.Create(VEHICLE_MODEL, typeof(string)),
+ Tuple.Create(HDV_CO2_VEHICLE_CLASS, typeof(string)),
+ Tuple.Create(CURB_MASS, typeof(SI)),
+ Tuple.Create(LOADING, typeof(SI)),
+ Tuple.Create(TOTAL_VEHICLE_MASS, typeof(SI)),
+ Tuple.Create(ENGINE_MANUFACTURER, typeof(string)),
+ Tuple.Create(ENGINE_MODEL, typeof(string)),
+ Tuple.Create(ENGINE_FUEL_TYPE, typeof(string)),
+ Tuple.Create(ENGINE_RATED_POWER, typeof(SI)),
+ Tuple.Create(ENGINE_IDLING_SPEED, typeof(SI)),
+ Tuple.Create(ENGINE_RATED_SPEED, typeof(SI)),
+ Tuple.Create(ENGINE_DISPLACEMENT, typeof(SI)),
+ Tuple.Create(ENGINE_WHTC_URBAN, typeof(double)),
+ Tuple.Create(ENGINE_WHTC_RURAL, typeof(double)),
+ Tuple.Create(ENGINE_WHTC_MOTORWAY, typeof(double)),
+ Tuple.Create(ENGINE_BF_COLD_HOT, typeof(double)),
+ Tuple.Create(ENGINE_CF_REG_PER, typeof(double)),
+ Tuple.Create(ENGINE_ACTUAL_CORRECTION_FACTOR, typeof(double)),
+ Tuple.Create(CD_x_A, typeof(SI)),
+ Tuple.Create(ROLLING_RESISTANCE_COEFFICIENT_W_TRAILER, typeof(double)),
+ Tuple.Create(ROLLING_RESISTANCE_COEFFICIENT_WO_TRAILER, typeof(double)),
+ Tuple.Create(R_DYN, typeof(SI)),
+ Tuple.Create(GEARBOX_MANUFACTURER, typeof(string)),
+ Tuple.Create(GEARBOX_MODEL, typeof(string)),
+ Tuple.Create(GEARBOX_TYPE, typeof(string)),
+ Tuple.Create(GEAR_RATIO_FIRST_GEAR, typeof(SI)),
+ Tuple.Create(GEAR_RATIO_LAST_GEAR, typeof(SI)),
+ Tuple.Create(TORQUECONVERTER_MANUFACTURER, typeof(string)),
+ Tuple.Create(TORQUECONVERTER_MODEL, typeof(string)),
+ Tuple.Create(RETARDER_MANUFACTURER, typeof(string)),
+ Tuple.Create(RETARDER_MODEL, typeof(string)),
+ Tuple.Create(RETARDER_TYPE, typeof(string)),
+ Tuple.Create(ANGLEDRIVE_MANUFACTURER, typeof(string)),
+ Tuple.Create(ANGLEDRIVE_MODEL, typeof(string)),
+ Tuple.Create(ANGLEDRIVE_RATIO, typeof(string)),
+ Tuple.Create(AXLE_MANUFACTURER, typeof(string)),
+ Tuple.Create(AXLE_MODEL, typeof(string)),
+ Tuple.Create(AXLE_RATIO, typeof(SI)),
+ Tuple.Create(string.Format(AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.SteeringPump), typeof(string)),
+ Tuple.Create(string.Format(AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.Fan), typeof(string)),
+ Tuple.Create(string.Format(AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.HeatingVentilationAirCondition),
+ typeof(string)),
+ Tuple.Create(string.Format(AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.PneumaticSystem), typeof(string)),
+ Tuple.Create(string.Format(AUX_TECH_FORMAT, Constants.Auxiliaries.IDs.ElectricSystem), typeof(string)),
+ }.Select(x => new DataColumn(x.Item1, x.Item2)).ToArray());
+
_table.Columns.AddRange(new[] {
- VOLUME, TIME, DISTANCE, SPEED, ALTITUDE_DELTA, FCMAP_H, FCMAP_KM, FCAUXC_H, FCAUXC_KM,
- FCWHTCC_H,
- FCWHTCC_KM,
- FCAAUX_H, FCAAUX_KM, FCFINAL_H, FCFINAL_KM, FCFINAL_LITERPER100KM, FCFINAL_LITERPER100TKM, FCFINAL_LiterPer100M3KM,
+ CARGO_VOLUME,
+ TIME, DISTANCE,
+ SPEED, ALTITUDE_DELTA,
+ FCMAP_H, FCMAP_KM,
+ FCAUXC_H, FCAUXC_KM,
+ FCWHTCC_H, FCWHTCC_KM,
+ FCAAUX_H, FCAAUX_KM,
+ FCFINAL_H, FCFINAL_KM,
+ FCFINAL_LITERPER100KM, FCFINAL_LITERPER100TKM, FCFINAL_LiterPer100M3KM,
CO2_KM, CO2_TKM, CO2_M3KM,
P_WHEEL_POS, P_FCMAP_POS,
- E_FCMAP_POS, E_FCMAP_NEG, E_POWERTRAIN_INERTIA, E_AUX, E_CLUTCH_LOSS, E_TC_LOSS, E_SHIFT_LOSS, E_GBX_LOSS,
+ E_FCMAP_POS, E_FCMAP_NEG, E_POWERTRAIN_INERTIA,
+ E_AUX, E_CLUTCH_LOSS, E_TC_LOSS, E_SHIFT_LOSS, E_GBX_LOSS,
E_RET_LOSS, E_ANGLE_LOSS, E_AXL_LOSS, E_BRAKE, E_VEHICLE_INERTIA, E_AIR, E_ROLL, E_GRAD,
ACC, ACC_POS, ACC_NEG, ACC_TIMESHARE, DEC_TIMESHARE, CRUISE_TIMESHARE, STOP_TIMESHARE,
MAX_SPEED, MAX_ACCELERATION, MAX_DECELERATION, AVG_ENGINE_SPEED, MAX_ENGINE_SPEED, NUM_GEARSHIFTS,
@@ -215,27 +296,54 @@ namespace TUGraz.VectoCore.OutputData
row[JOB] = ReplaceNotAllowedCharacters(current);
row[INPUTFILE] = ReplaceNotAllowedCharacters(runData.JobName);
row[CYCLE] = ReplaceNotAllowedCharacters(runData.Cycle.Name + Constants.FileExtensions.CycleFile);
+
row[STATUS] = modData.RunStatus;
var vehicleLoading = 0.SI<Kilogram>();
var cargoVolume = 0.SI<CubicMeter>();
uint gearCount = 0u;
if (runData.Cycle.CycleType != CycleType.EngineOnly) {
+ row[VEHICLE_MANUFACTURER] = runData.VehicleData.Manufacturer;
+ row[VIN_NUMBER] = runData.VehicleData.VIN;
+ row[VEHICLE_MODEL] = runData.VehicleData.ModelName;
+
row[HDV_CO2_VEHICLE_CLASS] = runData.VehicleData.VehicleClass.GetClassNumber();
row[CURB_MASS] = runData.VehicleData.CurbWeight - (runData.VehicleData.BodyAndTrailerWeight ?? 0.SI<Kilogram>());
row[LOADING] = runData.VehicleData.Loading;
- row[VOLUME] = runData.VehicleData.CargoVolume;
+ row[CARGO_VOLUME] = runData.VehicleData.CargoVolume;
row[TOTAL_VEHICLE_MASS] = runData.VehicleData.TotalVehicleWeight;
- row[ENGINE_RATED_POWER] =
- runData.EngineData.FullLoadCurves[0].FullLoadStationaryPower(runData.EngineData.FullLoadCurves[0].RatedSpeed)
- .ConvertTo().Kilo.Watt;
+ row[ENGINE_MANUFACTURER] = runData.EngineData.Manufacturer;
+ row[ENGINE_MODEL] = runData.EngineData.ModelName;
+ row[ENGINE_FUEL_TYPE] = runData.EngineData.FuelType.GetLabel();
+ row[ENGINE_RATED_POWER] =runData.EngineData.RatedPowerDeclared != null ?
+ runData.EngineData.RatedPowerDeclared.ConvertTo().Kilo.Watt:
+ runData.EngineData.FullLoadCurves[0].MaxPower.ConvertTo().Kilo.Watt;
row[ENGINE_IDLING_SPEED] = runData.EngineData.IdleSpeed.AsRPM.SI<Scalar>();
- row[ENGINE_RATED_SPEED] = runData.EngineData.FullLoadCurves[0].RatedSpeed.AsRPM.SI<Scalar>();
+ row[ENGINE_RATED_SPEED] = runData.EngineData.RatedSpeedDeclared != null
+ ? runData.EngineData.RatedSpeedDeclared.AsRPM.SI<Scalar>()
+ : runData.EngineData.FullLoadCurves[0].RatedSpeed.AsRPM.SI<Scalar>();
row[ENGINE_DISPLACEMENT] = runData.EngineData.Displacement.ConvertTo().Cubic.Centi.Meter;
+
+ row[ENGINE_WHTC_URBAN] = runData.EngineData.WHTCUrban;
+ row[ENGINE_WHTC_RURAL] = runData.EngineData.WHTCRural;
+ row[ENGINE_WHTC_MOTORWAY] = runData.EngineData.WHTCMotorway;
+ row[ENGINE_BF_COLD_HOT] = runData.EngineData.ColdHotCorrectionFactor;
+ row[ENGINE_CF_REG_PER] = runData.EngineData.CorrectionFactorRegPer;
+ row[ENGINE_ACTUAL_CORRECTION_FACTOR] = runData.EngineData.FuelConsumptionCorrectionFactor;
+
row[CD_x_A] = runData.VehicleData.CrossWindCorrectionCurve.AirDragArea;
- row[ROLLING_RESISTANCE_COEFFICIENT] = runData.VehicleData.TotalRollResistanceCoefficient.SI<Scalar>();
- row[TRANSMISSION_TYPE] = runData.GearboxData.Type;
+
+ row[ROLLING_RESISTANCE_COEFFICIENT_WO_TRAILER] =
+ runData.VehicleData.RollResistanceCoefficientWithoutTrailer;
+ row[ROLLING_RESISTANCE_COEFFICIENT_W_TRAILER] =
+ runData.VehicleData.TotalRollResistanceCoefficient;
+
+ row[R_DYN] = runData.VehicleData.DynamicTyreRadius;
+
+ row[GEARBOX_MANUFACTURER] = runData.GearboxData.Manufacturer;
+ row[GEARBOX_MODEL] = runData.GearboxData.ModelName;
+ row[GEARBOX_TYPE] = runData.GearboxData.Type;
if (runData.GearboxData.Type.AutomaticTransmission()) {
row[GEAR_RATIO_FIRST_GEAR] = runData.GearboxData.Gears.Count > 0
? (double.IsNaN(runData.GearboxData.Gears.First().Value.Ratio)
@@ -245,6 +353,8 @@ namespace TUGraz.VectoCore.OutputData
row[GEAR_RATIO_LAST_GEAR] = runData.GearboxData.Gears.Count > 0
? runData.GearboxData.Gears.Last().Value.Ratio.SI<Scalar>()
: 0.SI<Scalar>();
+ row[TORQUECONVERTER_MANUFACTURER] = runData.GearboxData.TorqueConverterData.Manufacturer;
+ row[TORQUECONVERTER_MODEL] = runData.GearboxData.TorqueConverterData.ModelName;
} else {
row[GEAR_RATIO_FIRST_GEAR] = runData.GearboxData.Gears.Count > 0
? runData.GearboxData.Gears.First().Value.Ratio.SI<Scalar>()
@@ -252,12 +362,50 @@ namespace TUGraz.VectoCore.OutputData
row[GEAR_RATIO_LAST_GEAR] = runData.GearboxData.Gears.Count > 0
? runData.GearboxData.Gears.Last().Value.Ratio.SI<Scalar>()
: 0.SI<Scalar>();
+ row[TORQUECONVERTER_MANUFACTURER] = "n.a.";
+ row[TORQUECONVERTER_MODEL] = "n.a.";
}
- row[AXLE_GEAR_RATIO] = runData.AxleGearData.AxleGear.Ratio.SI<Scalar>();
- row[R_DYN] = runData.VehicleData.DynamicTyreRadius;
- row[RETARDER_TYPE] = runData.Retarder.Type;
- vehicleLoading = runData.VehicleData.Loading;
+ row[RETARDER_TYPE] = runData.Retarder.Type.GetLabel();
+ if (runData.Retarder.Type.IsDedicatedComponent()) {
+ row[RETARDER_MANUFACTURER] = runData.Retarder.Manufacturer;
+ row[RETARDER_MODEL] = runData.Retarder.ModelName;
+ } else {
+ row[RETARDER_MANUFACTURER] = "n.a.";
+ row[RETARDER_MODEL] = "n.a.";
+ }
+
+ if (runData.AngledriveData != null) {
+ row[ANGLEDRIVE_MANUFACTURER] = runData.AngledriveData.Manufacturer;
+ row[ANGLEDRIVE_MODEL] = runData.AngledriveData.ModelName;
+ row[ANGLEDRIVE_RATIO] = runData.AngledriveData.Angledrive.Ratio;
+ } else {
+ row[ANGLEDRIVE_MANUFACTURER] = "n.a.";
+ row[ANGLEDRIVE_MODEL] = "n.a.";
+ row[ANGLEDRIVE_RATIO] = "n.a.";
+ }
+
+ row[AXLE_MANUFACTURER] = runData.AxleGearData.Manufacturer;
+ row[AXLE_MODEL] = runData.AxleGearData.ModelName;
+ row[AXLE_RATIO] = runData.AxleGearData.AxleGear.Ratio.SI<Scalar>();
+
+ foreach (var aux in runData.Aux) {
+ string colName;
+ if (aux.ID == Constants.Auxiliaries.IDs.PTOConsumer || aux.ID == Constants.Auxiliaries.IDs.PTOTransmission) {
+ continue;
+ }
+ colName = string.Format(AUX_TECH_FORMAT, aux.ID);
+
+ if (!_table.Columns.Contains(colName)) {
+ var col = _table.Columns.Add(colName, typeof(string));
+ // move the new column to correct position
+ col.SetOrdinal(_table.Columns[CARGO_VOLUME].Ordinal);
+ }
+
+ row[colName] = aux.Technology == null ? "" : string.Join("; ", aux.Technology);
+ }
+
cargoVolume = runData.VehicleData.CargoVolume;
+ vehicleLoading = runData.VehicleData.Loading;
gearCount = (uint)runData.GearboxData.Gears.Count;
}
@@ -394,26 +542,28 @@ namespace TUGraz.VectoCore.OutputData
row[COASTING_TIME_SHARE] = modal.CoastingTimeShare();
row[BRAKING_TIME_SHARE] = modal.BrakingTimeShare();
- if (gearCount > 0) {
- row[NUM_GEARSHIFTS] = modal.GearshiftCount();
- var timeSharePerGear = modal.TimeSharePerGear(gearCount);
+ if (gearCount <= 0) {
+ return;
+ }
- for (uint i = 0; i <= gearCount; i++) {
- var colName = string.Format(TIME_SHARE_PER_GEAR_FORMAT, i);
- if (!_table.Columns.Contains(colName)) {
- _table.Columns.Add(colName, typeof(SI));
- }
- row[colName] = timeSharePerGear[i];
+ row[NUM_GEARSHIFTS] = modal.GearshiftCount();
+ var timeSharePerGear = modal.TimeSharePerGear(gearCount);
+
+ for (uint i = 0; i <= gearCount; i++) {
+ var colName = string.Format(TIME_SHARE_PER_GEAR_FORMAT, i);
+ if (!_table.Columns.Contains(colName)) {
+ _table.Columns.Add(colName, typeof(SI));
}
- if (accTimeShare != null && decTimeShare != null && cruiseTimeShare != null) {
- var shareSum = accTimeShare + decTimeShare + cruiseTimeShare + stopTimeShare;
- if (!shareSum.IsEqual(100)) {
- Log.Error(
- "Sumfile Error: driving behavior timeshares must sum up to 100%: acc: {0}%, dec: {1}%, cruise: {2}%, stop: {3}%, sum: {4}%",
- accTimeShare.ToOutputFormat(1, null, false), decTimeShare.ToOutputFormat(1, null, false),
- cruiseTimeShare.ToOutputFormat(1, null, false), stopTimeShare.ToOutputFormat(1, null, false),
- shareSum.ToOutputFormat(1, null, false));
- }
+ row[colName] = timeSharePerGear[i];
+ }
+ if (accTimeShare != null && decTimeShare != null && cruiseTimeShare != null) {
+ var shareSum = accTimeShare + decTimeShare + cruiseTimeShare + stopTimeShare;
+ if (!shareSum.IsEqual(100)) {
+ Log.Error(
+ "Sumfile Error: driving behavior timeshares must sum up to 100%: acc: {0}%, dec: {1}%, cruise: {2}%, stop: {3}%, sum: {4}%",
+ accTimeShare.ToOutputFormat(1, null, false), decTimeShare.ToOutputFormat(1, null, false),
+ cruiseTimeShare.ToOutputFormat(1, null, false), stopTimeShare.ToOutputFormat(1, null, false),
+ shareSum.ToOutputFormat(1, null, false));
}
}
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index fe7068323d95c81b18d76f2a4c18c64c8c0a91fb..2b3fb7b9e29b312d0b7dd1cb831b63d4d3b52b48 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -140,7 +140,7 @@ namespace TUGraz.VectoCore.OutputData.XML
protected override void DoInitializeReport(VectoRunData modelData, Segment segment)
{
VehicleConfiguration = new XElement("Vehicle",
- new XAttribute("id", modelData.VehicleData.TypeId),
+ new XAttribute("id", modelData.VehicleData.CertificationNumber),
GetComponentAttributes(modelData.VehicleData));
var components = new XElement("Components",
GetComponentDescription("Engine", modelData.EngineData),
@@ -167,8 +167,8 @@ namespace TUGraz.VectoCore.OutputData.XML
private static XElement GetIntegrityStatus(SimulationComponentData component)
{
return new XElement("Entry",
- new XAttribute("ref", component.TypeId),
- new XAttribute("digest", component.DigestValue),
+ new XAttribute("ref", component.CertificationNumber),
+ new XAttribute("digest", component.DigestValueInput),
new XAttribute("check", component.IntegrityStatus));
}
@@ -207,17 +207,17 @@ namespace TUGraz.VectoCore.OutputData.XML
{
return new XElement("Component",
new XAttribute("type", type),
- new XAttribute("id", component.TypeId),
+ new XAttribute("id", component.CertificationNumber),
GetComponentAttributes(component));
}
private static XElement[] GetComponentAttributes(SimulationComponentData component)
{
return new[] {
- new XElement("Vendor", component.Vendor),
+ new XElement("Vendor", component.Manufacturer),
new XElement("MakeAndModel", component.ModelName),
- new XElement("TypeId", component.TypeId),
- new XElement("ComponentDataHash", component.DigestValue)
+ new XElement("TypeId", component.CertificationNumber),
+ new XElement("ComponentDataHash", component.DigestValueInput)
};
}
}
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
index b0ec58b3492f4a8020e032e690dee062e432099f..9a27e86e7a6b2dfeb489d4850805a6f3b6ca763b 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
@@ -1571,25 +1571,24 @@
<xs:enumeration value="Trailer"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="TechnicalReportIdType">
+ <xs:simpleType name="CertificationNumberType">
<xs:annotation>
<xs:appinfo>
<vectoParam:description>
- <vectoParam:parameterId component="Engine">202</vectoParam:parameterId>
- <vectoParam:parameterId component="Gearbox">207</vectoParam:parameterId>
- <vectoParam:parameterId component="Torqueconverter">212</vectoParam:parameterId>
- <vectoParam:parameterId component="Axlegear">217</vectoParam:parameterId>
- <vectoParam:parameterId component="Angledrive">222</vectoParam:parameterId>
- <vectoParam:parameterId component="Retarder">227</vectoParam:parameterId>
- <vectoParam:parameterId component="Tyre">232</vectoParam:parameterId>
- <vectoParam:parameterId component="Airdrag">242</vectoParam:parameterId>
+ <vectoParam:parameterId component="Engine">261</vectoParam:parameterId>
+ <vectoParam:parameterId component="Gearbox">262</vectoParam:parameterId>
+ <vectoParam:parameterId component="Torqueconverter">263</vectoParam:parameterId>
+ <vectoParam:parameterId component="Axlegear">264</vectoParam:parameterId>
+ <vectoParam:parameterId component="Angledrive">265</vectoParam:parameterId>
+ <vectoParam:parameterId component="Retarder">266</vectoParam:parameterId>
+ <vectoParam:parameterId component="Tyre">267</vectoParam:parameterId>
+ <vectoParam:parameterId component="Airdrag">268</vectoParam:parameterId>
<vectoParam:unit>-</vectoParam:unit>
</vectoParam:description>
</xs:appinfo>
+ <xs:documentation>P261, P262, P263, P264, P265, P266, P267, P268</xs:documentation>
</xs:annotation>
- <xs:restriction base="xs:token">
- <xs:minLength value="1"/>
- </xs:restriction>
+ <xs:restriction base="xs:token"/>
</xs:simpleType>
<xs:simpleType name="DateTimeWithTimezone">
<xs:annotation>
@@ -1758,6 +1757,32 @@ ToDo: -0.00
</xs:annotation>
<xs:restriction base="tns:Double2"/>
</xs:simpleType>
+ <xs:simpleType name="EngineMaxTorque">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">259</vectoParam:parameterId>
+ <vectoParam:comment/>
+ <vectoParam:unit>Nm</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P259</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:int"/>
+ </xs:simpleType>
+ <xs:simpleType name="EngineNCVCFType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">260</vectoParam:parameterId>
+ <vectoParam:comment/>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ <xs:documentation>P260</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="tns:Double4"/>
+ </xs:simpleType>
<xs:simpleType name="EngineRatedPower">
<xs:annotation>
<xs:documentation>P250</xs:documentation>
@@ -2217,6 +2242,26 @@ ToDo: -0.00
<xs:maxInclusive value="4"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="TechnicalReportIdType">
+ <xs:annotation>
+ <xs:appinfo>
+ <vectoParam:description>
+ <vectoParam:parameterId component="Engine">202</vectoParam:parameterId>
+ <vectoParam:parameterId component="Gearbox">207</vectoParam:parameterId>
+ <vectoParam:parameterId component="Torqueconverter">212</vectoParam:parameterId>
+ <vectoParam:parameterId component="Axlegear">217</vectoParam:parameterId>
+ <vectoParam:parameterId component="Angledrive">222</vectoParam:parameterId>
+ <vectoParam:parameterId component="Retarder">227</vectoParam:parameterId>
+ <vectoParam:parameterId component="Tyre">232</vectoParam:parameterId>
+ <vectoParam:parameterId component="Airdrag">242</vectoParam:parameterId>
+ <vectoParam:unit>-</vectoParam:unit>
+ </vectoParam:description>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="TorqueConverterCertificationOptionType">
<xs:annotation>
<xs:documentation>P257 - enum</xs:documentation>
@@ -2516,49 +2561,4 @@ ToDo: -0.00
<xs:enumeration value="Multipurpose - Diagonal"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="EngineMaxTorque">
- <xs:annotation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Engine">259</vectoParam:parameterId>
- <vectoParam:comment/>
- <vectoParam:unit>Nm</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- <xs:documentation>P259</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:int"/>
- </xs:simpleType>
- <xs:simpleType name="EngineNCVCFType">
- <xs:annotation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Engine">260</vectoParam:parameterId>
- <vectoParam:comment/>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- <xs:documentation>P260</xs:documentation>
- </xs:annotation>
- <xs:restriction base="tns:Double4"/>
- </xs:simpleType>
- <xs:simpleType name="CertificationNumberType">
- <xs:annotation>
- <xs:appinfo>
- <vectoParam:description>
- <vectoParam:parameterId component="Engine">261</vectoParam:parameterId>
- <vectoParam:parameterId component="Gearbox">262</vectoParam:parameterId>
- <vectoParam:parameterId component="Torqueconverter">263</vectoParam:parameterId>
- <vectoParam:parameterId component="Axlegear">264</vectoParam:parameterId>
- <vectoParam:parameterId component="Angledrive">265</vectoParam:parameterId>
- <vectoParam:parameterId component="Retarder">266</vectoParam:parameterId>
- <vectoParam:parameterId component="Tyre">267</vectoParam:parameterId>
- <vectoParam:parameterId component="Airdrag">268</vectoParam:parameterId>
- <vectoParam:unit>-</vectoParam:unit>
- </vectoParam:description>
- </xs:appinfo>
- <xs:documentation>P261, P262, P263, P264, P265, P266, P267, P268</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token"/>
- </xs:simpleType>
</xs:schema>
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index 94743736ca06a0bfb8140d35827f65f83aee8de5..89997c601c58b6c81722a91b8872f98c79c1cac7 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
@@ -218,6 +218,9 @@ namespace TUGraz.VectoCore.Utils
formattedList[i] = si != null
? columnFormatter[i](si)
: formattedList[i] = string.Format(CultureInfo.InvariantCulture, "{0}", items[i]);
+ if (formattedList[i].Contains(Delimiter)) {
+ formattedList[i] = string.Format("\"{0}\"", formattedList[i]);
+ }
}
writer.WriteLine(string.Join(Delimiter, formattedList));
}
diff --git a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
index a16361c577803f75050b3bfdc0cba49440592184..f390dd5768051c08e26a637637394588d8739ce6 100644
--- a/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
@@ -82,10 +82,10 @@ namespace TUGraz.VectoCore.Tests.Integration
HasTorqueConverter = true
};
- var gearboxData = CreateGearboxData(gbxType);
+ var gearboxData = CreateGearboxData(gbxType);
var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineFile, gearboxData.Gears.Count);
var axleGearData = CreateAxleGearData(gbxType);
-
+
if (gearBoxInertia != null) {
gearboxData.Inertia = gearBoxInertia;
}
@@ -100,7 +100,8 @@ namespace TUGraz.VectoCore.Tests.Integration
EngineData = engineData,
JobName = modFileName,
Cycle = cycleData,
- Retarder = new RetarderData() { Type = RetarderType.None }
+ Retarder = new RetarderData() { Type = RetarderType.None },
+ Aux = new List<VectoRunData.AuxData>()
};
var container = new VehicleContainer(ExecutionMode.Engineering, modData) {
RunData = runData,
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
index 8198eac4864817ceb4f5a6232ad42e32cd21a162..9fe61c7f04383f513e7633d93a3ff5e33fb96fca 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs
@@ -183,7 +183,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
{
var vehicleData = new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
- Creator = "Mr. Test",
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
CrossWindCorrectionCurve =
new CrosswindCorrectionCdxALookup(5.SI<SquareMeter>(),
@@ -250,7 +249,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
};
var vehicleData = new VehicleData {
AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
- Creator = "Mr. Test",
CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection,
CrossWindCorrectionCurve =
new CrosswindCorrectionCdxALookup(5.SI<SquareMeter>(),
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index 2b311ee1285390f70b4a373faff87819ac0c0406..76d7a89b872ac1660ccedc52ba23cea450ac9129 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -170,7 +170,7 @@ namespace TUGraz.VectoCore.Tests.Reports
var eAir = ((SI)row[SummaryDataContainer.E_AIR]).Value();
var eRoll = ((SI)row[SummaryDataContainer.E_ROLL]).Value();
var eGrad = ((SI)row[SummaryDataContainer.E_GRAD]).Value();
- var cargoVolume = mode == ExecutionMode.Engineering ? 0 : ((SI)row[SummaryDataContainer.VOLUME]).Value();
+ var cargoVolume = mode == ExecutionMode.Engineering ? 0 : ((SI)row[SummaryDataContainer.CARGO_VOLUME]).Value();
var loadingValue = ((SI)row[SummaryDataContainer.LOADING]).Value() / 1000;
var fcPer100km = ((SI)row[SummaryDataContainer.FCFINAL_LITERPER100KM]).Value();
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index d2030a60148f3f765fef244c0d422fb619432f3b..55c1370d9ef54039aabbf8637047a006c82cf4a3 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-6-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8356,46.6574,15.8669,7804.0762,167.2633,7804.0762,167.2633,7804.0762,167.2633,7804.0762,167.2633,7804.0762,167.2633,20.1038,,,528.5519,,,27.2225,37.8280,13.6496,0.2240,0.0000,1.9832,1.9832,0.0054,0.0000,0.0000,0.3208,0.0000,0.0000,1.8492,0.4632,0.0000,5.3351,3.1090,0.3597,0.0000,-0.3297,-0.3297,23.3256,22.7868,39.4919,14.3957,80.5095,1.1306,1.6261,1128.2949,1962.5826,216.0000,4.3880,0.0000,39.8768,17.0131,7.5443,0.7698,1.0778,5.1578,48.0370,20.4003
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+11-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8354,46.6571,15.8669,7802.9085,167.2396,7802.9085,167.2396,7802.9085,167.2396,7802.9085,167.2396,7802.9085,167.2396,20.1009,,,528.4772,,,27.2225,37.8292,13.6500,0.2247,0.0000,1.9832,1.9832,0.0054,0.0000,0.0000,0.3207,0.0000,0.0000,1.8492,0.4631,0.0000,5.3351,3.1090,0.3597,0.0000,0.3186,-0.3291,23.3256,22.8637,39.4149,14.3957,80.5095,1.1306,1.6261,1126.9852,1962.5826,215.0000,4.3880,0.0000,39.8768,17.6289,6.9284,0.7698,1.0778,5.1578,48.0370,20.4003
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index 89fb2a92f0c260817db9fe289e57e5e24b0a6d9e..1507e0519ddf9f361cda12c4a8613ddfd7f27eca 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-15-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8341,46.6534,15.8669,7981.6213,171.0835,7981.6213,171.0835,7981.6213,171.0835,7981.6213,171.0835,7981.6213,171.0835,20.5629,,,540.6238,,,27.2187,38.7907,13.9970,0.2085,0.0000,1.9832,0.3805,2.3637,0.0054,0.0000,0.0000,0.3208,0.0000,0.0000,1.8490,0.4471,0.0000,5.3340,3.1088,0.3597,0.0000,-0.3297,-0.3297,23.4026,22.7868,39.4149,14.3957,80.5095,1.1306,1.6261,1128.0344,1962.5826,216.0000,4.6189,0.0000,39.7998,17.0131,7.5443,0.7698,1.0778,5.1578,48.0370,20.4003
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+12-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8340,46.6530,15.8669,7980.6637,171.0644,7980.6637,171.0644,7980.6637,171.0644,7980.6637,171.0644,7980.6637,171.0644,20.5606,,,540.5634,,,27.2187,38.7930,13.9978,0.2090,0.0000,1.9832,0.3805,2.3637,0.0054,0.0000,0.0000,0.3207,0.0000,0.0000,1.8490,0.4477,0.0000,5.3340,3.1087,0.3597,0.0000,0.3178,-0.3291,23.4026,22.8637,39.3380,14.3957,80.5095,1.1306,1.6261,1126.6442,1962.5826,215.0000,4.6189,0.0000,39.7998,17.6289,6.9284,0.7698,1.0778,5.1578,48.0370,20.4003
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index dfc96ad5a3ae51ccd6622d4b6ff6877e6841aef8..f69b5970911632f5067de92d9409bcc83224950e 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-1-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,20.0479,,,527.0839,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3036,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,0.0000,-0.3441,-0.3441,23.5566,21.4011,40.6467,14.3957,80.5095,1.4057,1.9402,1082.0265,1962.3354,210.0000,3.3872,0.0000,40.1848,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+18-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,20.0479,,,527.0839,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3036,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,14.3957,80.5095,1.4057,1.9402,1082.0265,1962.3354,210.0000,3.3872,0.0000,40.1848,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index 21f965bca41add2037807395c8181f08b33ea1d9..ac48ed31fb069fd9b81bca6c785e32038effa169 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-13-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,0,17000.0000,4800.0000,21800.0000,350.5052,560.0000,1736.4865,12730.0000,3.2500,0.0059,ATPowerSplit,1.3500,0.7300,5.8000,0.4700,None,,379.0000,2.8856,27.4096,0.0036,10220.8583,372.8930,10220.8583,372.8930,10220.8583,372.8930,10220.8583,372.8930,10220.8583,372.8930,44.8189,9.3373,,1178.3418,245.4879,,40.8256,50.3844,5.3044,0.3386,0.0000,0.4738,0.4738,0.0000,0.3048,5.6356,0.1324,0.0000,0.0000,0.0963,2.6364,-0.0001,0.2436,1.0118,0.0002,-0.0004,-0.8532,-0.8532,32.7177,24.0106,23.2190,20.0528,60.3000,1.1111,1.6111,954.9245,1538.8058,106.0000,0.0000,0.0000,33.7731,26.3852,20.3166,11.6095,41.6887
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
+23-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N.A.,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,0.0000,560.0000,0.0000,12730.0000,1,1,1,0,1,1,3.2500,0.00590364808199548,0.00590364808199548,0.4700,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,AT Serial,5.8000,,,,,,,,379.0000,2.8856,27.4096,0.0036,10214.5287,372.6620,10214.5287,372.6620,10214.5287,372.6620,10214.5287,372.6620,10214.5287,372.6620,44.7911,9.3315,,1177.6120,245.3358,,40.8256,50.3483,5.3006,0.3386,0.0000,0.4738,0.4738,0.0000,0.3048,5.1676,0.1289,0.0000,0.0000,0.0963,2.6367,-0.0001,0.2436,1.0118,0.0002,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,20.0528,60.3000,1.1111,1.6111,954.9245,1538.8058,106.0000,0.0000,0.0000,33.7731,26.3852,20.3166,11.6095,41.6887
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 92aec2bd39bc47005e13a8a76c9e97d3366579ad..f38f36b15c4397c524ef348630b49ff44462e0ef 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-14-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,0,17000.0000,4800.0000,21800.0000,350.5052,560.0000,1736.4865,12730.0000,3.2500,0.0059,ATSerial,3.4000,0.6200,6.2000,0.4700,None,,272.0000,1.0330,13.6723,-0.0054,7118.7465,520.6686,7118.7465,520.6686,7118.7465,520.6686,7118.7465,520.6686,7118.7465,520.6686,62.5804,13.0376,,1645.3126,342.7735,,22.6119,31.3223,2.3666,0.2829,0.0000,0.3400,0.3400,0.0000,0.0423,22.1552,0.1377,0.0000,0.0000,0.0430,0.9389,0.0000,0.0343,0.3623,-0.0003,-0.0002,-0.8016,-0.8016,23.8971,23.1618,19.1176,33.8235,40.6000,1.1944,1.3056,995.2539,2236.6575,138.0000,0.0000,0.0000,33.8235,33.8235,24.6324,8.4559,14.3382,13.6029,5.1471,0.0000
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+24-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N.A.,0,17000.0000,4800.0000,21800.0000,N/A,Generic Engine,Diesel CI,0.0000,560.0000,0.0000,12730.0000,1,1,1,0,1,1,3.2500,0.00590364808199548,0.00590364808199548,0.4700,N/A,AT Serial,ATSerial,3.4000,0.6200,,,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,AT Serial,6.2000,,,,,,,,272.0000,1.0225,13.5328,-0.0054,7376.1702,545.0599,7376.1702,545.0599,7376.1702,545.0599,7376.1702,545.0599,7376.1702,545.0599,65.5120,13.6483,,1722.3894,358.8311,,23.4097,33.1204,2.5024,0.3511,0.0000,0.3400,0.3400,0.0000,0.0420,20.9532,0.1462,0.0000,0.0000,0.0453,0.9515,0.0000,0.0338,0.3586,0.0000,-0.0002,0.8827,-0.7816,22.4265,25.0000,18.7500,33.8235,40.6000,1.6935,1.3056,979.1068,1857.4892,138.0000,1.8382,0.0000,33.4559,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index 3be17bbd22bf00022a0931e994504b451d01a56f..6230cccc6f5c9cdaf985db886d6072f2b25aa2bb 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-8-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8692,46.7506,15.8669,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,20.4449,,,537.5221,,,27.2199,38.7271,13.9740,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3048,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,0.0000,-0.3378,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1087.0085,1962.3354,212.0000,3.4642,0.0000,40.1848,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+20-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,7952.3686,170.1019,20.4449,,,537.5221,,,27.2199,38.7271,13.9740,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3048,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1087.0085,1962.3354,212.0000,3.4642,0.0000,40.1848,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index 18719b3930abd7f216fe86c6805a13940439d8dc..08f2b1168b43ee5aeb9000951d8fef80351e9d10 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-10-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8711,46.7558,15.8669,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,16.1990,,,425.8899,,,20.1036,29.8660,10.7767,0.2894,0.0000,1.9832,1.9832,0.0268,0.0000,0.0000,0.2684,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,0.0000,-0.3378,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1084.6394,1962.3354,210.0000,1.4627,0.0000,40.1848,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+21-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8711,46.7558,15.8669,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,6301.5302,134.7753,16.1990,,,425.8899,,,20.1036,29.8660,10.7767,0.2894,0.0000,1.9832,1.9832,0.0268,0.0000,0.0000,0.2684,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1084.6394,1962.3354,210.0000,1.4627,0.0000,40.1848,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index 6f66f8f4e48363128fda079f1cc120a4ecea00af..43bbeaaf1be0e4e51821be134e3b3e4195b7ce17 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-4-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8711,46.7559,15.8669,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,16.5995,,,436.4219,,,20.1038,30.7899,11.1100,0.2750,0.0000,1.9824,0.3775,2.3598,0.0268,0.0000,0.0000,0.2692,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,0.0000,-0.3378,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1087.1418,1962.3354,212.0000,1.6166,0.0000,40.1848,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+22-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8711,46.7559,15.8669,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,6457.3752,138.1082,16.5995,,,436.4219,,,20.1038,30.7899,11.1100,0.2750,0.0000,1.9824,0.3775,2.3598,0.0268,0.0000,0.0000,0.2692,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,14.3957,80.5095,1.1306,1.6261,1087.1418,1962.3354,212.0000,1.6166,0.0000,40.1848,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index 5019bba815ee72446ef3e3b686ff64bcf6994237..9285413178b1e3bb9145fdb55936a11c395c6242 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-7-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8368,46.6609,15.8669,7802.5282,167.2176,7802.5282,167.2176,7802.5282,167.2176,7802.5282,167.2176,7802.5282,167.2176,20.0983,,,528.4077,,,27.2041,37.6545,13.5870,0.1721,0.0000,1.9832,1.9832,0.0052,0.0000,0.0000,0.2988,0.0000,0.0000,1.8480,0.4728,0.0000,5.3378,3.1093,0.3598,0.0000,-0.3383,-0.3383,22.8637,22.0939,40.6467,14.3957,80.5095,1.8083,1.9402,1073.7179,1701.8773,210.0000,4.4650,0.0000,39.5689,17.2440,1.5396,6.2356,1.3857,1.4627,48.9607,23.1717
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+19-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8351,46.6562,15.8669,7799.7310,167.1746,7799.7310,167.1746,7799.7310,167.1746,7799.7310,167.1746,7799.7310,167.1746,20.0931,,,528.2716,,,27.1915,37.6343,13.5797,0.1687,0.0000,1.9832,1.9832,0.0052,0.0000,0.0000,0.2986,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,14.3957,80.5095,1.8083,1.6261,1073.4169,1701.8773,209.0000,4.3880,0.0000,39.5689,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 2d3ecc7f96a3bfa62a51bb4d4bf35980e0fbb99c..89acc0f94e07f1e86c8eb7259403c0867a51fa39 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-9-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8461,46.6867,15.8669,6315.8836,135.2821,6315.8836,135.2821,6315.8836,135.2821,6315.8836,135.2821,6315.8836,135.2821,16.2599,,,427.4916,,,20.1448,29.9337,10.8011,0.3331,0.0000,1.9832,1.9832,0.0059,0.0000,0.0000,0.2829,0.0000,0.0000,1.8455,0.6555,0.0000,2.2245,3.1110,0.3596,0.0000,-0.3300,-0.3300,23.0177,22.4018,40.1848,14.3957,80.5095,1.1306,1.6261,1122.9306,1962.5826,214.0000,2.6174,0.0000,39.8768,16.8591,7.5443,0.7698,1.0778,4.3880,48.6528,20.7082
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+13-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8461,46.6867,15.8669,6315.1012,135.2655,6315.1012,135.2655,6315.1012,135.2655,6315.1012,135.2655,6315.1012,135.2655,16.2579,,,427.4391,,,20.1448,29.9358,10.8018,0.3334,0.0000,1.9832,1.9832,0.0059,0.0000,0.0000,0.2828,0.0000,0.0000,1.8455,0.6560,0.0000,2.2245,3.1110,0.3596,0.0000,0.3170,-0.3301,23.0177,22.4018,40.1848,14.3957,80.5095,1.1306,1.6261,1121.6641,1962.5826,214.0000,2.6174,0.0000,39.8768,17.3210,7.0824,0.7698,1.0778,4.3880,48.6528,20.7082
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index b47876cda6ec5de138c2ee25d9e1453faad6e8f1..1ad973d87f7ac80733c5e30c8439b59bf4cf9a44 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-5-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8454,46.6846,15.8669,6485.1470,138.9140,6485.1470,138.9140,6485.1470,138.9140,6485.1470,138.9140,6485.1470,138.9140,16.6964,,,438.9682,,,20.1443,30.8674,11.1380,0.3163,0.0000,1.9832,0.3800,2.3632,0.0059,0.0000,0.0000,0.2830,0.0000,0.0000,1.8454,0.6293,0.0000,2.2245,3.1109,0.3596,0.0000,-0.3300,-0.3300,23.0177,22.4018,40.1848,14.3957,80.5095,1.1306,1.6261,1122.7321,1962.5826,214.0000,2.7714,0.0000,39.8768,16.8591,7.5443,0.7698,1.0778,4.3880,48.6528,20.7082
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+17-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,,1299.0000,16.8454,46.6846,15.8669,6484.3707,138.8975,6484.3707,138.8975,6484.3707,138.8975,6484.3707,138.8975,6484.3707,138.8975,16.6944,,,438.9161,,,20.1443,30.8711,11.1393,0.3170,0.0000,1.9832,0.3799,2.3631,0.0059,0.0000,0.0000,0.2829,0.0000,0.0000,1.8454,0.6301,0.0000,2.2245,3.1109,0.3596,0.0000,0.3170,-0.3301,23.0177,22.4018,40.1848,14.3957,80.5095,1.1306,1.6261,1121.4187,1962.5826,214.0000,2.7714,0.0000,39.8768,17.3210,7.0824,0.7698,1.0778,4.3880,48.6528,20.7082
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index 5ba51ef6a8567ebb2104731eac5d89a1351e8d06..d2800166e6c5b5cb12db5b433c7307149fb42575 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-3-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8503,46.6982,15.8669,4885.6261,104.6213,4885.6261,104.6213,4885.6261,104.6213,4885.6261,104.6213,4885.6261,104.6213,12.5747,,,330.6032,,,13.7602,22.2987,8.0461,0.5127,0.0000,1.9832,1.9832,0.0052,0.0000,0.0000,0.2535,0.0000,0.0000,1.8435,0.8334,0.0000,-0.8568,3.1118,0.3597,0.0000,-0.3385,-0.3385,22.9407,21.4011,41.2625,14.3957,80.5095,1.1306,1.6261,1117.1844,1735.6300,212.0000,2.1555,0.0000,40.0308,16.7821,7.4673,0.7698,1.0778,3.6182,49.3457,20.9392
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+15-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8501,46.6977,15.8669,4884.3611,104.5952,4884.3611,104.5952,4884.3611,104.5952,4884.3611,104.5952,4884.3611,104.5952,12.5715,,,330.5210,,,13.7605,22.3008,8.0469,0.5134,0.0000,1.9832,1.9832,0.0052,0.0000,0.0000,0.2534,0.0000,0.0000,1.8435,0.8337,0.0000,-0.8568,3.1117,0.3597,0.0000,0.3156,-0.3348,22.9407,21.7860,40.8776,14.3957,80.5095,1.1306,1.6261,1115.4956,1735.6300,211.0000,2.1555,0.0000,40.0308,17.7059,6.5435,0.7698,1.0778,3.6182,49.3457,20.9392
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index 0f01849ac0284e95d6bad1d8bd38310cfe145805..79f579b3d188dac89a5f8183f387ed81c1f63924 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-2-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8476,46.6907,15.8669,5479.3513,117.3543,5479.3513,117.3543,5479.3513,117.3543,5479.3513,117.3543,5479.3513,117.3543,14.1051,,,370.8396,,,16.2823,25.4217,9.1730,0.4002,0.0000,1.9832,1.9832,0.0055,0.0000,0.0000,0.2618,0.0000,0.0000,1.8447,0.6776,0.0000,0.5289,3.1113,0.3597,0.0000,-0.3289,-0.3289,23.0177,22.4788,40.1078,14.3957,80.5095,1.1306,1.6261,1117.6259,1735.6300,212.0000,2.6174,0.0000,40.0308,16.7052,7.5443,0.7698,1.0778,3.6182,49.4996,20.7852
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+14-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8474,46.6902,15.8669,5478.1550,117.3298,5478.1550,117.3298,5478.1550,117.3298,5478.1550,117.3298,5478.1550,117.3298,14.1021,,,370.7622,,,16.2819,25.4228,9.1734,0.4011,0.0000,1.9832,1.9832,0.0055,0.0000,0.0000,0.2617,0.0000,0.0000,1.8447,0.6774,0.0000,0.5289,3.1112,0.3596,0.0000,0.3161,-0.3290,23.0177,22.4788,40.1078,14.3957,80.5095,1.1306,1.6261,1116.3935,1735.6300,211.0000,2.6174,0.0000,40.0308,17.2440,7.0054,0.7698,1.0778,3.6182,49.4996,20.7852
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index c1520db17ba7a2214e3c3967d73bf2986ebf7e9d..600f442dd3648d87a7560758a8fa309cec1c3211 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-11-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,0,8862.0000,0.0000,8862.0000,185.0000,600.0000,2200.0000,6000.0000,6.1650,0.0076,MT,6.6960,0.7280,4.3000,0.5200,None,,1299.0000,16.8483,46.6927,15.8669,5250.2188,112.4421,5250.2188,112.4421,5250.2188,112.4421,5250.2188,112.4421,5250.2188,112.4421,13.5147,,,355.3169,,,15.2949,24.2044,8.7337,0.4382,0.0000,1.9832,1.9832,0.0054,0.0000,0.0000,0.2589,0.0000,0.0000,1.8442,0.7327,0.0000,0.0000,3.1114,0.3597,0.0000,-0.3327,-0.3327,22.9407,22.0169,40.6467,14.3957,80.5095,1.1306,1.6261,1117.1190,1735.6300,212.0000,2.3865,0.0000,40.0308,16.7052,7.5443,0.7698,1.0778,3.6182,49.3457,20.9392
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+16-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N.A.,0,8862.0000,0.0000,8862.0000,N/A,Demo Engine,Diesel CI,0.0000,600.0000,0.0000,6000.0000,1,1,1,0,1,1,6.1650,0.00764995394918169,0.00764995394918169,0.5200,N/A,Demo,MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,Demo,4.3000,,,,,,,,1299.0000,16.8481,46.6923,15.8669,5249.0607,112.4182,5249.0607,112.4182,5249.0607,112.4182,5249.0607,112.4182,5249.0607,112.4182,13.5118,,,355.2414,,,15.2949,24.2055,8.7342,0.4389,0.0000,1.9832,1.9832,0.0054,0.0000,0.0000,0.2587,0.0000,0.0000,1.8442,0.7327,0.0000,0.0000,3.1114,0.3597,0.0000,0.3164,-0.3321,22.9407,22.0939,40.5697,14.3957,80.5095,1.1306,1.6261,1115.8093,1735.6300,211.0000,2.3865,0.0000,40.0308,17.3210,6.9284,0.7698,1.0778,3.6182,49.3457,20.9392
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index b234cb5980a118242b97d6299d635f70c1b2cbf0..14ee0ee472ccfae442a8e186808151f6a74731a3 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-20-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,0,12000.0000,0.0000,12000.0000,175.0000,600.0000,2200.0000,6374.0000,4.1500,0.0061,MT,6.6960,0.7280,4.3000,0.4210,None,,1.5000,,,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,,,,,,,59.3466,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+15-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N.A.,0,12000.0000,0.0000,12000.0000,N/A,OM906 175 kW,Diesel CI,0.0000,600.0000,0.0000,6374.0000,1,1,1,0,1,1,4.1500,0.0061139563906202,0.0061139563906202,0.4210,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,,1.5000,,,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,,,,,,,59.3466,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index 897dc15a710b7157757d79b3a764e80e82669aad..87ce22a4b0c89441d9d5833cd5daa33f2ce1f857 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-12-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,0,12000.0000,0.0000,12000.0000,175.0000,600.0000,2200.0000,6374.0000,4.1500,0.0061,MT,6.6960,0.7280,4.3000,0.4210,None,,1566.4000,,,,10007.0380,,10007.0380,,10007.0380,,10007.0380,,10007.0380,,,,,,,,41.2262,47.3156,20.5875,0.9855,-0.0004,1.5039,1.5039,0.0000,0.0000,0.0000,0.6828,0.0000,0.0000,1.0767,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1394.2195,2528.8056,52.0000,7.1757,0.0000,0.0000,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+16-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N.A.,0,12000.0000,0.0000,12000.0000,N/A,OM906 175 kW,Diesel CI,0.0000,600.0000,0.0000,6374.0000,1,1,1,0,1,1,4.1500,0.0061139563906202,0.0061139563906202,0.4210,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,n.a.,n.a.,n.a.,n.a.,None,n.a.,n.a.,n.a.,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,,1566.4000,,,,10007.5012,,10007.5012,,10007.5012,,10007.5012,,10007.5012,,,,,,,,41.2262,47.3199,20.5894,0.9852,-0.0004,1.5039,1.5039,0.0000,0.0000,0.0000,0.6826,0.0000,0.0000,1.0764,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1394.1646,2421.2271,52.0000,7.1757,0.0000,0.0000,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
index baaae6e8b7ce6b796dc22f26b854039c100c0f04..a601208566034a35c0d696026ba0cbe54ab42b3e 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
@@ -1,4 +1,4 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%]
-27-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,695.0000,,,,8102.2063,,8102.2063,,8102.2063,,8102.2063,,8102.2063,,,,,,,,0.0000,29.7166,5.7370,0.3730,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1304.7092,2453.5890,,0.0000,0.0000,0.0000
-27-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,1006.0000,,,,8427.7489,,8427.7489,,8427.7489,,8427.7489,,8427.7489,,,,,,,,0.0000,30.5705,8.5428,0.5740,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1367.6228,2453.5890,,0.0000,0.0000,0.0000
-27-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,166.0000,,,,6526.0629,,6526.0629,,6526.0629,,6526.0629,,6526.0629,,,,,,,,0.0000,21.5508,0.9937,0.1371,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1210.3733,2453.5890,,0.0000,0.0000,0.0000
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%]
+4-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,,,,8102.2063,,8102.2063,,8102.2063,,8102.2063,,8102.2063,,,,,,,,0.0000,29.7166,5.7370,0.3730,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1304.7092,2453.5890,,0.0000,0.0000,0.0000
+4-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,,,,8427.7489,,8427.7489,,8427.7489,,8427.7489,,8427.7489,,,,,,,,0.0000,30.5705,8.5428,0.5740,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1367.6228,2453.5890,,0.0000,0.0000,0.0000
+4-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,,,,6526.0629,,6526.0629,,6526.0629,,6526.0629,,6526.0629,,,,,,,,0.0000,21.5508,0.9937,0.1371,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,1210.3733,2453.5890,,0.0000,0.0000,0.0000
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
index 26719e75b042168e5a08c26b20c3cf9c112e298c..9a85ef3a85e29235dbde772effb23c3c37ace0c4 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%]
-AuxWriteSumFile,MockJob,MockCycle.vdri,Pending,0,0.0000,0.0000,0.0000,226.1947,600.0000,1800.0000,0.0000,1.0000,0.0000,MT,0.0000,0.0000,1.0000,1.0000,None,0.0000,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,0.0000,0.0000
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%]
+AuxWriteSumFile,MockJob,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,100.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,0.0000,0.0000
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
index 291e3296ce5cf104b86c0a19d90c3840d571b514..9c5bc61c4efc159d53803a834cdf5d268f19c1b3 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
@@ -1,2 +1,2 @@
-Job [-],Input File [-],Cycle [-],Status,HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],CdxA [m²],weighed RRC [-],Transmission type [-],Gear ratio first gear [-],Gear ratio last gear [-],Axle gear ratio [-],r_dyn [m],Retarder type [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
-17-0,job,1-Gear-Test-dist.vdri,Success,0,15700.0000,3300.0000,19000.0000,350.5052,560.0000,1736.4865,12730.0000,3.2634,0.0064,AMT,6.3800,0.7600,3.2404,0.5200,TransmissionOutputRetarder,,4117.0081,16.8120,14.7008,-43.9640,3748.8752,255.0121,3748.8752,255.0121,3748.8752,255.0121,3748.8752,255.0121,3748.8752,255.0121,30.6505,9.2880,,805.8383,244.1934,,9.0668,14.2593,16.3071,2.1909,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0056,1.2154,4.8397,1.4516,1.9642,0.0835,0.2457,5.5710,-2.2714,0.0013,-0.3979,-0.3979,0.1828,0.1358,99.6328,0.0486,20.0000,1.3773,0.6427,716.9606,1562.0320,9.0000,0.0335,0.0000,0.0360,0.1739,0.0000,0.0000,0.0000,0.0000,0.2503,0.2494,47.8722,51.4543
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Chassis curb mass [kg],Loading [kg],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,CdxA [m²],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-AUXc [g/h],FC-AUXc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-AAUX [g/h],FC-AAUX [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],StopTimeShare [%],max. speed [km/h,max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
+17-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N.A.,0,15700.0000,3300.0000,19000.0000,N/A,Generic 24t Coach,Diesel CI,0.0000,560.0000,0.0000,12730.0000,1,1,1,0,1,1,3.2634,0.00640424928879442,0.00640424928879442,0.5200,N/A,Generic 24t Coach,AMT,6.3800,0.7600,n.a.,n.a.,N/A,N.A.,Secondary Retarder,N/A,N.A.,3.5,N/A,Generic 24t Coach,3.2404,,,,,,,,4117.5211,16.8120,14.6989,-43.9640,3744.2802,254.7313,3744.2802,254.7313,3744.2802,254.7313,3744.2802,254.7313,3744.2802,254.7313,30.6167,9.2778,,804.9509,243.9245,,9.0652,14.2586,16.3084,2.2015,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0036,1.2154,4.8399,1.4517,1.9666,0.0835,0.2358,5.5710,-2.2714,0.0013,1.0278,-0.4017,0.2058,0.1818,99.5638,0.0486,20.0000,1.3773,0.6427,715.8760,1661.7867,11.0000,0.0227,0.0000,0.0322,0.2225,0.0000,0.0000,0.0000,0.0000,0.1012,0.2393,47.8636,51.5734
diff --git a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
index 440e4e22eea6de06592173238233984fbec4fc09..c764eccacbf26bbd2b10523eaf12604b32f62583 100644
--- a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
@@ -31,6 +31,7 @@
using System.Data;
using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Tests.Utils
@@ -54,8 +55,14 @@ namespace TUGraz.VectoCore.Tests.Utils
public double WHTCRural { get; set; }
public double WHTCUrban { get; set; }
public double ColdHotBalancingFactor { get; set; }
+ public double CorrectionFactorRegPer { get; set; }
+ public double CorrectionFactorNCV { get; set; }
+ public FuelType FuelType { get; set; }
public TableData FuelConsumptionMap { get; set; }
public TableData FullLoadCurve { get; set; }
+ public Watt RatedPowerDeclared { get; set; }
+ public PerSecond RatedSpeedDeclared { get; set; }
+ public NewtonMeter MaxTorqueDeclared { get; set; }
public KilogramSquareMeter Inertia { get; set; }
public double WHTCEngineering { get; set; }
}