diff --git a/CHANGES.md b/CHANGES.md
index 0531288b4f4321aa2e4b3fed22e3131cce31a769..224d27295618dd1d72e749c59b2ad5c88d2404ed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,16 @@
VECTO-CSE: Changes
===================
+#### 2015-07-23: v2.0.2-beta6 ####
+TUG improvements:
+
+ * New version number
+ * Bugfix calculation without additional signals
+ * Update user manual and release notes (Now always the newest version will be opened)
+ * Deleted unused variables (FC from input data, t_amb_tamac from criteria)
+ * Add ground temperature as optional signal to input data (<t_ground>)
+ * Add new criteria parameter t_ground_max = 40°C
+ * Set t_amb_max to 25°C (old 35°C)
+
#### 2015-07-20: v2.0.2-beta6 ####
TUG improvements:
diff --git a/CSE/CSE_Globals.vb b/CSE/CSE_Globals.vb
index 9f2bc7b02cb8bc3bc007805b47475d30473c3de8..4599e83bbf7f02755938f2c202d3f9658a05791b 100644
--- a/CSE/CSE_Globals.vb
+++ b/CSE/CSE_Globals.vb
@@ -22,10 +22,10 @@ Module CSE_Globals
n_card
tq_l
tq_r
+ t_ground
t_amb_veh
t_tire
p_tire
- fc
trigger
user_valid
Undefined
@@ -77,7 +77,6 @@ Module CSE_Globals
F_res
v_veh_1s
v_veh_float
- t_amp_veh
t_amp_stat
p_amp_stat
rh_stat
@@ -133,6 +132,7 @@ Module CSE_Globals
F_res
v_veh_1s
v_veh_float
+ t_ground
t_amb_veh
t_amb_stat
p_amb_stat
@@ -221,14 +221,14 @@ Module CSE_Globals
Return tComp.tq_l
Case sKey.Meas.tq_r
Return tComp.tq_r
+ Case sKey.Meas.t_ground
+ Return tComp.t_ground
Case sKey.Meas.t_amb_veh
Return tComp.t_amb_veh
Case sKey.Meas.t_tire
Return tComp.t_tire
Case sKey.Meas.p_tire
Return tComp.p_tire
- Case sKey.Meas.fc
- Return tComp.fc
Case sKey.Meas.trigger
Return tComp.trigger
Case sKey.Meas.valid
@@ -296,14 +296,14 @@ Module CSE_Globals
Return "tq_l"
Case tComp.tq_r
Return "tq_r"
+ Case tComp.t_ground
+ Return "t_ground"
Case tComp.t_amb_veh
Return "t_amb_veh"
Case tComp.t_tire
Return "t_tire"
Case tComp.p_tire
Return "p_tire"
- Case tComp.fc
- Return "FC"
Case tComp.trigger
Return "trigger"
Case tComp.user_valid
@@ -341,14 +341,14 @@ Module CSE_Globals
Return "[Nm]"
Case tComp.tq_r
Return "[Nm]"
+ Case tComp.t_ground
+ Return "[°C]"
Case tComp.t_amb_veh
Return "[°C]"
Case tComp.t_tire
Return "[°C]"
Case tComp.p_tire
Return "[bar]"
- Case tComp.fc
- Return "[kg/h]"
Case tComp.trigger
Return "[-]"
Case tComp.user_valid
@@ -451,8 +451,6 @@ Module CSE_Globals
Return "v_veh_1s"
Case tCompCali.v_veh_float
Return "v_veh_float"
- Case tCompCali.t_amp_veh
- Return "t_amp_veh"
Case tCompCali.t_amp_stat
Return "t_amp_stat"
Case tCompCali.p_amp_stat
@@ -560,8 +558,6 @@ Module CSE_Globals
Return "[km/h]"
Case tCompCali.v_veh_float
Return "[km/h]"
- Case tCompCali.t_amp_veh
- Return "[°C]"
Case tCompCali.t_amp_stat
Return "[°C]"
Case tCompCali.p_amp_stat
@@ -715,6 +711,8 @@ Module CSE_Globals
Return "v_veh_1s"
Case tCompErg.v_veh_float
Return "v_veh_float"
+ Case tCompErg.t_ground
+ Return "t_ground"
Case tCompErg.t_amb_veh
Return "t_amb_veh"
Case tCompErg.t_amb_stat
@@ -884,6 +882,8 @@ Module CSE_Globals
Return "[km/h]"
Case tCompErg.v_veh_float
Return "[km/h]"
+ Case tCompErg.t_ground
+ Return "[°C]"
Case tCompErg.t_amb_veh
Return "[°C]"
Case tCompErg.t_amb_stat
diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb
index 71569f9c694587f6a2b50d59dd2d364cb0017665..2d2c348959916a58b0640316a07de133b7dc8466 100644
--- a/CSE/Calculation/Signal_identification.vb
+++ b/CSE/Calculation/Signal_identification.vb
@@ -864,6 +864,7 @@ Module Signal_identification
ErgValues(tCompErg.n_ec_float_min)(run) = (CalcData(tCompCali.n_ec_float)(i))
If OptPar(3) Then ErgValues(tCompErg.t_tire)(run) = (InputData(tComp.t_tire)(i))
If OptPar(1) Then ErgValues(tCompErg.p_tire)(run) = (InputData(tComp.p_tire)(i))
+ If OptPar(2) Then ErgValues(tCompErg.t_ground)(run) = (InputData(tComp.t_ground)(i))
firstIn = False
anz += 1
@@ -905,6 +906,7 @@ Module Signal_identification
If ErgValues(tCompErg.n_ec_float_min)(run) > CalcData(tCompCali.n_ec_float)(i) Then ErgValues(tCompErg.n_ec_float_min)(run) = CalcData(tCompCali.n_ec_float)(i)
If OptPar(3) Then ErgValues(tCompErg.t_tire)(run) += (InputData(tComp.t_tire)(i))
If OptPar(1) Then ErgValues(tCompErg.p_tire)(run) += (InputData(tComp.p_tire)(i))
+ If OptPar(2) Then ErgValues(tCompErg.t_ground)(run) += (InputData(tComp.t_ground)(i))
anz += 1
Else
' Calculate the results from the last section
@@ -939,6 +941,7 @@ Module Signal_identification
End If
If OptPar(3) Then ErgValues(tCompErg.t_tire)(run) = ErgValues(tCompErg.t_tire)(run) / anz
If OptPar(1) Then ErgValues(tCompErg.p_tire)(run) = ErgValues(tCompErg.p_tire)(run) / anz
+ If OptPar(2) Then ErgValues(tCompErg.t_ground)(run) = ErgValues(tCompErg.t_ground)(run) / anz
ErgValues(tCompErg.r_dyn)(run) = (30 * igear * vehicleX.axleRatio * ErgValues(tCompErg.v_veh)(run) / 3.6) / (ErgValues(tCompErg.n_ec)(run) * Math.PI)
' Add a new Section to the resultfile
@@ -980,6 +983,7 @@ Module Signal_identification
ErgValues(tCompErg.n_ec_float_min)(run) = (CalcData(tCompCali.n_ec_float)(i))
If OptPar(3) Then ErgValues(tCompErg.t_tire)(run) = (InputData(tComp.t_tire)(i))
If OptPar(1) Then ErgValues(tCompErg.p_tire)(run) = (InputData(tComp.p_tire)(i))
+ If OptPar(2) Then ErgValues(tCompErg.t_ground)(run) = (InputData(tComp.t_ground)(i))
End If
End If
Else
@@ -1017,6 +1021,7 @@ Module Signal_identification
End If
If OptPar(3) Then ErgValues(tCompErg.t_tire)(run) = ErgValues(tCompErg.t_tire)(run) / anz
If OptPar(1) Then ErgValues(tCompErg.p_tire)(run) = ErgValues(tCompErg.p_tire)(run) / anz
+ If OptPar(2) Then ErgValues(tCompErg.t_ground)(run) = ErgValues(tCompErg.t_ground)(run) / anz
ErgValues(tCompErg.r_dyn)(run) = (30 * igear * vehicleX.axleRatio * ErgValues(tCompErg.v_veh)(run) / 3.6) / (ErgValues(tCompErg.n_ec)(run) * Math.PI)
anz = 0
diff --git a/CSE/Calculation/sub_linear_regression.vb b/CSE/Calculation/sub_linear_regression.vb
index d00ba64e984afd0d860567783d2572c8b0712a55..d127115ee5516cb7d8c8361b62f61cc183d4365f 100644
--- a/CSE/Calculation/sub_linear_regression.vb
+++ b/CSE/Calculation/sub_linear_regression.vb
@@ -16,7 +16,7 @@ Module sub_linear_regression
' Declaration
Dim i, j, numLS1, numLS2, numHS, numHSg, numT, PosHS(), PosHSg(), lauf, t_amb_num As Integer
Dim XLS1_Array(,), XLS2_Array(,), XHS_Array(,), XHSg_Array(,), XHS_S(1, 1), YLS1_Array(), YLS2_Array(), YHS_Array(), YHSg_Array(), YHS_S(1) As Double
- Dim XLR(,), YLR(), WFLR(,), F0, F2, F095, F295, R2, Rho_air_LS1, Rho_air_LS2, t_amb_f, t_amb_max_f, t_amb_min_f As Double
+ Dim XLR(,), YLR(), WFLR(,), F0, F2, F095, F295, R2, Rho_air_LS1, Rho_air_LS2, t_amb_f, t_amb_max_f, t_amb_min_f, t_ground_max_f As Double
Dim FirstInLS1, FirstInLS2, FirstInHS, FirstInGes As Boolean
Dim EnumStr As tCompErgReg
@@ -28,6 +28,7 @@ Module sub_linear_regression
t_amb_f = 0
t_amb_max_f = 0
t_amb_min_f = 0
+ t_ground_max_f = 0
t_amb_num = 0
FirstInGes = True
ErgValuesReg = New Dictionary(Of tCompErgReg, List(Of Double))
@@ -37,6 +38,7 @@ Module sub_linear_regression
Job.delta_CdxA = 0
Job.beta = 0
Job.valid_t_amb = True
+ Job.valid_t_ground = True
Job.valid_RRC = True
' Generate the result dictionary variables
@@ -164,10 +166,12 @@ Module sub_linear_regression
If FirstInGes Then
t_amb_max_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
t_amb_min_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
+ If OptPar(2) Then t_ground_max_f = ErgValuesComp(tCompErg.t_ground)(j)
FirstInGes = False
Else
If t_amb_max_f < ErgValuesComp(tCompErg.t_amb_veh)(j) Then t_amb_max_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
If t_amb_min_f > ErgValuesComp(tCompErg.t_amb_veh)(j) Then t_amb_min_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
+ If OptPar(2) Then If t_ground_max_f < ErgValuesComp(tCompErg.t_ground)(j) Then t_ground_max_f = ErgValuesComp(tCompErg.t_ground)(j)
End If
End If
@@ -201,10 +205,12 @@ Module sub_linear_regression
If FirstInGes Then
t_amb_max_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
t_amb_min_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
+ If OptPar(2) Then t_ground_max_f = ErgValuesComp(tCompErg.t_ground)(j)
FirstInGes = False
Else
If t_amb_max_f < ErgValuesComp(tCompErg.t_amb_veh)(j) Then t_amb_max_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
If t_amb_min_f > ErgValuesComp(tCompErg.t_amb_veh)(j) Then t_amb_min_f = ErgValuesComp(tCompErg.t_amb_veh)(j)
+ If OptPar(2) Then If t_ground_max_f < ErgValuesComp(tCompErg.t_ground)(j) Then t_ground_max_f = ErgValuesComp(tCompErg.t_ground)(j)
End If
End If
End If
@@ -332,10 +338,11 @@ Module sub_linear_regression
logme(9, False, "Invalid test - maximum ambient temperature exceeded")
ElseIf t_amb_min_f < Crt.t_amb_min Then
logme(9, False, "Invalid test - fallen below minimum ambient temperature")
- ElseIf t_amb_max_f > Crt.t_amb_tarmac Then
- logme(9, False, "Invalid test - Ambient temperature higher than " & Crt.t_amb_tarmac & "°C")
End If
-
+ If OptPar(2) And t_ground_max_f > Crt.t_ground_max Then
+ logme(9, False, "Invalid test - range of ground temperature exceeded")
+ Job.valid_t_ground = False
+ End If
Return True
End Function
diff --git a/CSE/Classes/csKey.vb b/CSE/Classes/csKey.vb
index 22ce6be20dfbb3832076bbdef393ac6bcad33b0e..31e119f158a8281c2ddfe6b2cbc4ef6c3c2e01a7 100644
--- a/CSE/Classes/csKey.vb
+++ b/CSE/Classes/csKey.vb
@@ -34,10 +34,10 @@ Public Class csKeyMeas
Public n_card As String = "<N_CARD>"
Public tq_l As String = "<TQ_L>"
Public tq_r As String = "<TQ_R>"
+ Public t_ground As String = "<T_GROUND>"
Public t_amb_veh As String = "<T_AMB_VEH>"
Public t_tire As String = "<T_TIRE>"
Public p_tire As String = "<P_TIRE>"
- Public fc As String = "<FC>"
Public trigger As String = "<TRIGGER>"
Public valid As String = "<VALID>"
End Class
\ No newline at end of file
diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb
index f02c908a353b1469a60fd2b0c9f9817fec509be1..fcb208a5ff6986bd8790f9bad664741dd94f18fd 100644
--- a/CSE/GUI/F_Main.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -40,10 +40,10 @@ Partial Class F_Main
Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItemManu = New System.Windows.Forms.ToolStripMenuItem()
Me.ReleaseNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripMenuItemAbout = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.ReportBugToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripMenuItemAbout = New System.Windows.Forms.ToolStripMenuItem()
Me.BackgroundWorkerVECTO = New System.ComponentModel.BackgroundWorker()
Me.GroupBoxJob = New System.Windows.Forms.GroupBox()
Me.TextBoxWeather = New System.Windows.Forms.TextBox()
@@ -197,7 +197,7 @@ Partial Class F_Main
Me.TB_t_amb_min = New System.Windows.Forms.TextBox()
Me.Label24 = New System.Windows.Forms.Label()
Me.Label84 = New System.Windows.Forms.Label()
- Me.TB_t_amb_tarmac = New System.Windows.Forms.TextBox()
+ Me.TB_t_ground_max = New System.Windows.Forms.TextBox()
Me.LB_t_amb_min = New System.Windows.Forms.Label()
Me.LDeltaParaMax = New System.Windows.Forms.Label()
Me.LB_delta_t_tyre_max = New System.Windows.Forms.Label()
@@ -367,18 +367,6 @@ Partial Class F_Main
Me.ReleaseNotesToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
Me.ReleaseNotesToolStripMenuItem.Text = "Release Notes"
'
- 'ToolStripMenuItem1
- '
- Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
- Me.ToolStripMenuItem1.Size = New System.Drawing.Size(186, 6)
- '
- 'ToolStripMenuItemAbout
- '
- Me.ToolStripMenuItemAbout.Image = Global.CSE.My.Resources.Resources.Info
- Me.ToolStripMenuItemAbout.Name = "ToolStripMenuItemAbout"
- Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(189, 22)
- Me.ToolStripMenuItemAbout.Text = "About CSE"
- '
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
@@ -391,6 +379,18 @@ Partial Class F_Main
Me.ReportBugToolStripMenuItem.Size = New System.Drawing.Size(189, 22)
Me.ReportBugToolStripMenuItem.Text = "Report Bug via CITnet"
'
+ 'ToolStripMenuItem1
+ '
+ Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+ Me.ToolStripMenuItem1.Size = New System.Drawing.Size(186, 6)
+ '
+ 'ToolStripMenuItemAbout
+ '
+ Me.ToolStripMenuItemAbout.Image = Global.CSE.My.Resources.Resources.Info
+ Me.ToolStripMenuItemAbout.Name = "ToolStripMenuItemAbout"
+ Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(189, 22)
+ Me.ToolStripMenuItemAbout.Text = "About CSE"
+ '
'BackgroundWorkerVECTO
'
Me.BackgroundWorkerVECTO.WorkerReportsProgress = True
@@ -1952,7 +1952,7 @@ Partial Class F_Main
Me.GroupBox14.Controls.Add(Me.TB_t_amb_min)
Me.GroupBox14.Controls.Add(Me.Label24)
Me.GroupBox14.Controls.Add(Me.Label84)
- Me.GroupBox14.Controls.Add(Me.TB_t_amb_tarmac)
+ Me.GroupBox14.Controls.Add(Me.TB_t_ground_max)
Me.GroupBox14.Controls.Add(Me.LB_t_amb_min)
Me.GroupBox14.Controls.Add(Me.LDeltaParaMax)
Me.GroupBox14.Controls.Add(Me.LB_delta_t_tyre_max)
@@ -1994,7 +1994,7 @@ Partial Class F_Main
Me.LB_t_amb_tarmac.Name = "LB_t_amb_tarmac"
Me.LB_t_amb_tarmac.Size = New System.Drawing.Size(74, 13)
Me.LB_t_amb_tarmac.TabIndex = 69
- Me.LB_t_amb_tarmac.Text = "t_amb_tarmac"
+ Me.LB_t_amb_tarmac.Text = "t_ground_max"
'
'TB_t_amb_min
'
@@ -2022,13 +2022,13 @@ Partial Class F_Main
Me.Label84.TabIndex = 67
Me.Label84.Text = "[°C]"
'
- 'TB_t_amb_tarmac
+ 'TB_t_ground_max
'
- Me.TB_t_amb_tarmac.Location = New System.Drawing.Point(133, 147)
- Me.TB_t_amb_tarmac.Name = "TB_t_amb_tarmac"
- Me.TB_t_amb_tarmac.Size = New System.Drawing.Size(45, 20)
- Me.TB_t_amb_tarmac.TabIndex = 65
- Me.TB_t_amb_tarmac.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ Me.TB_t_ground_max.Location = New System.Drawing.Point(133, 147)
+ Me.TB_t_ground_max.Name = "TB_t_ground_max"
+ Me.TB_t_ground_max.Size = New System.Drawing.Size(45, 20)
+ Me.TB_t_ground_max.TabIndex = 65
+ Me.TB_t_ground_max.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'LB_t_amb_min
'
@@ -2426,7 +2426,7 @@ Partial Class F_Main
Friend WithEvents LB_t_amb_tarmac As System.Windows.Forms.Label
Friend WithEvents TB_t_amb_min As System.Windows.Forms.TextBox
Friend WithEvents Label84 As System.Windows.Forms.Label
- Friend WithEvents TB_t_amb_tarmac As System.Windows.Forms.TextBox
+ Friend WithEvents TB_t_ground_max As System.Windows.Forms.TextBox
Friend WithEvents LB_t_amb_min As System.Windows.Forms.Label
Friend WithEvents PBInfoIconCrt As System.Windows.Forms.PictureBox
Friend WithEvents TBInfoCrt As System.Windows.Forms.TextBox
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 493d774346cf0092957cf74463a6df0af5f8c13c..7181f87c61d9e36263962c8be0fa3f97f7ebb2ec 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -550,7 +550,7 @@ Public Class F_Main
Crt.delta_t_tyre_max = TB_delta_t_tyre_max.Text
Crt.delta_rr_corr_max = TB_delta_rr_corr_max.Text
Crt.t_amb_var = TB_t_amb_var.Text
- Crt.t_amb_tarmac = TB_t_amb_tarmac.Text
+ Crt.t_ground_max = TB_t_ground_max.Text
Crt.t_amb_max = TB_t_amb_max.Text
Crt.t_amb_min = TB_t_amb_min.Text
' General
@@ -616,7 +616,7 @@ Public Class F_Main
TB_delta_t_tyre_max.Text = Crt.delta_t_tyre_max
TB_delta_rr_corr_max.Text = Crt.delta_rr_corr_max
TB_t_amb_var.Text = Crt.t_amb_var
- TB_t_amb_tarmac.Text = Crt.t_amb_tarmac
+ TB_t_ground_max.Text = Crt.t_ground_max
TB_t_amb_max.Text = Crt.t_amb_max
TB_t_amb_min.Text = Crt.t_amb_min
' General
@@ -956,7 +956,8 @@ Public Class F_Main
' Menu open the user manual
Private Sub ToolStripMenuItemManu_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ToolStripMenuItemManu.Click
- Dim manual_fname As String = joinPaths(MyPath, "Docs", "VECTO_CSE-User Manual_" & AppVers & ".pdf")
+ Dim manual_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO_CSE-User Manual*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
+
Try
System.Diagnostics.Process.Start(manual_fname)
Catch ex As Exception
@@ -966,7 +967,8 @@ Public Class F_Main
' Menu open the release nodes
Private Sub ReleaseNotesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReleaseNotesToolStripMenuItem.Click
- Dim release_fname As String = joinPaths(MyPath, "Docs", "VECTO-CSE_ReleaseNotes_" & AppVers & ".pdf")
+ Dim release_fname As String = (From fi As IO.FileInfo In (New IO.DirectoryInfo(joinPaths(MyPath, "Docs")).GetFiles("*VECTO-CSE_ReleaseNotes*.pdf", IO.SearchOption.TopDirectoryOnly)) Order By fi.LastAccessTime Select fi)(0).FullName
+
Try
System.Diagnostics.Process.Start(release_fname)
Catch ex As Exception
@@ -987,7 +989,7 @@ Public Class F_Main
' Check if the input is a number
Private Sub TextBox_TextChanged(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles TB_delta_t_tyre_max.KeyPress, TB_delta_rr_corr_max.KeyPress, TB_t_amb_var.KeyPress, _
- TB_t_amb_tarmac.KeyPress, TB_t_amb_max.KeyPress, TB_t_amb_min.KeyPress, TB_delta_Hz_max.KeyPress, TB_acc_corr_avg.KeyPress, TB_delta_parallel_max.KeyPress, TB_trigger_delta_x_max.KeyPress, TB_trigger_delta_y_max.KeyPress, _
+ TB_t_ground_max.KeyPress, TB_t_amb_max.KeyPress, TB_t_amb_min.KeyPress, TB_delta_Hz_max.KeyPress, TB_acc_corr_avg.KeyPress, TB_delta_parallel_max.KeyPress, TB_trigger_delta_x_max.KeyPress, TB_trigger_delta_y_max.KeyPress, _
TB_delta_head_max.KeyPress, TB_segruns_min_CAL.KeyPress, TB_segruns_min_LS.KeyPress, TB_segruns_min_HS.KeyPress, TB_segruns_min_head_MS.KeyPress, TB_tq_sum_1s_delta_HS.KeyPress, TB_v_veh_1s_delta_HS.KeyPress, TB_beta_avg_max_HS.KeyPress, TB_v_veh_avg_min_HS.KeyPress, _
TB_v_wind_1s_max_HS.KeyPress, TB_v_wind_avg_max_HS.KeyPress, TB_delta_n_ec_HS.KeyPress, TB_tq_sum_float_delta_LS.KeyPress, TB_v_veh_float_delta_LS.KeyPress, TB_v_veh_avg_max_LS.KeyPress, TB_v_veh_avg_min_LS.KeyPress, TB_v_wind_1s_max_LS.KeyPress, TB_v_wind_avg_max_LS.KeyPress, TB_delta_n_ec_LS.KeyPress, _
TB_leng_crit.KeyPress, TB_beta_avg_max_CAL.KeyPress, TB_v_wind_1s_max_CAL.KeyPress, TB_v_wind_avg_max_CAL.KeyPress, TB_dist_float.KeyPress
@@ -1121,7 +1123,7 @@ Public Class F_Main
TB_t_amb_min, LB_t_amb_min, _
TB_t_amb_max, LB_t_amb_max, _
TB_t_amb_var, LB_t_amb_var, _
- TB_t_amb_tarmac, LB_t_amb_tarmac _
+ TB_t_ground_max, LB_t_amb_tarmac _
}
schema = New cCriteria(True).BodySchema.SelectToken("properties.Validation")
armControlsWithInfoBox(schema, controls, AddressOf showInfoBox_crt, AddressOf hideInfoBox_crt)
diff --git a/CSE/IO/cCriteria.vb b/CSE/IO/cCriteria.vb
index bfcdaf5cf1f08ae72d703485a4521eee1d847812..e748b3715cde9fb57c5a3079c358082bc3984749 100644
--- a/CSE/IO/cCriteria.vb
+++ b/CSE/IO/cCriteria.vb
@@ -75,9 +75,9 @@ Public Class cCriteria
g.delta_t_tyre_max = 5
g.delta_rr_corr_max = 0.3
g.t_amb_min = 0
- g.t_amb_max = 35
+ g.t_amb_max = 25
g.t_amb_var = 3
- g.t_amb_tarmac = 25
+ g.t_ground_max = 40
Return b
End Function
@@ -248,8 +248,8 @@ Public Class cCriteria
"description": "Maximum variation of ambient temperature (measured at the vehicle) during the tests (evaluated based on the used datasets only).",
"units": "°C",
},
- "t_amb_tarmac": {"type": "number", "required": true,
- "description": "Maximum temperature below which no documentation of tarmac conditions is necessary.",
+ "t_ground_max": {"type": "number", "required": true,
+ "description": "Maximum temperature of the ground.",
"units": "°C",
},
}
@@ -343,7 +343,7 @@ Public Class cCriteria
Public t_amb_min As Single
Public t_amb_max As Single
Public t_amb_var As Single
- Public t_amb_tarmac As Single
+ Public t_ground_max As Single
Protected Overrides Sub OnContentUpdated()
@@ -395,7 +395,7 @@ Public Class cCriteria
Me.delta_t_tyre_max = g("delta_t_tyre_max")
Me.delta_rr_corr_max = g("delta_rr_corr_max")
Me.t_amb_var = g("t_amb_var")
- Me.t_amb_tarmac = g("t_amb_tarmac")
+ Me.t_ground_max = g("t_ground_max")
Me.t_amb_max = g("t_amb_max")
Me.t_amb_min = g("t_amb_min")
End Sub
@@ -453,7 +453,7 @@ Public Class cCriteria
g.delta_t_tyre_max = Me.delta_t_tyre_max
g.delta_rr_corr_max = Me.delta_rr_corr_max
g.t_amb_var = Me.t_amb_var
- g.t_amb_tarmac = Me.t_amb_tarmac
+ g.t_ground_max = Me.t_ground_max
g.t_amb_max = Me.t_amb_max
g.t_amb_min = Me.t_amb_min
End Sub
diff --git a/CSE/IO/cJob.vb b/CSE/IO/cJob.vb
index d8b4d2209821e8bf819f092c0af322bbc5983174..ca5d1b9e47893441c22f6a90d3bd15dff1133b1b 100644
--- a/CSE/IO/cJob.vb
+++ b/CSE/IO/cJob.vb
@@ -46,6 +46,7 @@ Public Class cJob
b.CdxA0 = 0
b.CdxA0_opt2 = 0
b.valid_t_amb = True
+ b.valid_t_ground = True
b.valid_RRC = True
Return b
End Function
@@ -156,6 +157,11 @@ Public Class cJob
"description": "Invalid if the ambient temperature fallen below minimum.",
'default': true,
},
+ "valid_t_ground": {
+ "type": "boolean",
+ "description": "Invalid if the ground temperature is higher than allowed.",
+ 'default': true,
+ },
"valid_RRC": {
"type": "boolean",
"description": "Invalid if the ambient temperature higher than allowed.",
@@ -198,6 +204,7 @@ Public Class cJob
Job.CdxA0 = 0
Job.CdxA0_opt2 = 0
Job.valid_t_amb = True
+ Job.valid_t_ground = True
Job.valid_RRC = True
End Sub
@@ -241,6 +248,7 @@ Public Class cJob
Public CdxA0 As Double
Public CdxA0_opt2 As Double
Public valid_t_amb As Boolean
+ Public valid_t_ground As Boolean
Public valid_RRC As Boolean
''' <summary>Override it to set custome fields</summary>
@@ -257,6 +265,7 @@ Public Class cJob
b.CdxA0 = Math.Round(CdxA0, 5)
b.CdxA0_opt2 = Math.Round(CdxA0_opt2, 5)
b.valid_t_amb = valid_t_amb
+ b.valid_t_ground = valid_t_ground
b.valid_RRC = valid_RRC
Crt.OnBeforeContentStored_hack()
diff --git a/CSE/IO/input.vb b/CSE/IO/input.vb
index aae1cb9938eab0d1aab7cd70abc968267007c8c0..6414ab908cb5aaa4e0fa853769fccb19556c04f4 100644
--- a/CSE/IO/input.vb
+++ b/CSE/IO/input.vb
@@ -225,10 +225,10 @@ Public Module input
MeasCheck.Add(tComp.n_eng, False)
MeasCheck.Add(tComp.tq_l, False)
MeasCheck.Add(tComp.tq_r, False)
+ MeasCheck.Add(tComp.t_ground, False)
MeasCheck.Add(tComp.t_amb_veh, False)
MeasCheck.Add(tComp.t_tire, False)
MeasCheck.Add(tComp.p_tire, False)
- MeasCheck.Add(tComp.fc, False)
MeasCheck.Add(tComp.trigger, False)
MeasCheck.Add(tComp.user_valid, False)
@@ -277,7 +277,7 @@ Public Module input
OptPar(0) = False
Case tComp.p_tire
OptPar(1) = False
- Case tComp.fc
+ Case tComp.t_ground
OptPar(2) = False
Case tComp.t_tire
OptPar(3) = False
diff --git a/CSE/IO/output.vb b/CSE/IO/output.vb
index 1535912f78264eae871655ac8855d3425c9c6b02..839525bf4ea9b16ab2f474e0044114f674c2b04d 100644
--- a/CSE/IO/output.vb
+++ b/CSE/IO/output.vb
@@ -29,7 +29,7 @@ Module output
ErgEntryListC = New List(Of tCompCali)
GenErgOutData(calibration)
If Crt.hz_out = 1 Then
- ConvTo1Hz(InputData(tComp.t), InputUndefData)
+ If InputUndefData.Count > 0 Then ConvTo1Hz(InputData(tComp.t), InputUndefData)
ConvTo1Hz(InputData)
ConvTo1Hz(CalcData)
End If
@@ -250,6 +250,13 @@ Module output
Else
FileOut.WriteLine("# Ambient temp:", "Invalid test - variation of ambient temperature (at the vehicle) outside boundaries")
End If
+ If OptPar(2) Then
+ If Job.valid_t_ground Then
+ FileOut.WriteLine("# Ground temp:", "Ok")
+ Else
+ FileOut.WriteLine("# Ground temp:", "Invalid test - range of ground temperature exceeded")
+ End If
+ End If
FileOut.WriteLine("#")
@@ -299,12 +306,12 @@ Module output
End If
AddToErg(tComp.tq_l, fCompName(tComp.tq_l), fCompUnit(tComp.tq_l), "InputData")
AddToErg(tComp.tq_r, fCompName(tComp.tq_r), fCompUnit(tComp.tq_r), "InputData")
+ If OptPar(2) Then AddToErg(tComp.t_ground, fCompName(tComp.t_ground), fCompUnit(tComp.t_ground), "InputData")
AddToErg(tComp.t_amb_veh, fCompName(tComp.t_amb_veh), fCompUnit(tComp.t_amb_veh), "InputData")
If OptPar(3) Then AddToErg(tComp.t_tire, fCompName(tComp.t_tire), fCompUnit(tComp.t_tire), "InputData")
' Write optional parameters
If OptPar(0) Then AddToErg(tComp.trigger, fCompName(tComp.trigger), fCompUnit(tComp.trigger), "InputData")
If OptPar(1) Then AddToErg(tComp.p_tire, fCompName(tComp.p_tire), fCompUnit(tComp.p_tire), "InputData")
- If OptPar(2) Then AddToErg(tComp.fc, fCompName(tComp.fc), fCompUnit(tComp.fc), "InputData")
' Undefined input data
For Each sKV In InputUndefData
@@ -438,6 +445,7 @@ Module output
AddToErg(tCompErg.v_veh_float, fCompName(tCompErg.v_veh_float), fCompUnit(tCompErg.v_veh_float), "ErgValues")
AddToErg(tCompErg.v_veh_float_max, fCompName(tCompErg.v_veh_float_max), fCompUnit(tCompErg.v_veh_float_max), "ErgValues")
AddToErg(tCompErg.v_veh_float_min, fCompName(tCompErg.v_veh_float_min), fCompUnit(tCompErg.v_veh_float_min), "ErgValues")
+ AddToErg(tCompErg.t_ground, fCompName(tCompErg.t_ground), fCompUnit(tCompErg.t_ground), "ErgValues")
AddToErg(tCompErg.t_amb_veh, fCompName(tCompErg.t_amb_veh), fCompUnit(tCompErg.t_amb_veh), "ErgValues")
AddToErg(tCompErg.t_amb_stat, fCompName(tCompErg.t_amb_stat), fCompUnit(tCompErg.t_amb_stat), "ErgValues")
AddToErg(tCompErg.p_amb_stat, fCompName(tCompErg.p_amb_stat), fCompUnit(tCompErg.p_amb_stat), "ErgValues")
diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb
index 7c86c43dec369522cd749590a59614ed1ddd892c..af79cd48d69eefc5bd1687ccf293864c0103e14c 100644
--- a/CSE/declaration_public.vb
+++ b/CSE/declaration_public.vb
@@ -13,7 +13,7 @@ Module declaration_public
' Description of the form
Public Const AppName As String = "VECTO_CSE" ' Name of the programm
- Public Const AppVers As String = "2.0.2-beta6" ' Version of the Programm
+ Public Const AppVers As String = "2.0.3-beta6" ' Version of the Programm
Public AppDate As String ' Date of the compilation of the programm
' Control variables
diff --git a/CSE/utils.vb b/CSE/utils.vb
index c38fbc48c31b37ed3c3da32de798aa73fc7349cd..bc5145fe801d8ec6c522038046550041beb3ca05 100644
--- a/CSE/utils.vb
+++ b/CSE/utils.vb
@@ -151,8 +151,7 @@ Module utils
End Function
#End Region ' File paths'
- ' Function for a linear interpolation
-
+ ' Functions for linear interpolation
#Region "Calculation programms"
' Function for a linear interpolation
diff --git a/DemoData/EvaluationDemo.csjob.json b/DemoData/EvaluationDemo.csjob.json
index 64744b5ac5419eebdba1761cf667c97020056f18..8e0918aafc44dc3845ab583083a2598fd691dc4a 100644
--- a/DemoData/EvaluationDemo.csjob.json
+++ b/DemoData/EvaluationDemo.csjob.json
@@ -2,380 +2,11 @@
"Header": {
"Title": "vecto-cse JOB",
"FileVersion": "1.0.0",
- "AppVersion": "2.0.2-beta6",
- "ModifiedDate": "2015.07.20 13:28:31 +02:00",
+ "AppVersion": "2.0.3-beta6",
+ "ModifiedDate": "2015.07.23 13:10:27 +02:00",
"CreatedBy": "VKMTHD\\martindippold@Dippold(lic: 88070b7c-1b69-4d65-a112-10c57f86f5ad)",
"StrictBody": null,
- "BodySchema": {
- "title": "Schema for vecto-cse VEHICLE",
- "type": "object",
- "additionalProperties": true,
- "required": true,
- "properties": {
- "vehicle_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to Vehicle file (*.csveh)"
- },
- "ambient_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to the Ambient(Weather) file (*.csamb)"
- },
- "calib_track_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to Track-sections (*.csmsc)."
- },
- "calib_run_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to a measurement-file (*.csdat)"
- },
- "coast_track_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to Track-sections (*.csmsc)."
- },
- "low1_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to a measurement-file (*.csdat)"
- },
- "high_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to a measurement-file (*.csdat)"
- },
- "low2_fpath": {
- "type": [
- "null",
- "string"
- ],
- "description": "File-path to a measurement-file (*.csdat)"
- },
- "fv_veh": {
- "type": "number",
- "description": "Calibration factor for vehicle speed.",
- "default": 0
- },
- "fv_pe": {
- "type": "number",
- "description": "Calibration factor for air speed (position error).",
- "default": 0
- },
- "fa_pe": {
- "type": "number",
- "description": "Position error correction factor for measured air inflow angle (beta).",
- "default": 1
- },
- "beta_ame": {
- "type": "number",
- "description": "Calibration factor for beta (misalignment).",
- "default": 0,
- "units": "°"
- },
- "CdxAß": {
- "type": "number",
- "description": "Average CdxA before yaw angle correction",
- "default": 0,
- "units": "m^2"
- },
- "beta": {
- "type": "number",
- "description": "Average absolute yaw angle from high speed tests.",
- "default": 0,
- "units": "m^2"
- },
- "delta_CdxA": {
- "type": "number",
- "description": "Correction of CdxA for yaw angle.",
- "default": 0,
- "units": "m^2"
- },
- "CdxA0": {
- "type": "number",
- "description": "Correction of CdxA for zero yaw angle.",
- "default": 0,
- "units": "m^2"
- },
- "CdxA0_opt2": {
- "type": "number",
- "description": "Average CdxA for zero yaw angle (yaw angle correction performed before averaging of measurement sections).",
- "default": 0,
- "units": "m^2"
- },
- "valid_t_amb": {
- "type": "boolean",
- "description": "Invalid if the ambient temperature fallen below minimum.",
- "default": true
- },
- "valid_RRC": {
- "type": "boolean",
- "description": "Invalid if the ambient temperature higher than allowed.",
- "default": true
- },
- "Criteria": {
- "title": "Schema for vecto-cse CRITERIA",
- "type": "object",
- "additionalProperties": true,
- "required": true,
- "properties": {
- "Processing": {
- "type": "object",
- "required": true,
- "additionalProperties": true,
- "properties": {
- "accel_correction": {
- "type": "boolean",
- "required": true,
- "description": "When True, applies acceleration correction."
- },
- "gradient_correction": {
- "type": "boolean",
- "required": true,
- "description": "When True, applies gradient correction."
- },
- "hz_out": {
- "type": "integer",
- "required": true,
- "description": "The output-rate of the result files.",
- "units": "Hz"
- },
- "rr_corr_factor": {
- "type": "number",
- "required": true,
- "description": "Rolling resistance correction factor"
- },
- "acc_corr_avg": {
- "type": "number",
- "required": true,
- "description": "Averaging of vehicle speed for correction of acceleration forces.",
- "units": "s"
- },
- "dist_float": {
- "type": "number",
- "required": true,
- "description": "Distance used for calculation of floatinig average signal used for stability criteria in low speeds.",
- "units": "m"
- }
- }
- },
- "Validation": {
- "type": "object",
- "required": true,
- "additionalProperties": true,
- "properties": {
- "trigger_delta_x_max": {
- "type": "number",
- "required": true,
- "description": "+/- size of the control area around a MS start/end point where a trigger signal is valid (driving direction).",
- "units": "m"
- },
- "trigger_delta_y_max": {
- "type": "number",
- "required": true,
- "description": "+/- size of the control area around a MS start/end point where a trigger signal is valid (perpendicular to driving direction)",
- "units": "m"
- },
- "delta_head_max": {
- "type": "number",
- "required": true,
- "description": "+/- maximum deviation from heading as read from the csdat-file to the heading from csms-file for a valid dataset.",
- "units": "°"
- },
- "segruns_min_CAL": {
- "type": "integer",
- "required": true,
- "description": "Minimum number of valid datasets required for the calibration test (per combination of MS ID and DIR ID)."
- },
- "segruns_min_LS": {
- "type": "integer",
- "required": true,
- "description": "Minimum number of valid datasets required for the low speed (per combination of MS ID and DIR ID)."
- },
- "segruns_min_HS": {
- "type": "integer",
- "required": true,
- "description": "Minimum number of valid datasets required for the high speed (per combination of MS ID and DIR ID)."
- },
- "segruns_min_head_MS": {
- "type": "integer",
- "required": true,
- "description": "Minimum TOTAL number of valid datasets required for the high speed per heading."
- },
- "delta_Hz_max": {
- "type": "number",
- "required": true,
- "description": "Maximum allowed deviation of timestep-size in csdat-file from 100Hz.",
- "units": "%"
- },
- "delta_parallel_max": {
- "type": "number",
- "required": true,
- "description": "Maximum heading difference for measurement section (parallelism criteria for test track layout).",
- "units": "°"
- },
- "v_wind_avg_max_CAL": {
- "type": "number",
- "required": true,
- "description": "Maximum average wind speed (calibration).",
- "units": "m/s"
- },
- "v_wind_1s_max_CAL": {
- "type": "number",
- "required": true,
- "description": "Maximum gust wind speed (calibration).",
- "units": "m/s"
- },
- "beta_avg_max_CAL": {
- "type": "number",
- "required": true,
- "description": "Maximum average beta (calibration).",
- "units": "°"
- },
- "leng_crit": {
- "type": "number",
- "required": true,
- "description": "Maximum absolute difference of distance driven with lenght of section as specified in configuration",
- "units": "M"
- },
- "v_wind_avg_max_LS": {
- "type": "number",
- "required": true,
- "description": "Maximum average wind speed during (low speed).",
- "units": "m/s"
- },
- "v_wind_1s_max_LS": {
- "type": "number",
- "required": true,
- "description": "Maximum gust wind speed (low speed).",
- "units": "m/s"
- },
- "v_veh_avg_min_LS": {
- "type": "number",
- "required": true,
- "description": "Minimum average vehicle speed (low speed).",
- "units": "km/h"
- },
- "v_veh_avg_max_LS": {
- "type": "number",
- "required": true,
- "description": "Maximum average vehicle speed (low speed).",
- "units": "km/h"
- },
- "v_veh_float_delta_LS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum deviation of floating average vehicle speed from average vehicle speed over entire section (low speed)",
- "units": "km/h"
- },
- "tq_sum_float_delta_LS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum relative deviation of floating average torque from average torque over entire section (low speed test)"
- },
- "delta_n_ec_LS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum relative deviation of variance of engine/card speed compared to variance in vehicle speed (used as plausibility check for engine speed signal) (low speed test)"
- },
- "v_wind_avg_max_HS": {
- "type": "number",
- "required": true,
- "description": "Maximum average wind speed (high speed).",
- "units": "m/s"
- },
- "v_wind_1s_max_HS": {
- "type": "number",
- "required": true,
- "description": "Maximum gust wind speed (high speed).",
- "units": "m/s"
- },
- "beta_avg_max_HS": {
- "type": "number",
- "required": true,
- "description": "Maximum average beta during (high speed).",
- "units": "°"
- },
- "v_veh_avg_min_HS": {
- "type": "number",
- "required": true,
- "description": "Minimum average vehicle speed (high speed).",
- "units": "km/h"
- },
- "v_veh_1s_delta_HS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum deviation of 1s average vehicle speed from average vehicle speed over entire section (high speed).",
- "units": "km/h"
- },
- "tq_sum_1s_delta_HS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum relative deviation of 1s average torque from average torque over entire section (high speed)."
- },
- "delta_n_ec_HS": {
- "type": "number",
- "required": true,
- "description": "+/- maximum relative deviation of variance of engine/card speed compared to variance in vehicle speed (used as plausibility check for engine/card speed signal) (high speed test)."
- },
- "delta_t_tyre_max": {
- "type": "number",
- "required": true,
- "description": "Maximum variation of tyre temperature between high speeds and low speeds.",
- "units": "°C"
- },
- "delta_rr_corr_max": {
- "type": "number",
- "required": true,
- "description": "Maximum difference of RRC from the two low speed runs.",
- "units": "kg/t"
- },
- "t_amb_min": {
- "type": "number",
- "required": true,
- "description": "Minimum ambient temperature (measured at the vehicle) during the tests (evaluated based on the used datasets only)",
- "units": "°C"
- },
- "t_amb_max": {
- "type": "number",
- "required": true,
- "description": "Maximum ambient temperature (measured at the vehicle) during the tests (evaluated based on the used datasets only) .",
- "units": "°C"
- },
- "t_amb_var": {
- "type": "number",
- "required": true,
- "description": "Maximum variation of ambient temperature (measured at the vehicle) during the tests (evaluated based on the used datasets only).",
- "units": "°C"
- },
- "t_amb_tarmac": {
- "type": "number",
- "required": true,
- "description": "Maximum temperature below which no documentation of tarmac conditions is necessary.",
- "units": "°C"
- }
- }
- }
- }
- }
- }
- }
+ "BodySchema": null
},
"Body": {
"vehicle_fpath": "DemoData\\VehicleDemo.csveh.json",
@@ -426,9 +57,9 @@
"delta_t_tyre_max": 5.0,
"delta_rr_corr_max": 0.3,
"t_amb_min": 0.0,
- "t_amb_max": 35.0,
+ "t_amb_max": 25.0,
"t_amb_var": 3.0,
- "t_amb_tarmac": 25.0
+ "t_ground_max": 40.0
}
},
"fv_veh": 0.971,
@@ -441,6 +72,7 @@
"CdxA0": 5.14219,
"CdxA0_opt2": 5.13966,
"valid_t_amb": true,
- "valid_RRC": false
+ "valid_RRC": false,
+ "valid_t_ground": true
}
}
\ No newline at end of file
diff --git a/DemoData/StandardCriteria.cscrt.json b/DemoData/StandardCriteria.cscrt.json
index 26618989cfe3902b1d2556062cb098eeb743b6ba..4b1508db5eb5768b118aaac1ffcd11211c663511 100644
--- a/DemoData/StandardCriteria.cscrt.json
+++ b/DemoData/StandardCriteria.cscrt.json
@@ -2,8 +2,8 @@
"Header": {
"Title": "vecto-cse CRITERIA",
"FileVersion": "1.0.0",
- "AppVersion": "2.0.2-beta6",
- "ModifiedDate": "2015.07.20 09:06:42 +02:00",
+ "AppVersion": "2.0.3-beta6",
+ "ModifiedDate": "2015.07.22 09:50:03 +02:00",
"CreatedBy": "VKMTHD\\martindippold@Dippold(lic: 88070b7c-1b69-4d65-a112-10c57f86f5ad)",
"StrictBody": null,
"BodySchema": null
@@ -48,9 +48,9 @@
"delta_t_tyre_max": 5.0,
"delta_rr_corr_max": 0.3,
"t_amb_min": 0.0,
- "t_amb_max": 35.0,
+ "t_amb_max": 25.0,
"t_amb_var": 3.0,
- "t_amb_tarmac": 25.0
+ "t_ground_max": 40.0
}
}
}
\ No newline at end of file
diff --git a/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm b/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm
index 1a4d88bcb660c96c44ae64dce4b47b0c6ba0533c..f8c49968c7d65bfd07c912a2039dae4237b3c737 100644
Binary files a/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm and b/DemoData/VECTO-CSE3.0_InputData_V2.0.2_DemoData.xlsm differ
diff --git a/Docs/VECTO-CSE_ReleaseNotes_2.0.2-beta6.pdf b/Docs/VECTO-CSE_ReleaseNotes_2.0.2-beta6.pdf
deleted file mode 100644
index 00c3a80379413dfd95b7dcbbe0e100d0c1865935..0000000000000000000000000000000000000000
Binary files a/Docs/VECTO-CSE_ReleaseNotes_2.0.2-beta6.pdf and /dev/null differ
diff --git a/Docs/VECTO-CSE_ReleaseNotes_2.0.3-beta6.pdf b/Docs/VECTO-CSE_ReleaseNotes_2.0.3-beta6.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..283274866f084ae24900bd99e017da11d015924a
Binary files /dev/null and b/Docs/VECTO-CSE_ReleaseNotes_2.0.3-beta6.pdf differ