diff --git a/VECTO Changelog.txt b/VECTO Changelog.txt
index 4465322357033f0a6d4a21d33a54c14bf36d49b7..e7623d5965d9b3ff73ffcc036069272a35389d61 100644
--- a/VECTO Changelog.txt
+++ b/VECTO Changelog.txt
@@ -1,16 +1,20 @@
VECTO ?.? (future release)
- Automatic transmission & Torque converter
- Eco-Roll & Over-/Under-Speed
-- Engine Only Mode
+
VECTO 1.1 x (current source - next release)
+
+
+
+VECTO 1.1 beta 2 - 01.03.2013
- Corrected comment line for wheels inertia and axle config in .vveh file
- Changed RRC unit in GUI from [-] to [N/N]
- User Manual updated
o Vehicle Editor: RRC
- Tranmission Loss Maps are not converted to n,Pe-Maps anymore. Should fix non-linear interpolation effects.
- Automatic Transmission / Torque Converter in development
-
+- Engine Only Mode
VECTO 1.1 beta - 06.02.2013
- New independent licensing dll replaces TUG's version
diff --git a/VECTO/GUI/F_GEN.Designer.vb b/VECTO/GUI/F_GEN.Designer.vb
index 0461ccc5d553381f178862be65202c11e4b66917..f3f9585713e1d10f2179f61b4ec34f7348504196 100644
--- a/VECTO/GUI/F_GEN.Designer.vb
+++ b/VECTO/GUI/F_GEN.Designer.vb
@@ -79,7 +79,7 @@ Partial Class F_GEN
Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.BtDRIrem = New System.Windows.Forms.Button()
Me.BtDRIadd = New System.Windows.Forms.Button()
- Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.GrAux = New System.Windows.Forms.GroupBox()
Me.LvAux = New System.Windows.Forms.ListView()
Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
@@ -93,7 +93,7 @@ Partial Class F_GEN
Me.ButOpenENG = New System.Windows.Forms.Button()
Me.ButOpenVEH = New System.Windows.Forms.Button()
Me.ButtonVEH = New System.Windows.Forms.Button()
- Me.ButtonFLD = New System.Windows.Forms.Button()
+ Me.ButtonGBX = New System.Windows.Forms.Button()
Me.ButtonMAP = New System.Windows.Forms.Button()
Me.Label11 = New System.Windows.Forms.Label()
Me.CbTransLossModel = New System.Windows.Forms.ComboBox()
@@ -132,6 +132,21 @@ Partial Class F_GEN
Me.TBSStime = New System.Windows.Forms.TextBox()
Me.TBSSspeed = New System.Windows.Forms.TextBox()
Me.TabPgTEST = New System.Windows.Forms.TabPage()
+ Me.GrGearShift = New System.Windows.Forms.GroupBox()
+ Me.TBpfast = New System.Windows.Forms.TextBox()
+ Me.TBpspar = New System.Windows.Forms.TextBox()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label44 = New System.Windows.Forms.Label()
+ Me.Label43 = New System.Windows.Forms.Label()
+ Me.Label42 = New System.Windows.Forms.Label()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.TBlhinunter = New System.Windows.Forms.TextBox()
+ Me.TBlhinauf = New System.Windows.Forms.TextBox()
+ Me.TBhinunter = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.TBhinauf = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.ChbDesMax = New System.Windows.Forms.CheckBox()
Me.CbVehMode = New System.Windows.Forms.ComboBox()
@@ -154,27 +169,13 @@ Partial Class F_GEN
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.GrGearShift = New System.Windows.Forms.GroupBox()
- Me.TBpfast = New System.Windows.Forms.TextBox()
- Me.TBpspar = New System.Windows.Forms.TextBox()
- Me.Label19 = New System.Windows.Forms.Label()
- Me.Label18 = New System.Windows.Forms.Label()
- Me.Label44 = New System.Windows.Forms.Label()
- Me.Label43 = New System.Windows.Forms.Label()
- Me.Label42 = New System.Windows.Forms.Label()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.TBlhinunter = New System.Windows.Forms.TextBox()
- Me.TBlhinauf = New System.Windows.Forms.TextBox()
- Me.TBhinunter = New System.Windows.Forms.TextBox()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.Label15 = New System.Windows.Forms.Label()
- Me.TBhinauf = New System.Windows.Forms.TextBox()
+ Me.CbEngOnly = New System.Windows.Forms.CheckBox()
Me.TabPgHEV.SuspendLayout()
Me.TabPgColdSt.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.TabPgGen.SuspendLayout()
Me.GroupBox5.SuspendLayout()
- Me.GroupBox4.SuspendLayout()
+ Me.GrAux.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPgDriver.SuspendLayout()
Me.TabPgKF.SuspendLayout()
@@ -182,10 +183,10 @@ Partial Class F_GEN
Me.TabPgStartStop.SuspendLayout()
Me.GroupBoxStartStop.SuspendLayout()
Me.TabPgTEST.SuspendLayout()
+ Me.GrGearShift.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.GrGearShift.SuspendLayout()
Me.SuspendLayout()
'
'ButOpenEXS
@@ -724,7 +725,7 @@ Partial Class F_GEN
'TabPgGen
'
Me.TabPgGen.Controls.Add(Me.GroupBox5)
- Me.TabPgGen.Controls.Add(Me.GroupBox4)
+ Me.TabPgGen.Controls.Add(Me.GrAux)
Me.TabPgGen.Controls.Add(Me.TbGBX)
Me.TabPgGen.Controls.Add(Me.TbENG)
Me.TabPgGen.Controls.Add(Me.TextBoxVEH)
@@ -732,12 +733,12 @@ Partial Class F_GEN
Me.TabPgGen.Controls.Add(Me.ButOpenENG)
Me.TabPgGen.Controls.Add(Me.ButOpenVEH)
Me.TabPgGen.Controls.Add(Me.ButtonVEH)
- Me.TabPgGen.Controls.Add(Me.ButtonFLD)
+ Me.TabPgGen.Controls.Add(Me.ButtonGBX)
Me.TabPgGen.Controls.Add(Me.ButtonMAP)
Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
Me.TabPgGen.Name = "TabPgGen"
Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgGen.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgGen.Size = New System.Drawing.Size(646, 442)
Me.TabPgGen.TabIndex = 0
Me.TabPgGen.Text = "General"
Me.TabPgGen.UseVisualStyleBackColor = True
@@ -747,7 +748,7 @@ Partial Class F_GEN
Me.GroupBox5.Controls.Add(Me.LvCycles)
Me.GroupBox5.Controls.Add(Me.BtDRIrem)
Me.GroupBox5.Controls.Add(Me.BtDRIadd)
- Me.GroupBox5.Location = New System.Drawing.Point(6, 250)
+ Me.GroupBox5.Location = New System.Drawing.Point(6, 247)
Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(634, 177)
Me.GroupBox5.TabIndex = 34
@@ -796,17 +797,17 @@ Partial Class F_GEN
Me.BtDRIadd.TabIndex = 31
Me.BtDRIadd.UseVisualStyleBackColor = True
'
- 'GroupBox4
+ 'GrAux
'
- Me.GroupBox4.Controls.Add(Me.LvAux)
- Me.GroupBox4.Controls.Add(Me.ButAuxRem)
- Me.GroupBox4.Controls.Add(Me.ButAuxAdd)
- Me.GroupBox4.Location = New System.Drawing.Point(6, 90)
- Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(634, 154)
- Me.GroupBox4.TabIndex = 33
- Me.GroupBox4.TabStop = False
- Me.GroupBox4.Text = "Auxiliaries"
+ Me.GrAux.Controls.Add(Me.LvAux)
+ Me.GrAux.Controls.Add(Me.ButAuxRem)
+ Me.GrAux.Controls.Add(Me.ButAuxAdd)
+ Me.GrAux.Location = New System.Drawing.Point(6, 87)
+ Me.GrAux.Name = "GrAux"
+ Me.GrAux.Size = New System.Drawing.Size(634, 154)
+ Me.GrAux.TabIndex = 33
+ Me.GrAux.TabStop = False
+ Me.GrAux.Text = "Auxiliaries"
'
'LvAux
'
@@ -864,7 +865,7 @@ Partial Class F_GEN
'
Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbGBX.Location = New System.Drawing.Point(81, 63)
+ Me.TbGBX.Location = New System.Drawing.Point(84, 60)
Me.TbGBX.Name = "TbGBX"
Me.TbGBX.Size = New System.Drawing.Size(525, 20)
Me.TbGBX.TabIndex = 3
@@ -873,7 +874,7 @@ Partial Class F_GEN
'
Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbENG.Location = New System.Drawing.Point(81, 36)
+ Me.TbENG.Location = New System.Drawing.Point(84, 33)
Me.TbENG.Name = "TbENG"
Me.TbENG.Size = New System.Drawing.Size(525, 20)
Me.TbENG.TabIndex = 2
@@ -882,14 +883,14 @@ Partial Class F_GEN
'
Me.TextBoxVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TextBoxVEH.Location = New System.Drawing.Point(81, 10)
+ Me.TextBoxVEH.Location = New System.Drawing.Point(84, 7)
Me.TextBoxVEH.Name = "TextBoxVEH"
Me.TextBoxVEH.Size = New System.Drawing.Size(525, 20)
Me.TextBoxVEH.TabIndex = 1
'
'ButOpenGBX
'
- Me.ButOpenGBX.Location = New System.Drawing.Point(3, 63)
+ Me.ButOpenGBX.Location = New System.Drawing.Point(6, 60)
Me.ButOpenGBX.Name = "ButOpenGBX"
Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
Me.ButOpenGBX.TabIndex = 22
@@ -899,7 +900,7 @@ Partial Class F_GEN
'
'ButOpenENG
'
- Me.ButOpenENG.Location = New System.Drawing.Point(3, 36)
+ Me.ButOpenENG.Location = New System.Drawing.Point(6, 33)
Me.ButOpenENG.Name = "ButOpenENG"
Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
Me.ButOpenENG.TabIndex = 21
@@ -909,7 +910,7 @@ Partial Class F_GEN
'
'ButOpenVEH
'
- Me.ButOpenVEH.Location = New System.Drawing.Point(3, 9)
+ Me.ButOpenVEH.Location = New System.Drawing.Point(6, 6)
Me.ButOpenVEH.Name = "ButOpenVEH"
Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
Me.ButOpenVEH.TabIndex = 20
@@ -920,7 +921,7 @@ Partial Class F_GEN
'ButtonVEH
'
Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonVEH.Location = New System.Drawing.Point(612, 9)
+ Me.ButtonVEH.Location = New System.Drawing.Point(615, 6)
Me.ButtonVEH.Name = "ButtonVEH"
Me.ButtonVEH.Size = New System.Drawing.Size(28, 21)
Me.ButtonVEH.TabIndex = 11
@@ -928,21 +929,21 @@ Partial Class F_GEN
Me.ButtonVEH.Text = "..."
Me.ButtonVEH.UseVisualStyleBackColor = True
'
- 'ButtonFLD
+ 'ButtonGBX
'
- Me.ButtonFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonFLD.Location = New System.Drawing.Point(612, 63)
- Me.ButtonFLD.Name = "ButtonFLD"
- Me.ButtonFLD.Size = New System.Drawing.Size(28, 21)
- Me.ButtonFLD.TabIndex = 13
- Me.ButtonFLD.TabStop = False
- Me.ButtonFLD.Text = "..."
- Me.ButtonFLD.UseVisualStyleBackColor = True
+ Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGBX.Location = New System.Drawing.Point(615, 60)
+ Me.ButtonGBX.Name = "ButtonGBX"
+ Me.ButtonGBX.Size = New System.Drawing.Size(28, 21)
+ Me.ButtonGBX.TabIndex = 13
+ Me.ButtonGBX.TabStop = False
+ Me.ButtonGBX.Text = "..."
+ Me.ButtonGBX.UseVisualStyleBackColor = True
'
'ButtonMAP
'
Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonMAP.Location = New System.Drawing.Point(612, 36)
+ Me.ButtonMAP.Location = New System.Drawing.Point(615, 33)
Me.ButtonMAP.Name = "ButtonMAP"
Me.ButtonMAP.Size = New System.Drawing.Size(28, 21)
Me.ButtonMAP.TabIndex = 12
@@ -1073,10 +1074,10 @@ Partial Class F_GEN
Me.TabControl1.Controls.Add(Me.TabPgKF)
Me.TabControl1.Controls.Add(Me.TabPgStartStop)
Me.TabControl1.Controls.Add(Me.TabPgTEST)
- Me.TabControl1.Location = New System.Drawing.Point(4, 74)
+ Me.TabControl1.Location = New System.Drawing.Point(1, 107)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(654, 459)
+ Me.TabControl1.Size = New System.Drawing.Size(654, 468)
Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
Me.TabControl1.TabIndex = 1
'
@@ -1088,7 +1089,7 @@ Partial Class F_GEN
Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
Me.TabPgDriver.Name = "TabPgDriver"
Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgDriver.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgDriver.Size = New System.Drawing.Size(646, 442)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver"
Me.TabPgDriver.UseVisualStyleBackColor = True
@@ -1355,6 +1356,143 @@ Partial Class F_GEN
Me.TabPgTEST.Text = "TEST"
Me.TabPgTEST.UseVisualStyleBackColor = True
'
+ 'GrGearShift
+ '
+ Me.GrGearShift.Controls.Add(Me.TBpfast)
+ Me.GrGearShift.Controls.Add(Me.TBpspar)
+ Me.GrGearShift.Controls.Add(Me.Label19)
+ Me.GrGearShift.Controls.Add(Me.Label18)
+ Me.GrGearShift.Controls.Add(Me.Label44)
+ Me.GrGearShift.Controls.Add(Me.Label43)
+ Me.GrGearShift.Controls.Add(Me.Label42)
+ Me.GrGearShift.Controls.Add(Me.Label17)
+ Me.GrGearShift.Controls.Add(Me.TBlhinunter)
+ Me.GrGearShift.Controls.Add(Me.TBlhinauf)
+ Me.GrGearShift.Controls.Add(Me.TBhinunter)
+ Me.GrGearShift.Controls.Add(Me.Label16)
+ Me.GrGearShift.Controls.Add(Me.Label15)
+ Me.GrGearShift.Controls.Add(Me.TBhinauf)
+ Me.GrGearShift.Location = New System.Drawing.Point(19, 277)
+ Me.GrGearShift.Name = "GrGearShift"
+ Me.GrGearShift.Size = New System.Drawing.Size(183, 128)
+ Me.GrGearShift.TabIndex = 34
+ Me.GrGearShift.TabStop = False
+ Me.GrGearShift.Text = "Gear Shift Parameters"
+ '
+ 'TBpfast
+ '
+ Me.TBpfast.Location = New System.Drawing.Point(69, 90)
+ Me.TBpfast.Name = "TBpfast"
+ Me.TBpfast.Size = New System.Drawing.Size(40, 20)
+ Me.TBpfast.TabIndex = 4
+ '
+ 'TBpspar
+ '
+ Me.TBpspar.Location = New System.Drawing.Point(115, 90)
+ Me.TBpspar.Name = "TBpspar"
+ Me.TBpspar.Size = New System.Drawing.Size(40, 20)
+ Me.TBpspar.TabIndex = 5
+ '
+ 'Label19
+ '
+ Me.Label19.AutoSize = True
+ Me.Label19.Location = New System.Drawing.Point(28, 93)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(35, 13)
+ Me.Label19.TabIndex = 8
+ Me.Label19.Text = "Share"
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(121, 18)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(25, 13)
+ Me.Label18.TabIndex = 7
+ Me.Label18.Text = "eco"
+ '
+ 'Label44
+ '
+ Me.Label44.AutoSize = True
+ Me.Label44.Location = New System.Drawing.Point(161, 92)
+ Me.Label44.Name = "Label44"
+ Me.Label44.Size = New System.Drawing.Size(16, 13)
+ Me.Label44.TabIndex = 5
+ Me.Label44.Text = "[-]"
+ '
+ 'Label43
+ '
+ Me.Label43.AutoSize = True
+ Me.Label43.Location = New System.Drawing.Point(161, 66)
+ Me.Label43.Name = "Label43"
+ Me.Label43.Size = New System.Drawing.Size(16, 13)
+ Me.Label43.TabIndex = 5
+ Me.Label43.Text = "[-]"
+ '
+ 'Label42
+ '
+ Me.Label42.AutoSize = True
+ Me.Label42.Location = New System.Drawing.Point(161, 41)
+ Me.Label42.Name = "Label42"
+ Me.Label42.Size = New System.Drawing.Size(16, 13)
+ Me.Label42.TabIndex = 5
+ Me.Label42.Text = "[-]"
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(76, 18)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(24, 13)
+ Me.Label17.TabIndex = 6
+ Me.Label17.Text = "fast"
+ '
+ 'TBlhinunter
+ '
+ Me.TBlhinunter.Location = New System.Drawing.Point(115, 64)
+ Me.TBlhinunter.Name = "TBlhinunter"
+ Me.TBlhinunter.Size = New System.Drawing.Size(40, 20)
+ Me.TBlhinunter.TabIndex = 3
+ '
+ 'TBlhinauf
+ '
+ Me.TBlhinauf.Location = New System.Drawing.Point(115, 38)
+ Me.TBlhinauf.Name = "TBlhinauf"
+ Me.TBlhinauf.Size = New System.Drawing.Size(40, 20)
+ Me.TBlhinauf.TabIndex = 1
+ '
+ 'TBhinunter
+ '
+ Me.TBhinunter.Location = New System.Drawing.Point(69, 64)
+ Me.TBhinunter.Name = "TBhinunter"
+ Me.TBhinunter.Size = New System.Drawing.Size(40, 20)
+ Me.TBhinunter.TabIndex = 2
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Location = New System.Drawing.Point(4, 67)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(59, 13)
+ Me.Label16.TabIndex = 2
+ Me.Label16.Text = "Shift Down"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Location = New System.Drawing.Point(18, 41)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(45, 13)
+ Me.Label15.TabIndex = 1
+ Me.Label15.Text = "Shift Up"
+ '
+ 'TBhinauf
+ '
+ Me.TBhinauf.Location = New System.Drawing.Point(69, 38)
+ Me.TBhinauf.Name = "TBhinauf"
+ Me.TBhinauf.Size = New System.Drawing.Size(40, 20)
+ Me.TBhinauf.TabIndex = 0
+ '
'Label3
'
Me.Label3.AutoSize = True
@@ -1439,7 +1577,7 @@ Partial Class F_GEN
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 565)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 612)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(667, 22)
Me.StatusStrip1.SizingGrip = False
@@ -1455,7 +1593,7 @@ Partial Class F_GEN
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(502, 539)
+ Me.ButOK.Location = New System.Drawing.Point(502, 586)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 11
@@ -1466,7 +1604,7 @@ Partial Class F_GEN
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(583, 539)
+ Me.ButCancel.Location = New System.Drawing.Point(583, 586)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 19
@@ -1562,142 +1700,15 @@ Partial Class F_GEN
Me.PictureBox1.TabIndex = 21
Me.PictureBox1.TabStop = False
'
- 'GrGearShift
- '
- Me.GrGearShift.Controls.Add(Me.TBpfast)
- Me.GrGearShift.Controls.Add(Me.TBpspar)
- Me.GrGearShift.Controls.Add(Me.Label19)
- Me.GrGearShift.Controls.Add(Me.Label18)
- Me.GrGearShift.Controls.Add(Me.Label44)
- Me.GrGearShift.Controls.Add(Me.Label43)
- Me.GrGearShift.Controls.Add(Me.Label42)
- Me.GrGearShift.Controls.Add(Me.Label17)
- Me.GrGearShift.Controls.Add(Me.TBlhinunter)
- Me.GrGearShift.Controls.Add(Me.TBlhinauf)
- Me.GrGearShift.Controls.Add(Me.TBhinunter)
- Me.GrGearShift.Controls.Add(Me.Label16)
- Me.GrGearShift.Controls.Add(Me.Label15)
- Me.GrGearShift.Controls.Add(Me.TBhinauf)
- Me.GrGearShift.Location = New System.Drawing.Point(19, 277)
- Me.GrGearShift.Name = "GrGearShift"
- Me.GrGearShift.Size = New System.Drawing.Size(183, 128)
- Me.GrGearShift.TabIndex = 34
- Me.GrGearShift.TabStop = False
- Me.GrGearShift.Text = "Gear Shift Parameters"
- '
- 'TBpfast
- '
- Me.TBpfast.Location = New System.Drawing.Point(69, 90)
- Me.TBpfast.Name = "TBpfast"
- Me.TBpfast.Size = New System.Drawing.Size(40, 20)
- Me.TBpfast.TabIndex = 4
- '
- 'TBpspar
- '
- Me.TBpspar.Location = New System.Drawing.Point(115, 90)
- Me.TBpspar.Name = "TBpspar"
- Me.TBpspar.Size = New System.Drawing.Size(40, 20)
- Me.TBpspar.TabIndex = 5
- '
- 'Label19
- '
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(28, 93)
- Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(35, 13)
- Me.Label19.TabIndex = 8
- Me.Label19.Text = "Share"
- '
- 'Label18
- '
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(121, 18)
- Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(25, 13)
- Me.Label18.TabIndex = 7
- Me.Label18.Text = "eco"
- '
- 'Label44
- '
- Me.Label44.AutoSize = True
- Me.Label44.Location = New System.Drawing.Point(161, 92)
- Me.Label44.Name = "Label44"
- Me.Label44.Size = New System.Drawing.Size(16, 13)
- Me.Label44.TabIndex = 5
- Me.Label44.Text = "[-]"
- '
- 'Label43
- '
- Me.Label43.AutoSize = True
- Me.Label43.Location = New System.Drawing.Point(161, 66)
- Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(16, 13)
- Me.Label43.TabIndex = 5
- Me.Label43.Text = "[-]"
- '
- 'Label42
- '
- Me.Label42.AutoSize = True
- Me.Label42.Location = New System.Drawing.Point(161, 41)
- Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(16, 13)
- Me.Label42.TabIndex = 5
- Me.Label42.Text = "[-]"
+ 'CbEngOnly
'
- 'Label17
- '
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(76, 18)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(24, 13)
- Me.Label17.TabIndex = 6
- Me.Label17.Text = "fast"
- '
- 'TBlhinunter
- '
- Me.TBlhinunter.Location = New System.Drawing.Point(115, 64)
- Me.TBlhinunter.Name = "TBlhinunter"
- Me.TBlhinunter.Size = New System.Drawing.Size(40, 20)
- Me.TBlhinunter.TabIndex = 3
- '
- 'TBlhinauf
- '
- Me.TBlhinauf.Location = New System.Drawing.Point(115, 38)
- Me.TBlhinauf.Name = "TBlhinauf"
- Me.TBlhinauf.Size = New System.Drawing.Size(40, 20)
- Me.TBlhinauf.TabIndex = 1
- '
- 'TBhinunter
- '
- Me.TBhinunter.Location = New System.Drawing.Point(69, 64)
- Me.TBhinunter.Name = "TBhinunter"
- Me.TBhinunter.Size = New System.Drawing.Size(40, 20)
- Me.TBhinunter.TabIndex = 2
- '
- 'Label16
- '
- Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(4, 67)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(59, 13)
- Me.Label16.TabIndex = 2
- Me.Label16.Text = "Shift Down"
- '
- 'Label15
- '
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(18, 41)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(45, 13)
- Me.Label15.TabIndex = 1
- Me.Label15.Text = "Shift Up"
- '
- 'TBhinauf
- '
- Me.TBhinauf.Location = New System.Drawing.Point(69, 38)
- Me.TBhinauf.Name = "TBhinauf"
- Me.TBhinauf.Size = New System.Drawing.Size(40, 20)
- Me.TBhinauf.TabIndex = 0
+ Me.CbEngOnly.AutoSize = True
+ Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
+ Me.CbEngOnly.Name = "CbEngOnly"
+ Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
+ Me.CbEngOnly.TabIndex = 35
+ Me.CbEngOnly.Text = "Engine Only Mode"
+ Me.CbEngOnly.UseVisualStyleBackColor = True
'
'F_GEN
'
@@ -1705,7 +1716,8 @@ Partial Class F_GEN
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(667, 587)
+ Me.ClientSize = New System.Drawing.Size(667, 634)
+ Me.Controls.Add(Me.CbEngOnly)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.ButCancel)
@@ -1727,7 +1739,7 @@ Partial Class F_GEN
Me.TabPgGen.ResumeLayout(False)
Me.TabPgGen.PerformLayout()
Me.GroupBox5.ResumeLayout(False)
- Me.GroupBox4.ResumeLayout(False)
+ Me.GrAux.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPgDriver.ResumeLayout(False)
Me.TabPgDriver.PerformLayout()
@@ -1739,13 +1751,13 @@ Partial Class F_GEN
Me.GroupBoxStartStop.PerformLayout()
Me.TabPgTEST.ResumeLayout(False)
Me.TabPgTEST.PerformLayout()
+ Me.GrGearShift.ResumeLayout(False)
+ Me.GrGearShift.PerformLayout()
Me.StatusStrip1.ResumeLayout(False)
Me.StatusStrip1.PerformLayout()
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.GrGearShift.ResumeLayout(False)
- Me.GrGearShift.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1779,7 +1791,7 @@ Partial Class F_GEN
Friend WithEvents CheckBoxSCR As System.Windows.Forms.CheckBox
Friend WithEvents ButtonVEH As System.Windows.Forms.Button
Friend WithEvents ButtonMAP As System.Windows.Forms.Button
- Friend WithEvents ButtonFLD As System.Windows.Forms.Button
+ Friend WithEvents ButtonGBX As System.Windows.Forms.Button
Friend WithEvents ButtonTRS As System.Windows.Forms.Button
Friend WithEvents ButtonMAA As System.Windows.Forms.Button
Friend WithEvents ButtonCDW As System.Windows.Forms.Button
@@ -1862,7 +1874,7 @@ Partial Class F_GEN
Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents TabPgTEST As System.Windows.Forms.TabPage
Friend WithEvents Label3 As System.Windows.Forms.Label
- Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox
+ Friend WithEvents GrAux As System.Windows.Forms.GroupBox
Friend WithEvents LvAux As System.Windows.Forms.ListView
Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader
Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
@@ -1896,4 +1908,5 @@ Partial Class F_GEN
Friend WithEvents Label16 As System.Windows.Forms.Label
Friend WithEvents Label15 As System.Windows.Forms.Label
Friend WithEvents TBhinauf As System.Windows.Forms.TextBox
+ Friend WithEvents CbEngOnly As System.Windows.Forms.CheckBox
End Class
diff --git a/VECTO/GUI/F_GEN.vb b/VECTO/GUI/F_GEN.vb
index f1e8dd4abee9923d85461bef95d93622edf01ad2..7ab9c8a10484bf050fcb84c9f7c2b56c379b4108 100644
--- a/VECTO/GUI/F_GEN.vb
+++ b/VECTO/GUI/F_GEN.vb
@@ -11,12 +11,14 @@ Public Class F_GEN
Private pgMapCr As TabPage
Private pgStStop As TabPage
Private pgTest As TabPage
+ Private pgDriver As TabPage
Private pgColdStON As Boolean = True
Private pgHevON As Boolean = True
Private pgMapCrON As Boolean = True
Private pgStStopON As Boolean = True
Private pgTestON As Boolean = True
+ Private pgDriverON As Boolean = True
Private MyVehMode As tVehMode
@@ -39,6 +41,7 @@ Public Class F_GEN
pgMapCr = Me.TabPgKF
pgStStop = Me.TabPgStartStop
pgTest = Me.TabPgTEST
+ pgDriver = Me.TabPgDriver
MyVehMode = tVehMode.StandardMode
@@ -273,6 +276,21 @@ Public Class F_GEN
End If
End If
End Sub
+
+ Private Sub SetDrivertab(ByVal OnOff As Boolean)
+ If OnOff Then
+ If Not pgDriverON Then
+ pgDriverON = True
+ Me.TabControl1.TabPages.Insert(1, pgDriver)
+ End If
+ Else
+ If pgDriverON Then
+ pgDriverON = False
+ Me.TabControl1.Controls.Remove(pgDriver)
+ End If
+ End If
+ End Sub
+
#End Region
#Region "Browse Buttons"
@@ -285,7 +303,7 @@ Public Class F_GEN
If fbENG.OpenDialog(fFileRepl(Me.TbENG.Text, fPATH(Genfile))) Then Me.TbENG.Text = fFileWoDir(fbENG.Files(0), fPATH(Genfile))
End Sub
- Private Sub ButtonFLD_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonFLD.Click
+ Private Sub ButtonFLD_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonGBX.Click
If fbGBX.OpenDialog(fFileRepl(Me.TbGBX.Text, fPATH(Genfile))) Then Me.TbGBX.Text = fFileWoDir(fbGBX.Files(0), fPATH(Genfile))
End Sub
Private Sub ButtonTRS_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonTRS.Click
@@ -680,6 +698,8 @@ Public Class F_GEN
LvCycles.Items.Add(LV0)
Next
+ Me.CbEngOnly.Checked = Gfile.EngOnly
+
'-------------------------------------------------------------
Gfile = Nothing
@@ -806,6 +826,8 @@ Public Class F_GEN
g.pspar = CSng(fTextboxToNumString(Me.TBpspar.Text))
g.pmodell = CSng(1 - CSng(fTextboxToNumString(Me.TBpfast.Text)) - CSng(fTextboxToNumString(Me.TBpspar.Text)))
+ g.EngOnly = Me.CbEngOnly.Checked
+
'------------------------------------------------------------
'SAVE
@@ -915,6 +937,8 @@ Public Class F_GEN
Me.TBpspar.Text = "1"
Me.TBpfast.Text = "0"
+ Me.CbEngOnly.Checked = False
+
'---------------------------------------------------
Genfile = ""
@@ -1297,5 +1321,27 @@ lbDlog:
End Sub
+ Private Sub CbEngOnly_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CbEngOnly.CheckedChanged
+ CheckEngOnly()
+ Change()
+ End Sub
+
+ Private Sub CheckEngOnly()
+ Dim OnOff As Boolean
+
+ OnOff = Not CbEngOnly.Checked
+
+ SetDrivertab(OnOff)
+
+ ButOpenVEH.Enabled = OnOff
+ TextBoxVEH.Enabled = OnOff
+ ButtonVEH.Enabled = OnOff
+ ButOpenGBX.Enabled = OnOff
+ TbGBX.Enabled = OnOff
+ ButtonGBX.Enabled = OnOff
+ GrAux.Enabled = OnOff
+
+ End Sub
+
End Class
diff --git a/VECTO/Input Files/cDRI.vb b/VECTO/Input Files/cDRI.vb
index 4d0d6bbc899d8da7efde311a00c4237ae2e4ea4c..521a893acda413fcf1a9b69ca17967a0c531b101 100644
--- a/VECTO/Input Files/cDRI.vb
+++ b/VECTO/Input Files/cDRI.vb
@@ -45,7 +45,6 @@ Public Class cDRI
Public Scycle As Boolean
Public VoglS As List(Of Double)
-
Public Sub New()
EmComponents = New Dictionary(Of String, cEmComp)
EmDefRef = New Dictionary(Of tMapComp, cEmComp)
@@ -114,6 +113,9 @@ Public Class cDRI
Dim AuxSpalten As Dictionary(Of String, Integer) = Nothing
+
+ Dim Tvorg As Boolean = False
+
Dim MsgSrc As String
MsgSrc = "Main/ReadInp/DRI"
@@ -152,6 +154,7 @@ Public Class cDRI
DRIcheck.Add(tDriComp.VairBeta, False)
DRIcheck.Add(tDriComp.s, False)
DRIcheck.Add(tDriComp.StopTime, False)
+ DRIcheck.Add(tDriComp.Torque, False)
''***
''*** First line: Version
@@ -328,6 +331,12 @@ Public Class cDRI
PaddVorg = DRIcheck(tDriComp.Padd)
GradVorg = DRIcheck(tDriComp.Grad)
VairVorg = DRIcheck(tDriComp.VairVres) And DRIcheck(tDriComp.VairBeta)
+ Tvorg = DRIcheck(tDriComp.Torque)
+
+ If Tvorg And Pvorg Then
+ WorkerMsg(tMsgID.Warn, "Engine torque and power defined in cycle! Torque will be ignored!", MsgSrc)
+ Tvorg = False
+ End If
'***
'*** Third row: Units/Normalization
@@ -470,6 +479,14 @@ Public Class cDRI
Next
End If
+ If Tvorg And Nvorg Then
+ Values.Add(tDriComp.Pe, New List(Of Double))
+ Pvorg = True
+ For s = 0 To tDim
+ Values(tDriComp.Pe).Add(nMtoPe(Values(tDriComp.nn)(s), Values(tDriComp.Torque)(s)))
+ Next
+ End If
+
Return True
lbEr:
diff --git a/VECTO/Input Files/cGEN.vb b/VECTO/Input Files/cGEN.vb
index 66c13fcc16db72c6bec665b7f0be9383f1cc80af..396d9a0298dbbbd2ad641602479d1487d1ef77f4 100644
--- a/VECTO/Input Files/cGEN.vb
+++ b/VECTO/Input Files/cGEN.vb
@@ -85,6 +85,8 @@ Public Class cGEN
Public CycleFiles As List(Of cSubPath)
+ Public EngOnly As Boolean
+
Public Sub New()
@@ -344,7 +346,13 @@ Public Class cGEN
'If ((pspar + pmodell) > 1.0) Then pmodell = 1.0 - pspar
+ If Not file.EndOfFile Then EngOnly = CBool(file.ReadLine(0))
+ If EngOnly Then
+ VehMode = tVehMode.EngineOnly
+ Else
+ VehMode = tVehMode.StandardMode
+ End If
lbClose:
@@ -705,6 +713,9 @@ lbClose:
'fGEN.WriteLine("c Share of version mixed model (0 to 1)")
'fGEN.WriteLine(CStr(pmodell))
+ fGEN.WriteLine("c Engine Only Mode (1/0)")
+ fGEN.WriteLine(CStr(Math.Abs(CInt(EngOnly))))
+
fGEN.Close()
fGEN = Nothing
@@ -785,6 +796,8 @@ lbClose:
pspar = 0
pmodell = 0
+ EngOnly = False
+
End Sub
'This Sub reads those Input-files that do not have their own class, etc.
@@ -796,7 +809,7 @@ lbClose:
MsgSrc = "GEN/Init"
- If DesMaxJa Then
+ If DesMaxJa And Not EngOnly Then
file = New cFile_V3
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 4cad84bf8a390c557f794857a4606d64d4c6ec70..1b11222b56addd18d8361f48d8da06b1a8f50f65 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -210,7 +210,7 @@ Public Class cMOD
'Angular acceleration
For s = 0 To tDim
- MODdata.dnUvorg.Add(L(s + 1) - L(s))
+ MODdata.dnUvorg.Add((L(s + 1) - L(s)) * (VEH.nNenn - VEH.nLeerl))
Next
End If
@@ -277,7 +277,7 @@ Public Class cMOD
'Angular acceleration
MODdata.dnUvorg.Add(L(1) - L(0))
For s = 1 To MODdata.tDim - 1
- MODdata.dnUvorg.Add((L(s + 1) - L(s - 1)) / 2)
+ MODdata.dnUvorg.Add((L(s + 1) - L(s - 1)) / 2 * (VEH.nNenn - VEH.nLeerl))
Next
MODdata.dnUvorg.Add(L(MODdata.tDim) - L(MODdata.tDim - 1))
@@ -408,15 +408,15 @@ Public Class cMOD
Else
- s.Append(",engine speed,torque,Pe,n_norm,Pe_norm,Pe_full,Pe_drag,Pe_clutch")
- sU.Append(",[rpm],[Nm],[kW],[-],[-],[kW],[kW],[kW]")
+ s.Append(",engine speed,torque,Pe,n_norm,Pe_norm,Pe_full,Pe_drag,Pe_clutch,Pa Eng,Paux")
+ sU.Append(",[rpm],[Nm],[kW],[-],[-],[kW],[kW],[kW],[kW],[kW]")
End If
If Not GEN.VehMode = tVehMode.EngineOnly Then
- s.Append(",Gear,Ploss GB,Ploss Diff,Ploss Retarder,Pa Eng,Pa GB,Pa Veh,Proll,Pair,Pgrad,Paux,Pwheel,Pbrake")
- sU.Append(",[-],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW]")
+ s.Append(",Gear,Ploss GB,Ploss Diff,Ploss Retarder,Pa GB,Pa Veh,Proll,Pair,Pgrad,Pwheel,Pbrake")
+ sU.Append(",[-],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW]")
'Auxiliaries
For Each StrKey In AuxList
@@ -592,9 +592,14 @@ Public Class cMOD
End If
End If
- 'Power to Clutch
+ 'Power at Clutch
s.Append(Sepp & .Pe(t) * VEH.Pnenn - .PaEng(t) - .PauxSum(t))
+ 'PaEng
+ s.Append(Sepp & .PaEng(t))
+
+ 'Aux..
+ s.Append(Sepp & .PauxSum(t))
End If
@@ -612,9 +617,6 @@ Public Class cMOD
'Retarder-losses
s.Append(Sepp & .PlossRt(t))
- 'PaEng
- s.Append(Sepp & .PaEng(t))
-
'PaGB
s.Append(Sepp & .PaGB(t))
@@ -630,9 +632,6 @@ Public Class cMOD
'Slope ..
s.Append(Sepp & .Pstg(t))
- 'Aux..
- s.Append(Sepp & .PauxSum(t))
-
'Wheel-power
s.Append(Sepp & .Psum(t))
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index dc66f75c73b3fb5608515f15e8762c8f994cae08..99f9ddbc38af3b07c64da1e1183b660799f38bc9 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -1280,6 +1280,7 @@ lb_nOK:
Dim StdMode As Boolean
Dim NotAdvMode As Boolean
Dim MsgSrc As String
+ Dim Padd As Single
MsgSrc = "Power/Eng_Calc"
@@ -1299,8 +1300,6 @@ lb_nOK:
'Drehzahlen vorher weil sonst scheitert die Pmr-Berechnung bei MODdata.nU(t + 1) |@@| Revolutions previously, otherwise Pmr-calculation fails at MODdata.nU(t + 1)
For t = 0 To t1
- 'Write Modal value Fields
- ' Allocate MODdata.Pe
MODdata.nn.Add(nnDRI(t))
MODdata.nU.Add(Math.Max(0, nnDRI(t) * (VEH.nNenn - VEH.nLeerl) + VEH.nLeerl))
Next
@@ -1314,15 +1313,17 @@ lb_nOK:
'Reset the second-by-second Errors
MODdata.ModErrors.ResetAll()
- 'OLD and wrong because not time shifted: P_mr(jz) = 0.001 * (I_mot * 0.0109662 * (n(jz) * nnrom) * nnrom * (n(jz) - n(jz - 1))) / Pnrom
+ 'OLD and wrong because not time shifted: P_mr(jz) = 0.001 * (I_mot * 0.0109662 * (n(jz) * nnrom) * nnrom * (n(jz) - n(jz - 1)))
If t > 0 And t < t1 Then
- Pmr = 0.001 * (VEH.I_mot * (2 * Math.PI / 60) ^ 2 * MODdata.nU(t) * 0.5 * (MODdata.nU(t + 1) - MODdata.nU(t - 1))) / VEH.Pnenn
+ Pmr = 0.001 * (VEH.I_mot * (2 * Math.PI / 60) ^ 2 * MODdata.nU(t) * 0.5 * (MODdata.nU(t + 1) - MODdata.nU(t - 1)))
Else
Pmr = 0
End If
- 'Power of the Cycle corrected by P_clutch
- MODdata.Pe.Add(PeDRI(t) + Pmr)
+ Padd = MODdata.Vh.Padd(t)
+
+ 'Power = P_clutch + + Pa_eng + Padd
+ MODdata.Pe.Add(PeDRI(t) + (Pmr + Padd) / VEH.Pnenn)
'Revolutions of the Cycle => Determined in Cycle-init
'If Revolutions under idle, assume Engine is stopped
@@ -1374,6 +1375,8 @@ lb_nOK:
End If
MODdata.EngState.Add(EngState0)
+ MODdata.PaEng.Add(Pmr)
+ MODdata.PauxSum.Add(Padd)
'Notify
If MODdata.ModErrors.MsgOutputAbort(t + 1, MsgSrc) Then Return False
diff --git a/VECTO/M_Lese.vb b/VECTO/M_Lese.vb
index 28d0d7f9f77ec0ad8b0f4b7b679d4a525a423980..f3aad5e7846b658474943b75be441d4d7ce0f438 100644
--- a/VECTO/M_Lese.vb
+++ b/VECTO/M_Lese.vb
@@ -48,21 +48,23 @@ Module M_Lese
'----------------------------- ~VEH~ -----------------------------
- 'Einlesen der KFZ-Spezifikationen aus 'KFZspez' |@@| Read the Vehicle(KFZ)-specifications from 'KFZspez'
VEH = New cVEH
- VEH.FilePath = GEN.PathVEH
- Try
- If Not VEH.ReadFile Then Return False
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & GEN.PathVEH & ")", MsgSrc)
- Return False
- End Try
- VEH.hinauf = (VEH.nLeerl / VEH.nNenn) + VEH.hinauf * (1 - (VEH.nLeerl / VEH.nNenn))
- VEH.hinunter = (VEH.nLeerl / VEH.nNenn) + VEH.hinunter * (1 - (VEH.nLeerl / VEH.nNenn))
- VEH.lhinauf = (VEH.nLeerl / VEH.nNenn) + VEH.lhinauf * (1 - (VEH.nLeerl / VEH.nNenn))
- VEH.lhinunter = (VEH.nLeerl / VEH.nNenn) + VEH.lhinunter * (1 - (VEH.nLeerl / VEH.nNenn))
+ 'Read vehicle specifications
+ If Not GEN.EngOnly Then
+ VEH.FilePath = GEN.PathVEH
+ Try
+ If Not VEH.ReadFile Then Return False
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & GEN.PathVEH & ")", MsgSrc)
+ Return False
+ End Try
+ VEH.hinauf = (VEH.nLeerl / VEH.nNenn) + VEH.hinauf * (1 - (VEH.nLeerl / VEH.nNenn))
+ VEH.hinunter = (VEH.nLeerl / VEH.nNenn) + VEH.hinunter * (1 - (VEH.nLeerl / VEH.nNenn))
+ VEH.lhinauf = (VEH.nLeerl / VEH.nNenn) + VEH.lhinauf * (1 - (VEH.nLeerl / VEH.nNenn))
+ VEH.lhinunter = (VEH.nLeerl / VEH.nNenn) + VEH.lhinunter * (1 - (VEH.nLeerl / VEH.nNenn))
+ End If
'----------------------------- ~ENG~ -----------------------------
ENG = New cENG
@@ -77,14 +79,16 @@ Module M_Lese
'----------------------------- ~GBX~ -----------------------------
GBX = New cGBX
- GBX.FilePath = GEN.PathGBX
- Try
- If Not GBX.ReadFile Then Return False
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & GEN.PathGBX & ")", MsgSrc)
- Return False
- End Try
+ If Not GEN.EngOnly Then
+ GBX.FilePath = GEN.PathGBX
+ Try
+ If Not GBX.ReadFile Then Return False
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & GEN.PathGBX & ")", MsgSrc)
+ Return False
+ End Try
+ End If
'----------------------------- VECTO -----------------------------
'GEN => VEH
@@ -125,8 +129,6 @@ Module M_Lese
VEH.I_Getriebe = GBX.I_Getriebe
VEH.TracIntrSi = GBX.TracIntrSi
-
-
'----------------------------- ~FLD~ -----------------------------
' FLD muss jetzt vor MAP/MEP eingelesen werden falls dort <DRAG> Einträge sind! |@@| if there are <DRAG> entries, then read FLD before MAP/MEP!
FLD = New cFLD
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index 46882d61d0e2d83928dba5a8112983bafa64ef2b..00fb91a0579b5df9c03374a8c85e5666dfc31334 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -329,7 +329,7 @@ lbADV:
End If
'If first time step is Zero then duplicate to start cycle with vehicle standing.
- If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 And DRI.Values(tDriComp.V)(1) >= 0.0001 Then
+ If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
DRI.FirstZero()
End If
@@ -531,12 +531,13 @@ lbADV:
'VECTO Output
'TODO: Loadings umschalten... |@@| TODO: Loadings Gear-shift ...
- If Not VSUM.SetVals(tVSUM.UserDefLoaded) Then
- CyclAbrtedByErr = True
- GoTo lbAusg
+ If Not GEN.EngOnly Then
+ If Not VSUM.SetVals(tVSUM.UserDefLoaded) Then
+ CyclAbrtedByErr = True
+ GoTo lbAusg
+ End If
End If
-
'Output for BATCH and ADVANCE
lbAusg:
If (PHEMmode = tPHEMmode.ModeADVANCE) Then
@@ -578,9 +579,11 @@ lbAusg:
'******************** END *** VECTO-loading loop *** END ************************
'**************************************************************************************
- If Not VSUM.Output() Then
- CyclAbrtedByErr = True
- GoTo lbAusg
+ If Not GEN.EngOnly Then
+ If Not VSUM.Output() Then
+ CyclAbrtedByErr = True
+ GoTo lbAusg
+ End If
End If
Next
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index f106ed8a610a8eb1becf1b643c610e909892c81a..372f311db0f53f2700aa1e5209b29361ce470ba9 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -98,6 +98,8 @@ Module VECTO_Global
Return tDriComp.s
Case sKey.DRI.StopTime
Return tDriComp.StopTime
+ Case sKey.DRI.Torque
+ Return tDriComp.Torque
Case Else
Return tDriComp.Undefined
@@ -422,6 +424,7 @@ Public Class csKey
Public VairBeta As String = "<VAIR_BETA>"
Public s As String = "<S>"
Public StopTime As String = "<STOP>"
+ Public Torque As String = "<M>"
End Class
Public Class csKeyEXS
diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb
index b3cf51627403908e38de1051d1749d99e68e0388..f3b3287df95255c0b4ff8e255da8834a75498ee4 100644
--- a/VECTO/VECTO_Types.vb
+++ b/VECTO/VECTO_Types.vb
@@ -111,6 +111,7 @@ Public Enum tDriComp
Undefined
s
StopTime
+ Torque
End Enum
Public Enum tExsComp