diff --git a/User Manual Source/material User Manual.pptx b/User Manual Source/material User Manual.pptx
index 227dec2db30828128ee0f5cb2448362df82a1631..a13c74eec7c424af5b0c528b318cf842902966c9 100644
Binary files a/User Manual Source/material User Manual.pptx and b/User Manual Source/material User Manual.pptx differ
diff --git a/User Manual/GUI/GBX-Editor.html b/User Manual/GUI/GBX-Editor.html
index 876d0eb5b8522c4f186743e14fab4a6068eac592..e92521613f4cda301c479debbae0f9d4ebecaa58 100644
--- a/User Manual/GUI/GBX-Editor.html
+++ b/User Manual/GUI/GBX-Editor.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html><head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gearbox Editor - VECTO User Manual</title></head>
-<body>
+
+<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Gearbox Editor - VECTO User Manual</title></head><body>
@@ -81,7 +81,12 @@ defined <span style="font-weight: bold;">torque reserve</span>.</div><br><br><bi
The Chart Area displays the <a href="../fileformat/VGBS.html">Shift Polygons Input File (.vgbs)</a> for the selected gear.<br><br><br><big><big style="font-weight: bold;">Torque Converter </big></big><br><hr style="height: 1px; width: 100%;">
-The <a href="../general/TC.html">Torque Converter Model</a> is still in development.<br><br><br><big><big style="font-weight: bold;">Controls</big></big><br><hr style="height: 1px; width: 100%;"><span style="font-weight: bold;"><img style="width: 16px; height: 16px;" alt="" src="../pics/icons/blue-document-icon.png"> New
+The <a href="../general/TC.html">Torque Converter Model</a> is still in development.<br><br>
+<span style="font-weight: bold;">Inertia</span> [kgm<sup>2</sup>]<br>
+<div style="margin-left: 40px;">Rotational inertia of the engine-side part of the torque converter. (Gearbox-side inertia is not considered in VECTO.)<br>
+</div>
+<br>
+<br><big><big style="font-weight: bold;">Controls</big></big><br><hr style="height: 1px; width: 100%;"><span style="font-weight: bold;"><img style="width: 16px; height: 16px;" alt="" src="../pics/icons/blue-document-icon.png"> New
file</span><br>
Create a new empty .vgbx
diff --git a/User Manual/GUI/pics/GBX-Editor.PNG b/User Manual/GUI/pics/GBX-Editor.PNG
index 6e06ceaf1f9a6e02917918f13f044b19c3f5b547..34da437c251661621d1c6673bd27726090a49163 100644
Binary files a/User Manual/GUI/pics/GBX-Editor.PNG and b/User Manual/GUI/pics/GBX-Editor.PNG differ
diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index 7eefd3d650193bd29efb703c148310d59424b140..b77fb373196678557c01adb1a6afd276b64b77fb 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -75,6 +75,7 @@ Partial Class F_ENG
Me.Label32 = New System.Windows.Forms.Label()
Me.PnInertia = New System.Windows.Forms.Panel()
Me.GrWHTC = New System.Windows.Forms.GroupBox()
+ Me.Label13 = New System.Windows.Forms.Label()
Me.TbWHTCmw = New System.Windows.Forms.TextBox()
Me.TbWHTCrural = New System.Windows.Forms.TextBox()
Me.TbWHTCurban = New System.Windows.Forms.TextBox()
@@ -85,7 +86,6 @@ Partial Class F_ENG
Me.Label7 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
Me.PicBox = New System.Windows.Forms.PictureBox()
- Me.Label13 = New System.Windows.Forms.Label()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -164,7 +164,7 @@ Partial Class F_ENG
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 12
- Me.ButOK.Text = "OK"
+ Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
'
'ToolStrip1
@@ -462,6 +462,15 @@ Partial Class F_ENG
Me.GrWHTC.TabStop = False
Me.GrWHTC.Text = "WHTC Test Results"
'
+ 'Label13
+ '
+ Me.Label13.AutoSize = True
+ Me.Label13.Location = New System.Drawing.Point(6, 27)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(91, 13)
+ Me.Label13.TabIndex = 3
+ Me.Label13.Text = "Fuel Consumption"
+ '
'TbWHTCmw
'
Me.TbWHTCmw.Location = New System.Drawing.Point(348, 56)
@@ -546,15 +555,6 @@ Partial Class F_ENG
Me.PicBox.TabIndex = 40
Me.PicBox.TabStop = False
'
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(6, 27)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(91, 13)
- Me.Label13.TabIndex = 3
- Me.Label13.Text = "Fuel Consumption"
- '
'F_ENG
'
Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 8d8a0cb1fb414b7db1e5d6b624bdeeacb329078f..783305eae6f3352b5c8dfc5dd70e9dbc6e9c0505 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -103,6 +103,9 @@ Partial Class F_GBX
Me.Label32 = New System.Windows.Forms.Label()
Me.PnInertiaTI = New System.Windows.Forms.Panel()
Me.PicBox = New System.Windows.Forms.PictureBox()
+ Me.TbTCinertia = New System.Windows.Forms.TextBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -230,7 +233,7 @@ Partial Class F_GBX
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 8
- Me.ButOK.Text = "OK"
+ Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
'
'TbTracInt
@@ -584,7 +587,10 @@ Partial Class F_GBX
'PnTC
'
Me.PnTC.Controls.Add(Me.Label17)
+ Me.PnTC.Controls.Add(Me.Label18)
Me.PnTC.Controls.Add(Me.Label15)
+ Me.PnTC.Controls.Add(Me.TbTCinertia)
+ Me.PnTC.Controls.Add(Me.Label1)
Me.PnTC.Controls.Add(Me.Label14)
Me.PnTC.Controls.Add(Me.BtTCfileBrowse)
Me.PnTC.Controls.Add(Me.TbTCfile)
@@ -608,11 +614,11 @@ Partial Class F_GBX
'
Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(71, 50)
+ Me.Label15.Location = New System.Drawing.Point(185, 50)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(191, 13)
+ Me.Label15.Size = New System.Drawing.Size(77, 13)
Me.Label15.TabIndex = 0
- Me.Label15.Text = "Reference rpm for torque characteristic"
+ Me.Label15.Text = "Reference rpm"
'
'Label14
'
@@ -746,6 +752,31 @@ Partial Class F_GBX
Me.PicBox.TabIndex = 48
Me.PicBox.TabStop = False
'
+ 'TbTCinertia
+ '
+ Me.TbTCinertia.Location = New System.Drawing.Point(47, 47)
+ Me.TbTCinertia.Name = "TbTCinertia"
+ Me.TbTCinertia.Size = New System.Drawing.Size(67, 20)
+ Me.TbTCinertia.TabIndex = 49
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(120, 50)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(36, 13)
+ Me.Label1.TabIndex = 2
+ Me.Label1.Text = "[kgm²]"
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(5, 50)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(36, 13)
+ Me.Label18.TabIndex = 2
+ Me.Label18.Text = "Inertia"
+ '
'F_GBX
'
Me.AcceptButton = Me.ButOK
@@ -867,4 +898,7 @@ Partial Class F_GBX
Friend WithEvents PnInertiaTI As System.Windows.Forms.Panel
Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
Friend WithEvents PicBox As System.Windows.Forms.PictureBox
+ Friend WithEvents TbTCinertia As System.Windows.Forms.TextBox
+ Friend WithEvents Label1 As System.Windows.Forms.Label
+ Friend WithEvents Label18 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index 4749726160e295d939802c6c4ce600a50ec61046..b04334821a2c5e642a445aa816ea6f1b786c4dd4 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -170,6 +170,7 @@ Public Class F_GBX
'Me.ChTCon.Checked = False 'set by CbGStype.SelectedIndexChanged
Me.TbTCfile.Text = ""
Me.TbTCrefrpm.Text = ""
+ Me.TbTCinertia.Text = ""
DeclInit()
@@ -241,6 +242,7 @@ Public Class F_GBX
Me.TbTCfile.Text = GBX0.TCfile(True)
Me.TbTCrefrpm.Text = GBX0.TCrefrpm
+ Me.TbTCinertia.Text = GBX0.TCinertia
If CType(GBX0.gs_Type, Integer) <= Me.CbGStype.Items.Count - 1 Then
Me.CbGStype.SelectedIndex = CType(GBX0.gs_Type, Integer)
@@ -310,7 +312,7 @@ Public Class F_GBX
GBX0.TCon = Me.ChTCon.Checked
GBX0.TCfile = Me.TbTCfile.Text
GBX0.TCrefrpm = fTextboxToNumString(Me.TbTCrefrpm.Text)
-
+ GBX0.TCinertia = fTextboxToNumString(Me.TbTCinertia.Text)
If Not GBX0.SaveFile Then
MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
@@ -416,6 +418,10 @@ Public Class F_GBX
Change()
End Sub
+ Private Sub TbTCinertia_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCinertia.TextChanged
+ Change()
+ End Sub
+
Private Sub CheckEnableTorqRes()
If Me.ChShiftInside.Checked Or Me.ChSkipGears.Checked Then
@@ -819,4 +825,5 @@ Public Class F_GBX
#End Region
+
End Class
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index ca18fdc68be482b6e22c6db0c4991fc8502defde..ce990fd895882a997dcb7da25c99ab433d99bbbf 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -820,7 +820,7 @@ Partial Class F_VECTO
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 11
- Me.ButOK.Text = "OK"
+ Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
'
'ButCancel
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index e7cb4259d22b377bae196433e63e8eefc3c53a11..590b3cbc9bc8eadedd12db980daacad30942d08a 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -107,6 +107,7 @@ Partial Class F_VEH
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.PnLoad = New System.Windows.Forms.Panel()
Me.GrAirRes = New System.Windows.Forms.GroupBox()
+ Me.PnCdATrTr = New System.Windows.Forms.Panel()
Me.LbCdATr = New System.Windows.Forms.Label()
Me.PnCdARig = New System.Windows.Forms.Panel()
Me.LbCdARig = New System.Windows.Forms.Label()
@@ -119,7 +120,6 @@ Partial Class F_VEH
Me.PnAll = New System.Windows.Forms.Panel()
Me.PicVehicle = New System.Windows.Forms.PictureBox()
Me.Label8 = New System.Windows.Forms.Label()
- Me.PnCdATrTr = New System.Windows.Forms.Panel()
Me.GroupBox6.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.GroupBox7.SuspendLayout()
@@ -130,12 +130,12 @@ Partial Class F_VEH
Me.GroupBox1.SuspendLayout()
Me.PnLoad.SuspendLayout()
Me.GrAirRes.SuspendLayout()
+ Me.PnCdATrTr.SuspendLayout()
Me.PnCdARig.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.CmOpenFile.SuspendLayout()
Me.PnAll.SuspendLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.PnCdATrTr.SuspendLayout()
Me.SuspendLayout()
'
'Label1
@@ -229,7 +229,7 @@ Partial Class F_VEH
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 9
- Me.ButOK.Text = "OK"
+ Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
'
'ButCancel
@@ -806,6 +806,16 @@ Partial Class F_VEH
Me.GrAirRes.TabStop = False
Me.GrAirRes.Text = "Air Resistance"
'
+ 'PnCdATrTr
+ '
+ Me.PnCdATrTr.Controls.Add(Me.LbCdATr)
+ Me.PnCdATrTr.Controls.Add(Me.TBcdTrTr)
+ Me.PnCdATrTr.Controls.Add(Me.TBAquersTrTr)
+ Me.PnCdATrTr.Location = New System.Drawing.Point(97, 26)
+ Me.PnCdATrTr.Name = "PnCdATrTr"
+ Me.PnCdATrTr.Size = New System.Drawing.Size(64, 78)
+ Me.PnCdATrTr.TabIndex = 27
+ '
'LbCdATr
'
Me.LbCdATr.AutoSize = True
@@ -907,16 +917,6 @@ Partial Class F_VEH
Me.Label8.TabIndex = 40
Me.Label8.Text = "HDV Class"
'
- 'PnCdATrTr
- '
- Me.PnCdATrTr.Controls.Add(Me.LbCdATr)
- Me.PnCdATrTr.Controls.Add(Me.TBcdTrTr)
- Me.PnCdATrTr.Controls.Add(Me.TBAquersTrTr)
- Me.PnCdATrTr.Location = New System.Drawing.Point(97, 26)
- Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(64, 78)
- Me.PnCdATrTr.TabIndex = 27
- '
'F_VEH
'
Me.AcceptButton = Me.ButOK
@@ -964,14 +964,14 @@ Partial Class F_VEH
Me.PnLoad.PerformLayout()
Me.GrAirRes.ResumeLayout(False)
Me.GrAirRes.PerformLayout()
+ Me.PnCdATrTr.ResumeLayout(False)
+ Me.PnCdATrTr.PerformLayout()
Me.PnCdARig.ResumeLayout(False)
Me.PnCdARig.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.CmOpenFile.ResumeLayout(False)
Me.PnAll.ResumeLayout(False)
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
- Me.PnCdATrTr.ResumeLayout(False)
- Me.PnCdATrTr.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index f1abf2bae44b30464d2bb9326a459684b5bdcf83..53e963f8e59af55b4d6c30f9f329c45f7e4e1447 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -12,7 +12,7 @@ Imports System.Collections.Generic
Public Class cGBX
- Private Const FormatVersion As Short = 2
+ Private Const FormatVersion As Short = 3
Private FileVersion As Short
Private MyPath As String
@@ -49,6 +49,7 @@ Public Class cGBX
Public TCon As Boolean
Public TCrefrpm As Single
Private TC_file As New cSubPath
+ Public TCinertia As Single
Private TCnu As New List(Of Single)
@@ -133,6 +134,8 @@ Public Class cGBX
TCrefrpm = 0
TC_file.Clear()
+ TCinertia = 0
+
End Sub
Public Function SaveFile() As Boolean
@@ -191,6 +194,7 @@ Public Class cGBX
dic0.Add("Enabled", TCon)
dic0.Add("File", TC_file.PathOrDummy)
dic0.Add("RefRPM", TCrefrpm)
+ dic0.Add("Inertia", TCinertia)
dic.Add("TorqueConverter", dic0)
JSON.Content.Add("Body", dic)
@@ -265,6 +269,7 @@ Public Class cGBX
TCon = JSON.Content("Body")("TorqueConverter")("Enabled")
TC_file.Init(MyPath, JSON.Content("Body")("TorqueConverter")("File"))
TCrefrpm = JSON.Content("Body")("TorqueConverter")("RefRPM")
+ If FileVersion > 2 Then TCinertia = JSON.Content("Body")("TorqueConverter")("Inertia")
End If
Catch ex As Exception
@@ -477,7 +482,7 @@ Public Class cGBX
If LastnU Is Nothing Then
PaMot = 0
Else
- PaMot = (ENG.I_mot * (nUin - LastnU) * 0.01096 * nUin) * 0.001
+ PaMot = MODdata.Px.fPaMot(nUin, LastnU)
End If
If LastPe Is Nothing Then
Pfull = FLD(Gear).Pfull(nUin)
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 53efc2745f093afe4919377c3ddf08a1eaea9665..6d7dd741b5e23adb48bd71b3d0d26d890b945244 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -208,7 +208,7 @@ Public Class cPower
If i = 0 Then
PaMot = 0
Else
- PaMot = (ENG.I_mot * (nU - LastnU) * 0.01096 * nU) * 0.001
+ PaMot = fPaMot(nU, LastnU)
End If
'Aux Demand
@@ -925,7 +925,7 @@ lb_nOK:
PaMot = 0
Else
'Not optimal since jz-1 to jz not the right interval
- PaMot = (ENG.I_mot * (nU - MODdata.nU(jz - 1)) * 0.01096 * nU) * 0.001
+ PaMot = fPaMot(nU, MODdata.nU(jz - 1))
End If
@@ -2149,11 +2149,10 @@ lb10:
If t = 0 Then
PaM = 0
Else
- PaM = (ENG.I_mot * (nU - MODdata.nU(t - 1)) * 0.01096 * nU) * 0.001
+ PaM = fPaMot(nU, MODdata.nU(t - 1))
End If
-
If Clutch = tEngClutch.Closed Then
Return (PvD + fPlossGB(PvD, V, Gear, True) + fPlossDiff(PvD, V, True) + fPaG(V, a) + fPaux(t, nU) + PaM)
Else 'Clutch = tEngClutch.Slipping
@@ -2244,6 +2243,14 @@ lb10:
Return ((ENG.I_mot * (GBX.Igetr(0) * GBX.Igetr(Gear) / (VEH.rdyn / 1000)) ^ 2) * a * v) * 0.001
End Function
+ Public Function fPaMot(ByVal nU As Single, ByVal nUBefore As Single) As Single
+ If GBX.TCon Then
+ Return ((ENG.I_mot + GBX.TCinertia) * (nU - nUBefore) * 0.01096 * nU) * 0.001
+ Else
+ Return (ENG.I_mot * (nU - nUBefore) * 0.01096 * nU) * 0.001
+ End If
+ End Function
+
'----------------Slope resistance ----------------
Private Function fPs(ByVal v As Single, ByVal Grad As Single) As Single
Return CSng(((VEH.Loading + VEH.Mass + VEH.MassExtra) * 9.81 * Math.Sin(Math.Atan(Grad * 0.01)) * v) * 0.001)
@@ -2325,8 +2332,8 @@ lb10:
'----------------Gearbox inertia ----------------
Private Function fPaG(ByVal V As Single, ByVal a As Single) As Single
Dim Mred As Single
- Mred = CSng(GBX.I_Getriebe * (GBX.Igetr(0) / (VEH.rdyn / 1000)) ^ 2)
- Return CSng((Mred * a * V) * 0.001)
+ Mred = GBX.I_Getriebe * (GBX.Igetr(0) / (VEH.rdyn / 1000)) ^ 2
+ Return (Mred * a * V) * 0.001
End Function
#End Region
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index b617b0065ada911e1814ef4f27323229c24cad1f..006334405c3793a3b3b710153dce19f485ad9450 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -12,7 +12,7 @@ Imports System.Collections.Generic
Module VECTO_Global
- Public Const VECTOvers As String = "2.0.2-beta2"
+ Public Const VECTOvers As String = "2.0.3-beta0"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String