From 94d496cfa69346a00c58dac627a2a15b5ddc69d9 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Wed, 12 Nov 2014 15:22:46 +0000
Subject: [PATCH] WIP
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1673
---
.../AuxillaryTestHarness.vbproj | 2 +-
AuxillaryTestHarness/Dashboard.Designer.vb | 218 +++++++++---------
AuxillaryTestHarness/Dashboard.resx | 2 +-
VECTO/MODcalc/cVh.vb | 6 +-
.../DownstreamModules/IM10.vb | 23 ++
.../VectoAuxiliaries/DownstreamModules/M10.vb | 51 ++++
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 2 +
.../UnitTests/M6Tests.vb | 1 +
.../UnitTests/M9Tests.vb | 28 +++
9 files changed, 219 insertions(+), 114 deletions(-)
create mode 100644 VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
create mode 100644 VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
diff --git a/AuxillaryTestHarness/AuxillaryTestHarness.vbproj b/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
index 1a5a4e8914..5876413d9d 100644
--- a/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
@@ -28,7 +28,7 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>10</ApplicationRevision>
+ <ApplicationRevision>11</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 4693c0b99a..ce1db6487c 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -127,6 +127,16 @@ Partial Class Dashboard
Me.txtHVACElectricalLoadPowerWatts = New System.Windows.Forms.TextBox()
Me.lblHVACElectricalLoadPowerWatts = New System.Windows.Forms.Label()
Me.tabPlayground = New System.Windows.Forms.TabPage()
+ Me.lblM9Title = New System.Windows.Forms.Label()
+ Me.pnlM9 = New System.Windows.Forms.Panel()
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously = New System.Windows.Forms.Label()
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously = New System.Windows.Forms.TextBox()
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously = New System.Windows.Forms.Label()
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously = New System.Windows.Forms.TextBox()
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun = New System.Windows.Forms.Label()
+ Me.lblM9LitresOfAirCompressorOnContinuously = New System.Windows.Forms.Label()
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun = New System.Windows.Forms.TextBox()
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously = New System.Windows.Forms.TextBox()
Me.lblM8_Title = New System.Windows.Forms.Label()
Me.pnlM8 = New System.Windows.Forms.Panel()
Me.lblM8CompressorFlag = New System.Windows.Forms.Label()
@@ -247,16 +257,6 @@ Partial Class Dashboard
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
- Me.pnlM9 = New System.Windows.Forms.Panel()
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously = New System.Windows.Forms.Label()
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously = New System.Windows.Forms.TextBox()
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun = New System.Windows.Forms.Label()
- Me.lblM9LitresOfAirCompressorOnContinuously = New System.Windows.Forms.Label()
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun = New System.Windows.Forms.TextBox()
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously = New System.Windows.Forms.TextBox()
- Me.lblM9Title = New System.Windows.Forms.Label()
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously = New System.Windows.Forms.Label()
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously = New System.Windows.Forms.TextBox()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -270,6 +270,7 @@ Partial Class Dashboard
Me.pnlPneumaticAuxillaries.SuspendLayout
Me.tabHVACConfig.SuspendLayout
Me.tabPlayground.SuspendLayout
+ Me.pnlM9.SuspendLayout
Me.pnlM8.SuspendLayout
Me.Panel4.SuspendLayout
Me.Panel2.SuspendLayout
@@ -283,7 +284,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.SuspendLayout
Me.resultCardContextMenu.SuspendLayout
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).BeginInit
- Me.pnlM9.SuspendLayout
Me.SuspendLayout
'
'pnlMain
@@ -1311,6 +1311,102 @@ Partial Class Dashboard
Me.tabPlayground.Text = "Playground"
Me.tabPlayground.UseVisualStyleBackColor = true
'
+ 'lblM9Title
+ '
+ Me.lblM9Title.AutoSize = true
+ Me.lblM9Title.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblM9Title.ForeColor = System.Drawing.SystemColors.Highlight
+ Me.lblM9Title.Location = New System.Drawing.Point(831, 190)
+ Me.lblM9Title.MaximumSize = New System.Drawing.Size(250, 0)
+ Me.lblM9Title.Name = "lblM9Title"
+ Me.lblM9Title.Size = New System.Drawing.Size(248, 26)
+ Me.lblM9Title.TabIndex = 50
+ Me.lblM9Title.Text = "M9-Air Delivery & Fuel Calculation Smart And Non Smart Pneumatics Over the cycle"
+ '
+ 'pnlM9
+ '
+ Me.pnlM9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnlM9.Controls.Add(Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously)
+ Me.pnlM9.Controls.Add(Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously)
+ Me.pnlM9.Controls.Add(Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously)
+ Me.pnlM9.Controls.Add(Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously)
+ Me.pnlM9.Controls.Add(Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun)
+ Me.pnlM9.Controls.Add(Me.lblM9LitresOfAirCompressorOnContinuously)
+ Me.pnlM9.Controls.Add(Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun)
+ Me.pnlM9.Controls.Add(Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously)
+ Me.pnlM9.Location = New System.Drawing.Point(837, 224)
+ Me.pnlM9.Name = "pnlM9"
+ Me.pnlM9.Size = New System.Drawing.Size(308, 176)
+ Me.pnlM9.TabIndex = 49
+ '
+ 'lblM9TotalCycleFuelConsumptionCompressorOFFContinuously
+ '
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.AutoSize = true
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Location = New System.Drawing.Point(6, 134)
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Name = "lblM9TotalCycleFuelConsumptionCompressorOFFContinuously"
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Size = New System.Drawing.Size(297, 13)
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.TabIndex = 8
+ Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Text = "Total Cycle Fuel Consumption : Compressor OFF Continuously"
+ '
+ 'txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously
+ '
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Location = New System.Drawing.Point(6, 150)
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Name = "txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously"
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Size = New System.Drawing.Size(100, 20)
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.TabIndex = 7
+ '
+ 'lblM9TotalCycleFuelConsumptionCompressorOnContinuously
+ '
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.AutoSize = true
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Location = New System.Drawing.Point(6, 91)
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Name = "lblM9TotalCycleFuelConsumptionCompressorOnContinuously"
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Size = New System.Drawing.Size(291, 13)
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.TabIndex = 6
+ Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Text = "Total Cycle Fuel Consumption : Compressor On Continuously"
+ '
+ 'txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously
+ '
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Location = New System.Drawing.Point(6, 107)
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Name = "txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously"
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Size = New System.Drawing.Size(100, 20)
+ Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.TabIndex = 4
+ '
+ 'lblM9LitresOfAirCompressoryOnlyOnInOverrun
+ '
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.AutoSize = true
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Location = New System.Drawing.Point(6, 48)
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Name = "lblM9LitresOfAirCompressoryOnlyOnInOverrun"
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Size = New System.Drawing.Size(219, 13)
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.TabIndex = 3
+ Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Text = "Litres Of Air : Compressor Only On In Overrun"
+ '
+ 'lblM9LitresOfAirCompressorOnContinuously
+ '
+ Me.lblM9LitresOfAirCompressorOnContinuously.AutoSize = true
+ Me.lblM9LitresOfAirCompressorOnContinuously.Location = New System.Drawing.Point(6, 9)
+ Me.lblM9LitresOfAirCompressorOnContinuously.Name = "lblM9LitresOfAirCompressorOnContinuously"
+ Me.lblM9LitresOfAirCompressorOnContinuously.Size = New System.Drawing.Size(205, 13)
+ Me.lblM9LitresOfAirCompressorOnContinuously.TabIndex = 2
+ Me.lblM9LitresOfAirCompressorOnContinuously.Text = "Litres Of Air : Compressor On Continuously"
+ '
+ 'txtM9_out_LitresOfAirCompressorOnlyOnInOverrun
+ '
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Location = New System.Drawing.Point(6, 64)
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Name = "txtM9_out_LitresOfAirCompressorOnlyOnInOverrun"
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Size = New System.Drawing.Size(100, 20)
+ Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.TabIndex = 1
+ '
+ 'txtM9_out_LitresOfAirConsumptionCompressorONContinuously
+ '
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Location = New System.Drawing.Point(6, 25)
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Name = "txtM9_out_LitresOfAirConsumptionCompressorONContinuously"
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Size = New System.Drawing.Size(100, 20)
+ Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.TabIndex = 0
+ '
'lblM8_Title
'
Me.lblM8_Title.AutoSize = true
@@ -2419,102 +2515,6 @@ Partial Class Dashboard
'
Me.Timer1.Interval = 1000
'
- 'pnlM9
- '
- Me.pnlM9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.pnlM9.Controls.Add(Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously)
- Me.pnlM9.Controls.Add(Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously)
- Me.pnlM9.Controls.Add(Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously)
- Me.pnlM9.Controls.Add(Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously)
- Me.pnlM9.Controls.Add(Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun)
- Me.pnlM9.Controls.Add(Me.lblM9LitresOfAirCompressorOnContinuously)
- Me.pnlM9.Controls.Add(Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun)
- Me.pnlM9.Controls.Add(Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously)
- Me.pnlM9.Location = New System.Drawing.Point(837, 224)
- Me.pnlM9.Name = "pnlM9"
- Me.pnlM9.Size = New System.Drawing.Size(308, 176)
- Me.pnlM9.TabIndex = 49
- '
- 'lblM9TotalCycleFuelConsumptionCompressorOnContinuously
- '
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.AutoSize = true
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Location = New System.Drawing.Point(6, 91)
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Name = "lblM9TotalCycleFuelConsumptionCompressorOnContinuously"
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Size = New System.Drawing.Size(291, 13)
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.TabIndex = 6
- Me.lblM9TotalCycleFuelConsumptionCompressorOnContinuously.Text = "Total Cycle Fuel Consumption : Compressor On Continuously"
- '
- 'txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously
- '
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Location = New System.Drawing.Point(6, 107)
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Name = "txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously"
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.Size = New System.Drawing.Size(100, 20)
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOnContinuously.TabIndex = 4
- '
- 'lblM9LitresOfAirCompressoryOnlyOnInOverrun
- '
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.AutoSize = true
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Location = New System.Drawing.Point(6, 48)
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Name = "lblM9LitresOfAirCompressoryOnlyOnInOverrun"
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Size = New System.Drawing.Size(219, 13)
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.TabIndex = 3
- Me.lblM9LitresOfAirCompressoryOnlyOnInOverrun.Text = "Litres Of Air : Compressor Only On In Overrun"
- '
- 'lblM9LitresOfAirCompressorOnContinuously
- '
- Me.lblM9LitresOfAirCompressorOnContinuously.AutoSize = true
- Me.lblM9LitresOfAirCompressorOnContinuously.Location = New System.Drawing.Point(6, 9)
- Me.lblM9LitresOfAirCompressorOnContinuously.Name = "lblM9LitresOfAirCompressorOnContinuously"
- Me.lblM9LitresOfAirCompressorOnContinuously.Size = New System.Drawing.Size(205, 13)
- Me.lblM9LitresOfAirCompressorOnContinuously.TabIndex = 2
- Me.lblM9LitresOfAirCompressorOnContinuously.Text = "Litres Of Air : Compressor On Continuously"
- '
- 'txtM9_out_LitresOfAirCompressorOnlyOnInOverrun
- '
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Location = New System.Drawing.Point(6, 64)
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Name = "txtM9_out_LitresOfAirCompressorOnlyOnInOverrun"
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.Size = New System.Drawing.Size(100, 20)
- Me.txtM9_out_LitresOfAirCompressorOnlyOnInOverrun.TabIndex = 1
- '
- 'txtM9_out_LitresOfAirConsumptionCompressorONContinuously
- '
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Location = New System.Drawing.Point(6, 25)
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Name = "txtM9_out_LitresOfAirConsumptionCompressorONContinuously"
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.Size = New System.Drawing.Size(100, 20)
- Me.txtM9_out_LitresOfAirConsumptionCompressorONContinuously.TabIndex = 0
- '
- 'lblM9Title
- '
- Me.lblM9Title.AutoSize = true
- Me.lblM9Title.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblM9Title.ForeColor = System.Drawing.SystemColors.Highlight
- Me.lblM9Title.Location = New System.Drawing.Point(831, 190)
- Me.lblM9Title.MaximumSize = New System.Drawing.Size(250, 0)
- Me.lblM9Title.Name = "lblM9Title"
- Me.lblM9Title.Size = New System.Drawing.Size(248, 26)
- Me.lblM9Title.TabIndex = 50
- Me.lblM9Title.Text = "M9-Air Delivery & Fuel Calculation Smart And Non Smart Pneumatics Over the cycle"
- '
- 'lblM9TotalCycleFuelConsumptionCompressorOFFContinuously
- '
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.AutoSize = true
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Location = New System.Drawing.Point(6, 134)
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Name = "lblM9TotalCycleFuelConsumptionCompressorOFFContinuously"
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Size = New System.Drawing.Size(297, 13)
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.TabIndex = 8
- Me.lblM9TotalCycleFuelConsumptionCompressorOFFContinuously.Text = "Total Cycle Fuel Consumption : Compressor OFF Continuously"
- '
- 'txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously
- '
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Location = New System.Drawing.Point(6, 150)
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Name = "txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously"
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.Size = New System.Drawing.Size(100, 20)
- Me.txtM9_out_TotalCycleFuelConsumptionCompressorOFFContinuously.TabIndex = 7
- '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -2543,6 +2543,8 @@ Partial Class Dashboard
Me.tabHVACConfig.PerformLayout
Me.tabPlayground.ResumeLayout(false)
Me.tabPlayground.PerformLayout
+ Me.pnlM9.ResumeLayout(false)
+ Me.pnlM9.PerformLayout
Me.pnlM8.ResumeLayout(false)
Me.pnlM8.PerformLayout
Me.Panel4.ResumeLayout(false)
@@ -2566,8 +2568,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.PerformLayout
Me.resultCardContextMenu.ResumeLayout(false)
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).EndInit
- Me.pnlM9.ResumeLayout(false)
- Me.pnlM9.PerformLayout
Me.ResumeLayout(false)
End Sub
diff --git a/AuxillaryTestHarness/Dashboard.resx b/AuxillaryTestHarness/Dashboard.resx
index 8fe69dd870..23a257283c 100644
--- a/AuxillaryTestHarness/Dashboard.resx
+++ b/AuxillaryTestHarness/Dashboard.resx
@@ -124,7 +124,7 @@
<value>168, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>109</value>
+ <value>50</value>
</metadata>
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>543, 19</value>
diff --git a/VECTO/MODcalc/cVh.vb b/VECTO/MODcalc/cVh.vb
index 2e72e1be26..49bd8d01df 100644
--- a/VECTO/MODcalc/cVh.vb
+++ b/VECTO/MODcalc/cVh.vb
@@ -13,9 +13,9 @@ Imports System.Collections.Generic
Public Class cVh
'From DRI file
- Private lV As List(Of Single) 'Ist-Geschw. in Zwischensekunden.
- Private lV0ogl As List(Of Single) 'Original DRI-Geschwindigkeit. Wird nicht geändert.
- Private lV0 As List(Of Single) 'DRI-Geschwindigkeit. Bei Geschw.-Reduktion in Zeitschritt t wird LV0(t+1) reduziert.
+ Private lV As List(Of Single) 'Actual speed. intermediate in seconds
+ Private lV0ogl As List(Of Single) 'Original DRI - speed . Is not changed
+ Private lV0 As List(Of Single) 'DRI - speed . Speed ​​reduction at time step t in LV0 (t + 1) is reduced..
Private lGears As List(Of Short)
Private lPadd As List(Of Single)
Private lVairVres As List(Of Single)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
new file mode 100644
index 0000000000..8ac3b50cd8
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
@@ -0,0 +1,23 @@
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+
+Namespace DownstreamModules
+
+
+
+Public Interface IM10
+
+'Interpolated FC between points 2-1 Representing non-smart Pneumatics = BaseFuel Consumption with average auxillary loads
+ReadOnly Property InterFCNonSmartPneumatics As Single
+
+'Interpolated FC between points 2-3-1 Representing smart Pneumatics = Fuel consumption with smart Pneumatics and average electrical power demand
+ReadOnly Property InterFCSmartPneumatics As Single
+
+End Interface
+
+
+
+End Namespace
+
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
new file mode 100644
index 0000000000..71993d73d6
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
@@ -0,0 +1,51 @@
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+
+Namespace DownstreamModules
+
+
+Public Class M10
+Implements IM10
+
+
+Private m4 As IM4_AirCompressor
+Private m9 As IM9
+
+Private signals As ISignals
+
+
+
+
+ Public ReadOnly Property InterFCNonSmartPneumatics As Single Implements IM10.InterFCNonSmartPneumatics
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property InterFCSmartPneumatics As Single Implements IM10.InterFCSmartPneumatics
+ Get
+
+ End Get
+ End Property
+
+
+Public sub new( m4 As IM4_AirCompressor, m9 As IM9, fcMap As IFUELMAP , signals As ISignals)
+
+
+
+End Sub
+
+
+End Class
+
+
+
+End Namespace
+
+
+
+
+
+
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 4ae6521c6d..840073d3e5 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -77,10 +77,12 @@
<Compile Include="DownstreamModules\cFile V3.vb" />
<Compile Include="DownstreamModules\cMAP.vb" />
<Compile Include="DownstreamModules\IFUELMAP.vb" />
+ <Compile Include="DownstreamModules\IM10.vb" />
<Compile Include="DownstreamModules\IM6.vb" />
<Compile Include="DownstreamModules\IM7.vb" />
<Compile Include="DownstreamModules\IM8.vb" />
<Compile Include="DownstreamModules\IM9.vb" />
+ <Compile Include="DownstreamModules\M10.vb" />
<Compile Include="DownstreamModules\M7.vb" />
<Compile Include="DownstreamModules\M8.vb" />
<Compile Include="DownstreamModules\M9.vb" />
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 5f646d440d..5412a452bd 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -4,6 +4,7 @@ Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries.DownstreamModules
Imports NUnit.Framework
Imports VectoAuxiliaries
+Imports Moq;
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index d72127dd74..cd826439a9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -14,6 +14,7 @@ Public Class M9Tests
public class MockFuel50PC
Implements IFUELMAP
+
Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single Implements IFUELMAP.fFCdelaunay_Intp
Return (nU + Tq ) * 0.5
@@ -26,6 +27,33 @@ Implements IFUELMAP
Return true
End Function
+ Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
+ Get
+
+ End Get
+ End Property
+
+ Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
+
+ End Function
End Class
--
GitLab