diff --git a/CSE/CSE.vbproj b/CSE/CSE.vbproj
index 17f2a44a77339ccb620d9fd5bc71707e80c5953e..49d347950f34a517ebe34b7468c8abf0c48372d1 100644
--- a/CSE/CSE.vbproj
+++ b/CSE/CSE.vbproj
@@ -116,6 +116,7 @@
<Compile Include="Classes\cValidSec.vb" />
<Compile Include="IO\cVehicle.vb" />
<Compile Include="Classes\cVirtMSC.vb" />
+ <Compile Include="IO\DirectStart.vb" />
<Compile Include="IO\output.vb" />
<Compile Include="IO\OutputTest.vb" />
<Compile Include="Calculation\Minor_routines_calculate.vb" />
diff --git a/CSE/CSE_Globals.vb b/CSE/CSE_Globals.vb
index aab8cdbd36bdb45eb104f1324b78261912eee474..09ea2fdeedf8803b707d987bcf931b73d305fb54 100644
--- a/CSE/CSE_Globals.vb
+++ b/CSE/CSE_Globals.vb
@@ -17,8 +17,8 @@ Module CSE_Globals
hdg
v_veh_GPS
v_veh_CAN
- vair_ar
- beta_ar
+ vair_ic
+ beta_ic
n_eng
tq_l
tq_r
@@ -50,9 +50,9 @@ Module CSE_Globals
lati_root
longi_root
v_veh_c
- vair_ic
+ 'vair_ic
vair_uf
- beta_ic
+ 'beta_ic
beta_uf
vwind_ha
vwind_c
@@ -95,11 +95,9 @@ Module CSE_Globals
v_MSC_GPS
s_MSC
v_veh_CAN
- vair_ar
vair_ic
vair_uf
vair
- beta_ar
beta_ic
beta_uf
user_valid
@@ -213,9 +211,9 @@ Module CSE_Globals
Case sKey.Meas.v_veh_CAN
Return tComp.v_veh_CAN
Case sKey.Meas.v_air
- Return tComp.vair_ar
+ Return tComp.vair_ic
Case sKey.Meas.beta
- Return tComp.beta_ar
+ Return tComp.beta_ic
Case sKey.Meas.n_eng
Return tComp.n_eng
Case sKey.Meas.tq_l
@@ -285,10 +283,10 @@ Module CSE_Globals
Return "v_veh_GPS"
Case tComp.v_veh_CAN
Return "v_veh_CAN"
- Case tComp.vair_ar
- Return "vair_ar"
- Case tComp.beta_ar
- Return "beta_ar"
+ Case tComp.vair_ic
+ Return "vair_ic"
+ Case tComp.beta_ic
+ Return "beta_ic"
Case tComp.n_eng
Return "n_eng"
Case tComp.tq_l
@@ -328,9 +326,9 @@ Module CSE_Globals
Return "[km/h]"
Case tComp.v_veh_CAN
Return "[km/h]"
- Case tComp.vair_ar
+ Case tComp.vair_ic
Return "[m/s]"
- Case tComp.beta_ar
+ Case tComp.beta_ic
Return "[°]"
Case tComp.n_eng
Return "[rpm]"
@@ -380,12 +378,8 @@ Module CSE_Globals
Return "Time"
Case tCompCali.v_veh_c
Return "v_veh"
- Case tCompCali.vair_ic
- Return "vair_ic"
Case tCompCali.vair_uf
Return "vair_uf"
- Case tCompCali.beta_ic
- Return "beta_ic"
Case tCompCali.beta_uf
Return "beta_uf"
Case tCompCali.vwind_c
@@ -467,12 +461,8 @@ Module CSE_Globals
Select Case ID
Case tCompCali.v_veh_c
Return "[km/h]"
- Case tCompCali.vair_ic
- Return "[m/s]"
Case tCompCali.vair_uf
Return "[m/s]"
- Case tCompCali.beta_ic
- Return "[°]"
Case tCompCali.beta_uf
Return "[°]"
Case tCompCali.vwind_c
@@ -572,16 +562,12 @@ Module CSE_Globals
Return "v_veh_CAN"
Case tCompErg.v_veh
Return "v_veh"
- Case tCompErg.vair_ar
- Return "vair_ar"
Case tCompErg.vair_ic
Return "vair_ic"
Case tCompErg.vair_uf
Return "vair_uf"
Case tCompErg.vair
Return "vair"
- Case tCompErg.beta_ar
- Return "beta_ar"
Case tCompErg.beta_ic
Return "beta_ic"
Case tCompErg.beta_uf
@@ -729,16 +715,16 @@ Module CSE_Globals
Return "[km/h]"
Case tCompErg.v_veh
Return "[km/h]"
- Case tCompErg.vair_ar
- Return "[m/s]"
+ 'Case tCompErg.vair_ar
+ ' Return "[m/s]"
Case tCompErg.vair_ic
Return "[m/s]"
Case tCompErg.vair_uf
Return "[m/s]"
Case tCompErg.vair
Return "[m/s]"
- Case tCompErg.beta_ar
- Return "[°]"
+ 'Case tCompErg.beta_ar
+ ' Return "[°]"
Case tCompErg.beta_ic
Return "[°]"
Case tCompErg.beta_uf
diff --git a/CSE/Calculation/Signal_identification.vb b/CSE/Calculation/Signal_identification.vb
index 39548c79e58a5a57137c63dcf518514d300e5c17..b8cbda820a5c30594b90be506b321297e0a78348 100644
--- a/CSE/Calculation/Signal_identification.vb
+++ b/CSE/Calculation/Signal_identification.vb
@@ -408,8 +408,6 @@ Module Signal_identification
' Calculate the section average values
For i = 0 To CalcData(tCompCali.SecID).Count - 1
- CalcData(tCompCali.vair_ic).Add(InputData(tComp.vair_ar)(i) * Job.v_air_f + Job.v_air_d)
- CalcData(tCompCali.beta_ic).Add(InputData(tComp.beta_ar)(i) * Job.beta_f + Job.beta_d)
For Each sKVC In CalcData
If CalcData(sKVC.Key).Count <= i Then
CalcData(sKVC.Key).Add(0)
@@ -429,10 +427,8 @@ Module Signal_identification
Next
ErgValues(tCompErg.delta_t).Add(InputData(tComp.t)(i))
ErgValues(tCompErg.v_veh_CAN).Add(InputData(tComp.v_veh_CAN)(i))
- ErgValues(tCompErg.vair_ar).Add(InputData(tComp.vair_ar)(i))
- ErgValues(tCompErg.vair_ic).Add(CalcData(tCompCali.vair_ic)(i))
- ErgValues(tCompErg.beta_ar).Add(InputData(tComp.beta_ar)(i))
- ErgValues(tCompErg.beta_ic).Add(CalcData(tCompCali.beta_ic)(i))
+ ErgValues(tCompErg.vair_ic).Add(InputData(tComp.vair_ic)(i))
+ ErgValues(tCompErg.beta_ic).Add(InputData(tComp.beta_ic)(i))
ErgValues(tCompErg.user_valid).Add(InputData(tComp.user_valid)(i))
ErgValues(tCompErg.valid).Add(1)
ErgValues(tCompErg.used).Add(1)
@@ -457,10 +453,8 @@ Module Signal_identification
If (ErgValues(tCompErg.SecID).Last = CalcData(tCompCali.SecID)(i)) And (ErgValues(tCompErg.DirID).Last = CalcData(tCompCali.DirID)(i)) Then
' Build the sum
ErgValues(tCompErg.v_veh_CAN)(run) += InputData(tComp.v_veh_CAN)(i)
- ErgValues(tCompErg.vair_ar)(run) += InputData(tComp.vair_ar)(i)
- ErgValues(tCompErg.vair_ic)(run) += CalcData(tCompCali.vair_ic)(i)
- ErgValues(tCompErg.beta_ar)(run) += InputData(tComp.beta_ar)(i)
- ErgValues(tCompErg.beta_ic)(run) += CalcData(tCompCali.beta_ic)(i)
+ ErgValues(tCompErg.vair_ic)(run) += InputData(tComp.vair_ic)(i)
+ ErgValues(tCompErg.beta_ic)(run) += InputData(tComp.beta_ic)(i)
ErgValues(tCompErg.user_valid)(run) += InputData(tComp.user_valid)(i)
If Not MSCX.tUse Then
ErgValues(tCompErg.v_MSC_GPS)(run) += InputData(tComp.v_veh_GPS)(i)
@@ -474,9 +468,7 @@ Module Signal_identification
' Calculate the results from the last section
ErgValues(tCompErg.delta_t)(run) = InputData(tComp.t)(i - 1) - ErgValues(tCompErg.delta_t)(run)
ErgValues(tCompErg.v_veh_CAN)(run) = ErgValues(tCompErg.v_veh_CAN)(run) / anz
- ErgValues(tCompErg.vair_ar)(run) = ErgValues(tCompErg.vair_ar)(run) / anz
ErgValues(tCompErg.vair_ic)(run) = ErgValues(tCompErg.vair_ic)(run) / anz
- ErgValues(tCompErg.beta_ar)(run) = ErgValues(tCompErg.beta_ar)(run) / anz
ErgValues(tCompErg.beta_ic)(run) = ErgValues(tCompErg.beta_ic)(run) / anz
ErgValues(tCompErg.v_MSC)(run) = (ErgValues(tCompErg.s_MSC)(run) / ErgValues(tCompErg.delta_t)(run)) * 3.6
ErgValues(tCompErg.user_valid)(run) = ErgValues(tCompErg.user_valid)(run) / anz
@@ -499,10 +491,8 @@ Module Signal_identification
Next
ErgValues(tCompErg.delta_t).Add(InputData(tComp.t)(i))
ErgValues(tCompErg.v_veh_CAN).Add(InputData(tComp.v_veh_CAN)(i))
- ErgValues(tCompErg.vair_ar).Add(InputData(tComp.vair_ar)(i))
- ErgValues(tCompErg.vair_ic).Add(CalcData(tCompCali.vair_ic)(i))
- ErgValues(tCompErg.beta_ar).Add(InputData(tComp.beta_ar)(i))
- ErgValues(tCompErg.beta_ic).Add(CalcData(tCompCali.beta_ic)(i))
+ ErgValues(tCompErg.vair_ic).Add(InputData(tComp.vair_ic)(i))
+ ErgValues(tCompErg.beta_ic).Add(InputData(tComp.beta_ic)(i))
ErgValues(tCompErg.user_valid).Add(InputData(tComp.user_valid)(i))
ErgValues(tCompErg.valid).Add(1)
ErgValues(tCompErg.used).Add(1)
@@ -531,9 +521,7 @@ Module Signal_identification
' Calculate the results from the last section
ErgValues(tCompErg.delta_t)(run) = InputData(tComp.t)(i - 1) - ErgValues(tCompErg.delta_t)(run)
ErgValues(tCompErg.v_veh_CAN)(run) = ErgValues(tCompErg.v_veh_CAN)(run) / anz
- ErgValues(tCompErg.vair_ar)(run) = ErgValues(tCompErg.vair_ar)(run) / anz
ErgValues(tCompErg.vair_ic)(run) = ErgValues(tCompErg.vair_ic)(run) / anz
- ErgValues(tCompErg.beta_ar)(run) = ErgValues(tCompErg.beta_ar)(run) / anz
ErgValues(tCompErg.beta_ic)(run) = ErgValues(tCompErg.beta_ic)(run) / anz
ErgValues(tCompErg.v_MSC)(run) = (ErgValues(tCompErg.s_MSC)(run) / ErgValues(tCompErg.delta_t)(run)) * 3.6
ErgValues(tCompErg.user_valid)(run) = ErgValues(tCompErg.user_valid)(run) / anz
diff --git a/CSE/Calculation/main_calculation_call.vb b/CSE/Calculation/main_calculation_call.vb
index dd61d26fa23303d9bbc27480ce32e8b5ded9ff9f..0000b2ee9fc105fe5285bcbbcd39b04229980e0e 100644
--- a/CSE/Calculation/main_calculation_call.vb
+++ b/CSE/Calculation/main_calculation_call.vb
@@ -409,7 +409,7 @@ Public Module main_calculation_call
Next i
Job.fv_pe = Job.fv_pe / (UBound(CalcX) + 1)
- Job.beta_ame += beta_ges / num
+ Job.beta_ame += beta_ges / num - AmeAng
Return True
End Function
@@ -426,10 +426,10 @@ Public Module main_calculation_call
' Calculate the values
For i = 0 To CalcData(tCompCali.lati_UTM).Count - 1
- CalcData(tCompCali.vair_uf)(i) = (CalcData(tCompCali.vair_ic)(i) * Job.fv_pe)
- CalcData(tCompCali.beta_uf)(i) = ((CalcData(tCompCali.beta_ic)(i) - Job.beta_ame) * Job.fa_pe)
- vwind_x_ha = CalcData(tCompCali.vair_uf)(i) * Math.Cos(CalcData(tCompCali.beta_uf)(i) * Math.PI / 180) - CalcData(tCompCali.v_veh_c)(i) / 3.6
- vwind_y_ha = CalcData(tCompCali.vair_uf)(i) * Math.Sin(CalcData(tCompCali.beta_uf)(i) * Math.PI / 180)
+ CalcData(tCompCali.vair_uf)(i) = (InputData(tComp.vair_ic)(i) * Job.fv_pe)
+ CalcData(tCompCali.beta_uf)(i) = ((InputData(tComp.beta_ic)(i) - Job.beta_ame) * Job.fa_pe)
+ vwind_x_ha = CalcData(tCompCali.vair_uf)(i) * Math.Cos((CalcData(tCompCali.beta_uf)(i) - AmeAng) * Math.PI / 180) - CalcData(tCompCali.v_veh_c)(i) / 3.6
+ vwind_y_ha = CalcData(tCompCali.vair_uf)(i) * Math.Sin((CalcData(tCompCali.beta_uf)(i) - AmeAng) * Math.PI / 180)
CalcData(tCompCali.vwind_ha)(i) = (Math.Sqrt(vwind_x_ha ^ 2 + vwind_y_ha ^ 2))
' Calculate the steps
diff --git a/CSE/GUI/F_Main.Designer.vb b/CSE/GUI/F_Main.Designer.vb
index b7e726784e45e3c75cccaf14df8aac8c58863789..b98c42f94357749edb087e74e4073fa65c535c78 100644
--- a/CSE/GUI/F_Main.Designer.vb
+++ b/CSE/GUI/F_Main.Designer.vb
@@ -52,19 +52,6 @@ Partial Class F_Main
Me.GB_hz_out = New System.Windows.Forms.GroupBox()
Me.RB100Hz = New System.Windows.Forms.RadioButton()
Me.RB1Hz = New System.Windows.Forms.RadioButton()
- Me.GB_Anemometer = New System.Windows.Forms.GroupBox()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.Label11 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.TextBoxbetaf = New System.Windows.Forms.TextBox()
- Me.TextBoxbetad = New System.Windows.Forms.TextBox()
- Me.TextBoxAirf = New System.Windows.Forms.TextBox()
- Me.TextBoxAird = New System.Windows.Forms.TextBox()
Me.CB_gradient_correction = New System.Windows.Forms.CheckBox()
Me.CB_accel_correction = New System.Windows.Forms.CheckBox()
Me.GroupBoxInput = New System.Windows.Forms.GroupBox()
@@ -112,8 +99,6 @@ Partial Class F_Main
Me.TextBoxVeh = New System.Windows.Forms.TextBox()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TPMain = New System.Windows.Forms.TabPage()
- Me.PbInfoIconMain = New System.Windows.Forms.PictureBox()
- Me.TBInfoMain = New System.Windows.Forms.TextBox()
Me.TPCriteria = New System.Windows.Forms.TabPage()
Me.GroupBox7 = New System.Windows.Forms.GroupBox()
Me.Label26 = New System.Windows.Forms.Label()
@@ -233,7 +218,6 @@ Partial Class F_Main
Me.MenuStrip1.SuspendLayout()
Me.GroupBoxJob.SuspendLayout()
Me.GB_hz_out.SuspendLayout()
- Me.GB_Anemometer.SuspendLayout()
Me.GroupBoxInput.SuspendLayout()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -245,7 +229,6 @@ Partial Class F_Main
Me.TabPageErr.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TPMain.SuspendLayout()
- CType(Me.PbInfoIconMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TPCriteria.SuspendLayout()
Me.GroupBox7.SuspendLayout()
Me.GroupBox8.SuspendLayout()
@@ -502,135 +485,6 @@ Partial Class F_Main
Me.RB1Hz.Text = "1Hz"
Me.RB1Hz.UseVisualStyleBackColor = True
'
- 'GB_Anemometer
- '
- Me.GB_Anemometer.Controls.Add(Me.Label13)
- Me.GB_Anemometer.Controls.Add(Me.Label12)
- Me.GB_Anemometer.Controls.Add(Me.Label11)
- Me.GB_Anemometer.Controls.Add(Me.Label10)
- Me.GB_Anemometer.Controls.Add(Me.Label6)
- Me.GB_Anemometer.Controls.Add(Me.Label5)
- Me.GB_Anemometer.Controls.Add(Me.Label4)
- Me.GB_Anemometer.Controls.Add(Me.Label3)
- Me.GB_Anemometer.Controls.Add(Me.TextBoxbetaf)
- Me.GB_Anemometer.Controls.Add(Me.TextBoxbetad)
- Me.GB_Anemometer.Controls.Add(Me.TextBoxAirf)
- Me.GB_Anemometer.Controls.Add(Me.TextBoxAird)
- Me.GB_Anemometer.Location = New System.Drawing.Point(335, 72)
- Me.GB_Anemometer.Name = "GB_Anemometer"
- Me.GB_Anemometer.Size = New System.Drawing.Size(463, 57)
- Me.GB_Anemometer.TabIndex = 23
- Me.GB_Anemometer.TabStop = False
- Me.GB_Anemometer.Text = "Anemometer instrument calibration"
- '
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(423, 23)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(17, 13)
- Me.Label13.TabIndex = 31
- Me.Label13.Text = "[°]"
- '
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(311, 23)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(16, 13)
- Me.Label12.TabIndex = 30
- Me.Label12.Text = "[-]"
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(194, 23)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(31, 13)
- Me.Label11.TabIndex = 29
- Me.Label11.Text = "[m/s]"
- '
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(86, 23)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(16, 13)
- Me.Label10.TabIndex = 28
- Me.Label10.Text = "[-]"
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(343, 23)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(37, 13)
- Me.Label6.TabIndex = 27
- Me.Label6.Text = "beta d"
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(231, 23)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(34, 13)
- Me.Label5.TabIndex = 26
- Me.Label5.Text = "beta f"
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(114, 23)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(39, 13)
- Me.Label4.TabIndex = 25
- Me.Label4.Text = "v_air d"
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(6, 23)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(36, 13)
- Me.Label3.TabIndex = 24
- Me.Label3.Text = "v_air f"
- '
- 'TextBoxbetaf
- '
- Me.TextBoxbetaf.Location = New System.Drawing.Point(271, 20)
- Me.TextBoxbetaf.Name = "TextBoxbetaf"
- Me.TextBoxbetaf.Size = New System.Drawing.Size(40, 20)
- Me.TextBoxbetaf.TabIndex = 10
- Me.TextBoxbetaf.Text = "1"
- Me.TextBoxbetaf.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- '
- 'TextBoxbetad
- '
- Me.TextBoxbetad.Location = New System.Drawing.Point(383, 20)
- Me.TextBoxbetad.Name = "TextBoxbetad"
- Me.TextBoxbetad.Size = New System.Drawing.Size(40, 20)
- Me.TextBoxbetad.TabIndex = 11
- Me.TextBoxbetad.Text = "0"
- Me.TextBoxbetad.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- '
- 'TextBoxAirf
- '
- Me.TextBoxAirf.Location = New System.Drawing.Point(46, 20)
- Me.TextBoxAirf.Name = "TextBoxAirf"
- Me.TextBoxAirf.Size = New System.Drawing.Size(40, 20)
- Me.TextBoxAirf.TabIndex = 8
- Me.TextBoxAirf.Text = "1"
- Me.TextBoxAirf.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- '
- 'TextBoxAird
- '
- Me.TextBoxAird.Location = New System.Drawing.Point(154, 20)
- Me.TextBoxAird.Name = "TextBoxAird"
- Me.TextBoxAird.Size = New System.Drawing.Size(40, 20)
- Me.TextBoxAird.TabIndex = 9
- Me.TextBoxAird.Text = "0"
- Me.TextBoxAird.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- '
'CB_gradient_correction
'
Me.CB_gradient_correction.AutoSize = True
@@ -644,8 +498,6 @@ Partial Class F_Main
'CB_accel_correction
'
Me.CB_accel_correction.AutoSize = True
- Me.CB_accel_correction.Checked = True
- Me.CB_accel_correction.CheckState = System.Windows.Forms.CheckState.Checked
Me.CB_accel_correction.Location = New System.Drawing.Point(6, 111)
Me.CB_accel_correction.Name = "CB_accel_correction"
Me.CB_accel_correction.Size = New System.Drawing.Size(111, 17)
@@ -671,7 +523,7 @@ Partial Class F_Main
Me.GroupBoxInput.Controls.Add(Me.ButtonMSCT)
Me.GroupBoxInput.Controls.Add(Me.ButtonSelectMSCT)
Me.GroupBoxInput.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.GroupBoxInput.Location = New System.Drawing.Point(5, 274)
+ Me.GroupBoxInput.Location = New System.Drawing.Point(5, 261)
Me.GroupBoxInput.Margin = New System.Windows.Forms.Padding(2)
Me.GroupBoxInput.Name = "GroupBoxInput"
Me.GroupBoxInput.Padding = New System.Windows.Forms.Padding(2)
@@ -867,7 +719,7 @@ Partial Class F_Main
Me.ButtonCalC.Location = New System.Drawing.Point(837, 18)
Me.ButtonCalC.Margin = New System.Windows.Forms.Padding(2)
Me.ButtonCalC.Name = "ButtonCalC"
- Me.ButtonCalC.Size = New System.Drawing.Size(60, 111)
+ Me.ButtonCalC.Size = New System.Drawing.Size(60, 50)
Me.ButtonCalC.TabIndex = 12
Me.ButtonCalC.Text = "Calibrate"
Me.ButtonCalC.TextAlign = System.Drawing.ContentAlignment.BottomCenter
@@ -881,14 +733,13 @@ Partial Class F_Main
Me.GroupBox1.Controls.Add(Me.TextBoxDataC)
Me.GroupBox1.Controls.Add(Me.ButtonDataC)
Me.GroupBox1.Controls.Add(Me.ButtonSelectDataC)
- Me.GroupBox1.Controls.Add(Me.GB_Anemometer)
Me.GroupBox1.Controls.Add(Me.TextBoxMSCC)
Me.GroupBox1.Controls.Add(Me.ButtonMSCC)
Me.GroupBox1.Controls.Add(Me.ButtonSelectMSCC)
Me.GroupBox1.Controls.Add(Me.ButtonCalC)
Me.GroupBox1.Location = New System.Drawing.Point(6, 81)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(906, 138)
+ Me.GroupBox1.Size = New System.Drawing.Size(906, 79)
Me.GroupBox1.TabIndex = 33
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Calibration test"
@@ -970,7 +821,7 @@ Partial Class F_Main
Me.GroupBox3.Controls.Add(Me.TextBoxRAirPos)
Me.GroupBox3.Controls.Add(Me.Label7)
Me.GroupBox3.Controls.Add(Me.TextBoxRVeh)
- Me.GroupBox3.Location = New System.Drawing.Point(341, 225)
+ Me.GroupBox3.Location = New System.Drawing.Point(231, 166)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(463, 46)
Me.GroupBox3.TabIndex = 31
@@ -1071,7 +922,7 @@ Partial Class F_Main
Me.TabControlOutMsg.Controls.Add(Me.TabPageWar)
Me.TabControlOutMsg.Controls.Add(Me.TabPageErr)
Me.TabControlOutMsg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.TabControlOutMsg.Location = New System.Drawing.Point(8, 520)
+ Me.TabControlOutMsg.Location = New System.Drawing.Point(8, 510)
Me.TabControlOutMsg.Margin = New System.Windows.Forms.Padding(2)
Me.TabControlOutMsg.Name = "TabControlOutMsg"
Me.TabControlOutMsg.SelectedIndex = 0
@@ -1178,13 +1029,11 @@ Partial Class F_Main
Me.TabControl1.Location = New System.Drawing.Point(8, 72)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(925, 443)
+ Me.TabControl1.Size = New System.Drawing.Size(925, 433)
Me.TabControl1.TabIndex = 35
'
'TPMain
'
- Me.TPMain.Controls.Add(Me.PbInfoIconMain)
- Me.TPMain.Controls.Add(Me.TBInfoMain)
Me.TPMain.Controls.Add(Me.GroupBox3)
Me.TPMain.Controls.Add(Me.GroupBoxJob)
Me.TPMain.Controls.Add(Me.GroupBox1)
@@ -1192,28 +1041,11 @@ Partial Class F_Main
Me.TPMain.Location = New System.Drawing.Point(4, 22)
Me.TPMain.Name = "TPMain"
Me.TPMain.Padding = New System.Windows.Forms.Padding(3)
- Me.TPMain.Size = New System.Drawing.Size(917, 417)
+ Me.TPMain.Size = New System.Drawing.Size(917, 407)
Me.TPMain.TabIndex = 0
Me.TPMain.Text = "Main"
Me.TPMain.UseVisualStyleBackColor = True
'
- 'PbInfoIconMain
- '
- Me.PbInfoIconMain.Image = Global.CSE.My.Resources.Resources.Info
- Me.PbInfoIconMain.Location = New System.Drawing.Point(12, 204)
- Me.PbInfoIconMain.Name = "PbInfoIconMain"
- Me.PbInfoIconMain.Size = New System.Drawing.Size(25, 30)
- Me.PbInfoIconMain.TabIndex = 84
- Me.PbInfoIconMain.TabStop = False
- '
- 'TBInfoMain
- '
- Me.TBInfoMain.Location = New System.Drawing.Point(43, 176)
- Me.TBInfoMain.Multiline = True
- Me.TBInfoMain.Name = "TBInfoMain"
- Me.TBInfoMain.Size = New System.Drawing.Size(282, 78)
- Me.TBInfoMain.TabIndex = 85
- '
'TPCriteria
'
Me.TPCriteria.Controls.Add(Me.GroupBox7)
@@ -1226,7 +1058,7 @@ Partial Class F_Main
Me.TPCriteria.Location = New System.Drawing.Point(4, 22)
Me.TPCriteria.Name = "TPCriteria"
Me.TPCriteria.Padding = New System.Windows.Forms.Padding(3)
- Me.TPCriteria.Size = New System.Drawing.Size(917, 417)
+ Me.TPCriteria.Size = New System.Drawing.Size(917, 407)
Me.TPCriteria.TabIndex = 1
Me.TPCriteria.Text = "Criteria"
Me.TPCriteria.UseVisualStyleBackColor = True
@@ -1994,7 +1826,7 @@ Partial Class F_Main
Me.TBInfoCrt.Location = New System.Drawing.Point(37, 347)
Me.TBInfoCrt.Multiline = True
Me.TBInfoCrt.Name = "TBInfoCrt"
- Me.TBInfoCrt.Size = New System.Drawing.Size(413, 64)
+ Me.TBInfoCrt.Size = New System.Drawing.Size(413, 56)
Me.TBInfoCrt.TabIndex = 83
'
'PBInfoIconCrt
@@ -2370,8 +2202,6 @@ Partial Class F_Main
Me.GroupBoxJob.PerformLayout()
Me.GB_hz_out.ResumeLayout(False)
Me.GB_hz_out.PerformLayout()
- Me.GB_Anemometer.ResumeLayout(False)
- Me.GB_Anemometer.PerformLayout()
Me.GroupBoxInput.ResumeLayout(False)
Me.GroupBoxInput.PerformLayout()
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2386,8 +2216,6 @@ Partial Class F_Main
Me.TabPageErr.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TPMain.ResumeLayout(False)
- Me.TPMain.PerformLayout()
- CType(Me.PbInfoIconMain, System.ComponentModel.ISupportInitialize).EndInit()
Me.TPCriteria.ResumeLayout(False)
Me.TPCriteria.PerformLayout()
Me.GroupBox7.ResumeLayout(False)
@@ -2438,15 +2266,6 @@ Partial Class F_Main
Friend WithEvents TextBoxMSCC As System.Windows.Forms.TextBox
Friend WithEvents ButtonMSCC As System.Windows.Forms.Button
Friend WithEvents ButtonSelectMSCC As System.Windows.Forms.Button
- Friend WithEvents TextBoxAirf As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxAird As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxbetaf As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxbetad As System.Windows.Forms.TextBox
- Friend WithEvents GB_Anemometer As System.Windows.Forms.GroupBox
- Friend WithEvents Label6 As System.Windows.Forms.Label
- Friend WithEvents Label5 As System.Windows.Forms.Label
- Friend WithEvents Label4 As System.Windows.Forms.Label
- Friend WithEvents Label3 As System.Windows.Forms.Label
Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
Friend WithEvents Label9 As System.Windows.Forms.Label
Friend WithEvents TextBoxRBetaMis As System.Windows.Forms.TextBox
@@ -2474,10 +2293,6 @@ Partial Class F_Main
Friend WithEvents GB_hz_out As System.Windows.Forms.GroupBox
Friend WithEvents RB100Hz As System.Windows.Forms.RadioButton
Friend WithEvents RB1Hz As System.Windows.Forms.RadioButton
- Friend WithEvents Label13 As System.Windows.Forms.Label
- Friend WithEvents Label12 As System.Windows.Forms.Label
- Friend WithEvents Label11 As System.Windows.Forms.Label
- Friend WithEvents Label10 As System.Windows.Forms.Label
Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
Friend WithEvents TPMain As System.Windows.Forms.TabPage
Friend WithEvents TPCriteria As System.Windows.Forms.TabPage
@@ -2614,8 +2429,6 @@ Partial Class F_Main
Friend WithEvents MenuItemSaveJob As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents MenuItemSaveAsJob As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents MenuItemClearLog As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents TBInfoMain As System.Windows.Forms.TextBox
- Friend WithEvents PbInfoIconMain As System.Windows.Forms.PictureBox
Friend WithEvents MenuItemExit As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ToolStripMenuItem2 As System.Windows.Forms.ToolStripSeparator
diff --git a/CSE/GUI/F_Main.vb b/CSE/GUI/F_Main.vb
index 399a8fe4d9649c34f4bdf9dcdab508f7092c7c44..f7d2840e2f7c8ccae52c8f32beea23813e53db61 100644
--- a/CSE/GUI/F_Main.vb
+++ b/CSE/GUI/F_Main.vb
@@ -27,8 +27,6 @@ Public Class F_Main
Crt.hz_out = 1
PBInfoIconCrt.Visible = False
- TBInfoMain.Visible = False
- TBInfoMain.BackColor = System.Drawing.Color.LightYellow
TBInfoCrt.Visible = False
TBInfoCrt.BackColor = System.Drawing.Color.LightYellow
setupInfoBox()
@@ -91,6 +89,36 @@ Public Class F_Main
UI_PopulateFromCriteria()
End Sub
+ ' Show the GUI and start direct if neccessary
+ Private Sub F_Main_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+ ' If the start is done with command line then load jobfile and start calculation
+ If fGetArgs() Then
+ Dim reload As Boolean = True
+ doLoadJob(reload)
+
+ Try
+ ' Start the calibration
+ CalibrationHandler(sender, e)
+
+ ' Wait till Backgroundworker is no longer busy
+ Do While BWorker.IsBusy
+ Application.DoEvents()
+ Loop
+
+ ' Start the evaluation
+ EvaluationHandler(sender, e)
+
+ ' Wait till Backgroundworker is no longer busy
+ Do While BWorker.IsBusy
+ Application.DoEvents()
+ Loop
+ Finally
+ ' Close the form after calculation
+ Me.Close()
+ End Try
+ End If
+ End Sub
+
Private Sub ClickExitHandler(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MenuItemExit.Click
Me.Close()
End Sub
@@ -188,8 +216,6 @@ Public Class F_Main
Me.TextBoxRVeh.Text = Math.Round(Job.fv_veh, 3).ToString
Me.TextBoxRAirPos.Text = Math.Round(Job.fv_pe, 3).ToString
Me.TextBoxRBetaMis.Text = Math.Round(Job.beta_ame, 2).ToString
-
-
End Sub
@@ -478,11 +504,6 @@ Public Class F_Main
Job.vehicle_fpath = TextBoxVeh1.Text
Job.ambient_fpath = TextBoxWeather.Text
- Job.v_air_f = TextBoxAirf.Text
- Job.v_air_d = TextBoxAird.Text
- Job.beta_f = TextBoxbetaf.Text
- Job.beta_d = TextBoxbetad.Text
-
' Appropriate the inputfiles from calibration run
Job.calib_run_fpath = TextBoxDataC.Text
Job.calib_track_fpath = TextBoxMSCC.Text
@@ -561,10 +582,6 @@ Public Class F_Main
' Transfer the data to the GUI
' General
TextBoxVeh1.Text = Job.vehicle_fpath
- TextBoxAirf.Text = Job.v_air_f
- TextBoxAird.Text = Job.v_air_d
- TextBoxbetaf.Text = Job.beta_f
- TextBoxbetad.Text = Job.beta_d
TextBoxWeather.Text = Job.ambient_fpath
' Calibration
TextBoxMSCC.Text = Job.calib_track_fpath
@@ -657,10 +674,6 @@ Public Class F_Main
' Clear the Textboxes or set them to default
TextBoxVeh1.Clear()
TextBoxWeather.Clear()
- TextBoxAirf.Text = 1
- TextBoxAird.Text = 0
- TextBoxbetaf.Text = 1
- TextBoxbetad.Text = 0
CB_accel_correction.Checked = True
CB_gradient_correction.Checked = False
@@ -954,6 +967,7 @@ Public Class F_Main
If Not IsNothing(JobFile) Then
logme(8, False, format("The Job-file({0}) has changed because of criteria update", JobFile))
End If
+ Crt.accel_correction = True
UI_PopulateFromCriteria()
End Sub
@@ -1023,13 +1037,6 @@ Public Class F_Main
Dim schema As JObject
Dim controls As Control()
- controls = New Control() {
- Me.GB_Anemometer, Nothing
- }
- schema = JObject.Parse(cJob.JSchemaStr(isStrict))
- armControlsWithInfoBox(schema, controls, AddressOf showInfoBox_main, AddressOf hideInfoBox_main)
-
-
controls = New Control() {
Me.TB_rho_air_ref, LRhoAirRef, _
Me.CB_accel_correction, Nothing, _
@@ -1080,17 +1087,6 @@ Public Class F_Main
armControlsWithInfoBox(schema, controls, AddressOf showInfoBox_crt, AddressOf hideInfoBox_crt)
End Sub
- Private Sub showInfoBox_main(ByVal sender As Object, ByVal e As System.EventArgs)
- TBInfoMain.Text = sender.Tag
- TBInfoMain.Visible = True
- PbInfoIconMain.Visible = True
- End Sub
-
- Private Sub hideInfoBox_main(ByVal sender As Object, ByVal e As System.EventArgs)
- TBInfoMain.Visible = False
- PbInfoIconMain.Visible = False
- End Sub
-
Private Sub showInfoBox_crt(ByVal sender As Object, ByVal e As System.EventArgs)
TBInfoCrt.Text = sender.Tag
TBInfoCrt.Visible = True
@@ -1103,5 +1099,4 @@ Public Class F_Main
End Sub
#End Region
-
End Class
diff --git a/CSE/IO/DirectStart.vb b/CSE/IO/DirectStart.vb
new file mode 100644
index 0000000000000000000000000000000000000000..cb802c68739ca4745be7a321cabd2089247a3e76
--- /dev/null
+++ b/CSE/IO/DirectStart.vb
@@ -0,0 +1,16 @@
+Public Module DirectStart
+ ' Control if values are given with the start
+ Public Function fGetArgs() As Boolean
+ ' Get the command lines
+ Environment.GetCommandLineArgs()
+
+ ' Use the command lines to start the calculation
+ If Environment.GetCommandLineArgs().Length > 1 Then
+ JobFile = Environment.GetCommandLineArgs(1)
+ If Environment.GetCommandLineArgs().Length >= 3 Then OutFolder = Environment.GetCommandLineArgs(2)
+ Return True
+ Else
+ Return False
+ End If
+ End Function
+End Module
diff --git a/CSE/IO/cJob.vb b/CSE/IO/cJob.vb
index bd282db5d339f7b80328f617b585aeecb53e8849..5efb76969a4d1afea081588ae346193b89ceead1 100644
--- a/CSE/IO/cJob.vb
+++ b/CSE/IO/cJob.vb
@@ -28,7 +28,6 @@ Public Class cJob
Dim b As Object = New JObject()
b.vehicle_fpath = ""
b.ambient_fpath = ""
- 'b.Anemometer = Nothing 'JObject.Parse(<json>{'v_air_f':0, 'v_air_d': 0, beta_f':0, 'beta_d': 0}</json>)
b.calib_track_fpath = ""
b.calib_run_fpath = ""
b.coast_track_fpath = ""
@@ -67,11 +66,6 @@ Public Class cJob
<%= IIf(requireFPathExts, "'pattern': '^\\s*$|\\.csveh(\\.json)?$', ", "") %>
"description": "File-path to Vehicle file (*.csveh)",
},
- "Anemometer": {
- "type": "object",
- "description": "The Anemometer calibration factors (floats).",
- 'default': {'v_air_f':1, 'v_air_d': 0, 'beta_f':1, 'beta_d': 0},
- },
"ambient_fpath": {
"type": ["null", "string"],
<%= IIf(requireFPathExts, "'pattern': '^\\s*$|\\.csamb$', ", "") %>
@@ -243,11 +237,6 @@ Public Class cJob
#Region "json props"
- Public v_air_f As Double
- Public v_air_d As Double
- Public beta_f As Double
- Public beta_d As Double
-
Public fv_veh As Double
Public fv_veh_opt2 As Double
Public fa_pe As Double
@@ -262,26 +251,10 @@ Public Class cJob
Public valid_t_amb As Boolean
Public valid_RRC As Boolean
- Protected Overrides Sub OnContentUpdated()
- Dim anem = PropOrDefault(".Anemometer")
- Me.v_air_f = anem("v_air_f")
- Me.v_air_d = anem("v_air_d")
- Me.beta_f = anem("beta_f")
- Me.beta_d = anem("beta_d")
- End Sub
-
''' <summary>Override it to set custome fields</summary>
Protected Overrides Sub OnBeforeContentStored()
Dim b As Object = Me.Body
- Dim a As Object = New JObject()
- a.v_air_f = Me.v_air_f
- a.v_air_d = Me.v_air_d
- a.beta_f = Me.beta_f
- a.beta_d = Me.beta_d
-
- b.Anemometer = a
-
b.fv_veh = Math.Round(fv_veh, 3)
b.fa_pe = Math.Round(fa_pe, 3)
b.fv_pe = Math.Round(fv_pe, 3)
@@ -417,14 +390,6 @@ Public Class cJob
ambient_fpath = FileInVECTO.ReadLine(0)
Line = FileInVECTO.ReadLine
- Dim factors(3) As Single
- For i = 0 To UBound(factors) - 1
- factors(i) = Line(i)
- Next i
- Me.v_air_f = factors(0)
- Me.v_air_d = factors(1)
- Me.beta_f = factors(2)
- Me.beta_d = factors(3)
' Calibration test files
calib_track_fpath = FileInVECTO.ReadLine(0)
@@ -442,12 +407,10 @@ Public Class cJob
' Acceleration Correction
Line = FileInVECTO.ReadLine
crt.accel_correction = CBool(Line(0))
- 'CSEMain.CheckBoxAcc.Checked = False
' Gradient correction
Line = FileInVECTO.ReadLine
crt.gradient_correction = CBool(Line(0))
- 'CSEMain.CheckBoxGrd.Checked = False
' Output sequence
Line = FileInVECTO.ReadLine
diff --git a/CSE/IO/input.vb b/CSE/IO/input.vb
index fbca354cc302d555fe4177a381f35164a6b1bc62..1c6fcf33040c4e027894c41b56ae091b6d393f61 100644
--- a/CSE/IO/input.vb
+++ b/CSE/IO/input.vb
@@ -220,8 +220,8 @@ Public Module input
MeasCheck.Add(tComp.hdg, False)
MeasCheck.Add(tComp.v_veh_GPS, False)
MeasCheck.Add(tComp.v_veh_CAN, False)
- MeasCheck.Add(tComp.vair_ar, False)
- MeasCheck.Add(tComp.beta_ar, False)
+ MeasCheck.Add(tComp.vair_ic, False)
+ MeasCheck.Add(tComp.beta_ic, False)
MeasCheck.Add(tComp.n_eng, False)
MeasCheck.Add(tComp.tq_l, False)
MeasCheck.Add(tComp.tq_r, False)
@@ -345,13 +345,13 @@ Public Module input
End If
ElseIf sKV.Key = tComp.trigger Then
CalcData(tCompCali.trigger_c).Add(CDbl(Line(sKV.Value)))
- ElseIf sKV.Key = tComp.beta_ar Then
+ ElseIf sKV.Key = tComp.beta_ic Then
If InputData(sKV.Key)(tDim) > 360 Or InputData(sKV.Key)(tDim) < -360 Then
- Throw New Exception("The beta_ar angle is higher then +-360°! This is not a possible angle. Please correct.")
- ElseIf InputData(sKV.Key)(tDim) > 180 Then
- InputData(sKV.Key)(tDim) = InputData(sKV.Key)(tDim) - 360
- ElseIf InputData(sKV.Key)(tDim) < -180 Then
- InputData(sKV.Key)(tDim) = InputData(sKV.Key)(tDim) + 360
+ Throw New Exception("The beta_ic angle is higher then +-360°! This is not a possible angle. Please correct.")
+ 'ElseIf InputData(sKV.Key)(tDim) > 180 Then
+ ' InputData(sKV.Key)(tDim) = InputData(sKV.Key)(tDim) - 360
+ 'ElseIf InputData(sKV.Key)(tDim) < -180 Then
+ ' InputData(sKV.Key)(tDim) = InputData(sKV.Key)(tDim) + 360
End If
End If
Next sKV
diff --git a/CSE/IO/output.vb b/CSE/IO/output.vb
index e753737a451fca918020d1dd0c48f96a2120e689..f57ed1412f982f3002b6eaa048ec2d358c15dce7 100644
--- a/CSE/IO/output.vb
+++ b/CSE/IO/output.vb
@@ -294,8 +294,8 @@ Module output
AddToErg(tComp.hdg, fCompName(tComp.hdg), fCompUnit(tComp.hdg), "InputData")
AddToErg(tComp.v_veh_GPS, fCompName(tComp.v_veh_GPS), fCompUnit(tComp.v_veh_GPS), "InputData")
AddToErg(tComp.v_veh_CAN, fCompName(tComp.v_veh_CAN), fCompUnit(tComp.v_veh_CAN), "InputData")
- AddToErg(tComp.vair_ar, fCompName(tComp.vair_ar), fCompUnit(tComp.vair_ar), "InputData")
- AddToErg(tComp.beta_ar, fCompName(tComp.beta_ar), fCompUnit(tComp.beta_ar), "InputData")
+ AddToErg(tComp.vair_ic, fCompName(tComp.vair_ic), fCompUnit(tComp.vair_ic), "InputData")
+ AddToErg(tComp.beta_ic, fCompName(tComp.beta_ic), fCompUnit(tComp.beta_ic), "InputData")
AddToErg(tComp.n_eng, fCompName(tComp.n_eng), fCompUnit(tComp.n_eng), "InputData")
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")
@@ -324,10 +324,8 @@ Module output
AddToErg(tCompCali.alt, fCompName(tCompCali.alt), fCompUnit(tCompCali.alt), "CalcData")
AddToErg(tCompCali.v_veh_c, fCompName(tCompCali.v_veh_c), fCompUnit(tCompCali.v_veh_c), "CalcData")
AddToErg(tCompCali.dist, fCompName(tCompCali.dist), fCompUnit(tCompCali.dist), "CalcData")
- AddToErg(tCompCali.vair_ic, fCompName(tCompCali.vair_ic), fCompUnit(tCompCali.vair_ic), "CalcData")
AddToErg(tCompCali.vair_uf, fCompName(tCompCali.vair_uf), fCompUnit(tCompCali.vair_uf), "CalcData")
AddToErg(tCompCali.vair_c, fCompName(tCompCali.vair_c), fCompUnit(tCompCali.vair_c), "CalcData")
- AddToErg(tCompCali.beta_ic, fCompName(tCompCali.beta_ic), fCompUnit(tCompCali.beta_ic), "CalcData")
AddToErg(tCompCali.beta_uf, fCompName(tCompCali.beta_uf), fCompUnit(tCompCali.beta_uf), "CalcData")
AddToErg(tCompCali.beta_c, fCompName(tCompCali.beta_c), fCompUnit(tCompCali.beta_c), "CalcData")
AddToErg(tCompCali.vwind_ha, fCompName(tCompCali.vwind_ha), fCompUnit(tCompCali.vwind_ha), "CalcData")
@@ -372,10 +370,8 @@ Module output
AddToErg(tCompErg.v_MSC_GPS, fCompName(tCompErg.v_MSC_GPS), fCompUnit(tCompErg.v_MSC_GPS), "ErgValues")
AddToErg(tCompErg.v_veh_CAN, fCompName(tCompErg.v_veh_CAN), fCompUnit(tCompErg.v_veh_CAN), "ErgValues")
AddToErg(tCompErg.v_veh, fCompName(tCompErg.v_veh), fCompUnit(tCompErg.v_veh), "ErgValues")
- AddToErg(tCompErg.vair_ar, fCompName(tCompErg.vair_ar), fCompUnit(tCompErg.vair_ar), "ErgValues")
AddToErg(tCompErg.vair_ic, fCompName(tCompErg.vair_ic), fCompUnit(tCompErg.vair_ic), "ErgValues")
AddToErg(tCompErg.vair_uf, fCompName(tCompErg.vair_uf), fCompUnit(tCompErg.vair_uf), "ErgValues")
- AddToErg(tCompErg.beta_ar, fCompName(tCompErg.beta_ar), fCompUnit(tCompErg.beta_ar), "ErgValues")
AddToErg(tCompErg.beta_ic, fCompName(tCompErg.beta_ic), fCompUnit(tCompErg.beta_ic), "ErgValues")
AddToErg(tCompErg.beta_uf, fCompName(tCompErg.beta_uf), fCompUnit(tCompErg.beta_uf), "ErgValues")
AddToErg(tCompErg.valid, fCompName(tCompErg.valid), fCompUnit(tCompErg.valid), "ErgValues")
diff --git a/CSE/declaration_public.vb b/CSE/declaration_public.vb
index f0da7e7f9640274c26a311bc7e0f2596e446d648..16112e229ef53f6e7ba3621eeb9fae9898602c4d 100644
--- a/CSE/declaration_public.vb
+++ b/CSE/declaration_public.vb
@@ -47,6 +47,7 @@ Module declaration_public
Public Const IDHS = 0 ' Run ID for the high test run
Public Const f_rollHS = 1 ' Constant value for HS rolling resistance
Public Zone1CentralMeridian = -177 ' Central UTM zone meridian (Will be changed by zone adjustment)
+ Public Const AmeAng = 180 ' Installation angle of the anemomenter
' Constances for the array declaration