From e8330f079f72ab0037ba5268bf885ee3119f400f Mon Sep 17 00:00:00 2001
From: "Zarb, Glenn" <STC\GZ1>
Date: Thu, 16 Jul 2015 09:16:44 +0000
Subject: [PATCH] Schematics V11 Changes G, I, J, L
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2015
---
AdvancedAuxiliaryInterfaces/ISignals.vb | 21 +-
AdvancedAuxiliaryInterfaces/Signals.vb | 2 +-
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 1 +
VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb | 3 +-
.../DownstreamModules/IM12.vb | 70 ++++---
.../VectoAuxiliaries/DownstreamModules/M12.vb | 183 +++++++++---------
.../VectoAuxiliaries/DownstreamModules/M13.vb | 8 +-
.../VectoAuxiliaries/DownstreamModules/M14.vb | 6 +-
.../Electrics/ElectricConstants.vb | 4 -
.../Electrics/ElectricsUserInputsConfig.vb | 23 +--
.../Electrics/IElectricsUserInputsConfig.vb | 133 +++++++------
.../VectoAuxiliaries/Hvac/HVACConstants.vb | 12 --
.../VectoAuxiliaries/Hvac/IHVACConstants.vb | 3 +-
.../VectoAuxiliaries/Hvac/ISSMGenInputs.vb | 3 +-
.../VectoAuxiliaries/Hvac/SSMGenInputs.vb | 5 +-
.../UI/frmAuxiliaryConfig.Designer.vb | 49 +++--
.../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb | 11 +-
.../UI/frmHVACTool.Designer.vb | 126 ++++++++----
VECTOAux/VectoAuxiliaries/UI/frmHVACTool.resx | 6 -
VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb | 7 +-
20 files changed, 392 insertions(+), 284 deletions(-)
diff --git a/AdvancedAuxiliaryInterfaces/ISignals.vb b/AdvancedAuxiliaryInterfaces/ISignals.vb
index ef20c6d34c..d5d792df2b 100644
--- a/AdvancedAuxiliaryInterfaces/ISignals.vb
+++ b/AdvancedAuxiliaryInterfaces/ISignals.vb
@@ -123,9 +123,26 @@ Public Interface ISignals
''' <returns></returns>
''' <remarks>Vecto Input - Used to decide if to apply WHTC/Possiblye other things in future</remarks>
Property DeclarationMode As Boolean
- 'Engine Idle Speed ( Associated with the vehicle bein tested )
+ ''' <summary>
+ ''' Engine Idle Speed ( Associated with the vehicle bein tested )
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
Property EngineIdleSpeed As Single
- 'Pneumatic Overrun Utilisation
+ ''' <summary>
+ ''' Pneumatic Overrun Utilisation
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
Property PneumaticOverrunUtilisation As Single
+ ''' <summary>
+ ''' Stored Energy Efficiency
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property StoredEnergyEfficiency As Single
End Interface
diff --git a/AdvancedAuxiliaryInterfaces/Signals.vb b/AdvancedAuxiliaryInterfaces/Signals.vb
index 1139528a54..4f4ff6aa4b 100644
--- a/AdvancedAuxiliaryInterfaces/Signals.vb
+++ b/AdvancedAuxiliaryInterfaces/Signals.vb
@@ -50,7 +50,7 @@ Implements ISignals
End Property
Public Property EngineIdleSpeed As Single Implements ISignals.EngineIdleSpeed
Public Property PneumaticOverrunUtilisation As Single Implements ISignals.PneumaticOverrunUtilisation
-
+ Public Property StoredEnergyEfficiency As Single Implements ISignals.StoredEnergyEfficiency
End Class
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 76c4d5282a..8336fcfe19 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -87,6 +87,7 @@ Public Class AdvancedAuxiliaries
'Pass some signals from config to Signals. ( These are stored in the configuration but shared in the signal distribution around modules )
Signals.SmartElectrics = auxConfig.ElectricalUserInputsConfig.SmartElectrical
+ Signals.StoredEnergyEfficiency = auxConfig.ElectricalUserInputsConfig.StoredEnergyEfficiency
Signals.SmartPneumatics = auxConfig.PneumaticUserInputsConfig.SmartAirCompression
Signals.PneumaticOverrunUtilisation = auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 466b8e4716..ce8d9aca1d 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -90,13 +90,14 @@ Public Class AuxiliaryConfig
'testAlternatorMap.aalt
ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With {.DoorActuationTimeSecond = 4,
+ .StoredEnergyEfficiency = 0.935,
.AlternatorGearEfficiency = 0.92,
.PowerNetVoltage = VectoInputs.PowerNetVoltage,
.ResultCardIdle = New ResultCard(New List(Of SmartResult)),
.ResultCardOverrun = New ResultCard(New List(Of SmartResult)),
.ResultCardTraction = New ResultCard(New List(Of SmartResult)),
.SmartElectrical = True,
- .AlternatorMap = String.Empty
+ .AlternatorMap = String.Empty
}
HvacUserInputsConfig = New HVACUserInputsConfig(String.Empty, String.Empty, False)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
index 78e407afe5..6f8fdd15fb 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
@@ -11,37 +11,45 @@
Namespace DownstreamModules
- Public Interface IM12
-
- ''' <summary>
- ''' Fuel consumption with smart Electrics and Average Pneumatic Power Demand
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Single
-
- ''' <summary>
- ''' Base Fuel Consumption With Average Auxiliary Loads
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- ReadOnly Property BaseFuelConsumptionWithAverageAuxiliaryLoads As Single
-
- 'Diagnostic Signals Only For Testing - No Material interference with operation of class.
- ReadOnly Property P1X As single
- ReadOnly Property P1Y As single
- ReadOnly Property P2X As single
- ReadOnly Property P2Y As single
- ReadOnly Property P3X As single
- ReadOnly Property P3Y As single
- ReadOnly Property XTAIN As single
- ReadOnly Property INTRP1 As single
- ReadOnly Property INTRP2 As single
-
-
- End Interface
+ Public Interface IM12
+
+ ''' <summary>
+ ''' Fuel consumption with smart Electrics and Average Pneumatic Power Demand
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Single
+
+ ''' <summary>
+ ''' Base Fuel Consumption With Average Auxiliary Loads
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Single
+ ''' <summary>
+ ''' Stop Start Correction
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ ReadOnly Property StopStartCorrection As Single
+
+
+ 'Diagnostic Signals Only For Testing - No Material interference with operation of class.
+ ReadOnly Property P1X As Single
+ ReadOnly Property P1Y As Single
+ ReadOnly Property P2X As Single
+ ReadOnly Property P2Y As Single
+ ReadOnly Property P3X As Single
+ ReadOnly Property P3Y As Single
+ ReadOnly Property XTAIN As Single
+ ReadOnly Property INTRP1 As Single
+ ReadOnly Property INTRP2 As Single
+
+
+ End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
index 7f0952a688..d7e7dc4a59 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
@@ -15,159 +15,164 @@ Imports VectoAuxiliaries.Hvac
Namespace DownstreamModules
- Public Class M12
- Implements IM12
+ Public Class M12
+ Implements IM12
- Private Class Point
+ Private Class Point
-Public X As Single
-Public Y As Single
+ Public X As Single
+ Public Y As Single
-End Class
+ End Class
- Private M11 As IM11
- Private M10 As IM10
- Private Signals As ISignals
- private _P1X,_P1Y,_P2X,_P2Y,_P3X,_P3Y,_XT, _INTERP1, _INTERP2 As single
-
- Private Sub setPoints()
-
- _P1X=0
- _P1Y=M11.TotalCycleFuelConsumptionZeroElectricalLoad
- _P2X=M11.SmartElectricalTotalCycleEletricalEnergyGenerated
- _P2Y=M11.TotalCycleFuelConsumptionSmartElectricalLoad
- _P3X=M11.StopStartSensitiveTotalCycleElectricalDemand
- _P3Y=M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
- _XT=M11.TotalCycleElectricalDemand
+ Private M11 As IM11
+ Private M10 As IM10
+ Private Signals As ISignals
+ Private _P1X, _P1Y, _P2X, _P2Y, _P3X, _P3Y, _XT, _INTERP1, _INTERP2 As Single
+ Private Sub setPoints()
+ _P1X = 0
+ _P1Y = M11.TotalCycleFuelConsumptionZeroElectricalLoad
+ _P2X = M11.SmartElectricalTotalCycleEletricalEnergyGenerated
+ _P2Y = M11.TotalCycleFuelConsumptionSmartElectricalLoad
+ _P3X = M11.StopStartSensitiveTotalCycleElectricalDemand
+ _P3Y = M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
+ _XT = M11.TotalCycleElectricalDemand
- End Sub
- 'Interpolation
- Private function Sum1()As single
- Dim P1 as Point = New Point with {.X=0, .Y=M11.TotalCycleFuelConsumptionZeroElectricalLoad }
- Dim P2 As Point = New Point With {.X=M11.SmartElectricalTotalCycleEletricalEnergyGenerated * ElectricConstants.StoredEnergyEfficiency, .Y=M11.TotalCycleFuelConsumptionSmartElectricalLoad}
+ End Sub
- Dim IP5x As Single = M11.TotalCycleElectricalDemand
- Dim IP5y As Single = 0
+ 'Interpolation
+ Private Function Sum1() As Single
- Dim TanTeta as Single = (P2.Y-P1.Y)/(P2.X-P1.X)
+ Dim P1 As Point = New Point With {.X = 0, .Y = M11.TotalCycleFuelConsumptionZeroElectricalLoad}
+ Dim P2 As Point = New Point With {.X = M11.SmartElectricalTotalCycleEletricalEnergyGenerated * Signals.StoredEnergyEfficiency, .Y = M11.TotalCycleFuelConsumptionSmartElectricalLoad}
- IP5y = P1.Y + ( TanTeta * IP5x )
+ Dim IP5x As Single = M11.TotalCycleElectricalDemand
+ Dim IP5y As Single = 0
- _INTERP1= IP5Y
+ Dim TanTeta As Single = (P2.Y - P1.Y) / (P2.X - P1.X)
- setPoints
+ IP5y = P1.Y + (TanTeta * IP5x)
- Return if( Single.IsNaN(IP5Y),0, IP5y)
+ _INTERP1 = IP5Y
- End Function
- Private function Sum2()As single
+ setPoints()
- Dim P1 as Point = New Point with {.X=0, .Y=M11.TotalCycleFuelConsumptionZeroElectricalLoad }
- Dim P3 As Point = New Point With {.X=M11.StopStartSensitiveTotalCycleElectricalDemand, .Y=M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics}
+ Return If(Single.IsNaN(IP5Y), 0, IP5y)
- Dim IP5x As Single = M11.TotalCycleElectricalDemand
- Dim IP5y As Single = 0
+ End Function
+ Private Function Sum2() As Single
+
+ Dim P1 As Point = New Point With {.X = 0, .Y = M11.TotalCycleFuelConsumptionZeroElectricalLoad}
+ Dim P3 As Point = New Point With {.X = M11.StopStartSensitiveTotalCycleElectricalDemand, .Y = M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics}
+
+ Dim IP5x As Single = M11.TotalCycleElectricalDemand
+ Dim IP5y As Single = 0
- Dim TanTeta as Single = (P3.Y-P1.Y)/(P3.X-P1.X)
+ Dim TanTeta As Single = (P3.Y - P1.Y) / (P3.X - P1.X)
- IP5y = P1.Y + ( TanTeta * IP5x )
+ IP5y = P1.Y + (TanTeta * IP5x)
- _INTERP2 = IP5y
+ _INTERP2 = IP5y
- Return If( Single.IsNaN(IP5Y),0, IP5y)
+ Return If(Single.IsNaN(IP5Y), 0, IP5y)
End Function
- 'Constructor
- Public Sub new ( m10 As IM10, m11 As IM11, signals As ISignals)
+ 'Constructor
+ Public Sub New(m10 As IM10, m11 As IM11, signals As ISignals)
- Me.M10 = m10
- Me.M11=m11
- Me.Signals=signals
+ Me.M10 = m10
+ Me.M11 = m11
+ Me.Signals = signals
-End Sub
+ End Sub
- 'Main Class Outputs
- Public ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Single Implements IM12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand
- Get
+ 'Main Class Outputs
+ Public ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Single Implements IM12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand
+ Get
- 'SCHM 3_2
- Dim interp1 As Single = Sum1
-
- interp1 = If( Not Single.IsNaN(interp1) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand>0, interp1,0)
- Return interp1
+ 'SCHM 3_2
+ Dim interp1 As Single = Sum1
- End Get
+ interp1 = If(Not Single.IsNaN(interp1) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand > 0, interp1, M11.TotalCycleFuelConsumptionZeroElectricalLoad)
+ Return interp1
-End Property
- Public ReadOnly Property BaseFuelConsumptionWithAverageAuxiliaryLoads As Single Implements IM12.BaseFuelConsumptionWithAverageAuxiliaryLoads
- Get
-
- 'SCM 3_02
- Dim interp2 As Single = Sum2
-
- interp2 = If( Not Single.IsNaN(interp2) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand>0, interp2,0)
- Return interp2
+ End Get
- End Get
-End Property
+ End Property
+ Public ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Single Implements IM12.BaseFuelConsumptionWithTrueAuxiliaryLoads
+ Get
+ 'SCM 3_02
+ Dim interp2 As Single = Sum2()
- 'Diagnostics Signal Exposure only. Does not materially affect class operation.
- Public ReadOnly Property INTRP1 As Single Implements IM12.INTRP1
+ interp2 = If(Not Single.IsNaN(interp2) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand > 0, interp2, M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics)
+ Return interp2
+
+ End Get
+ End Property
+ Public ReadOnly Property StopStartCorrection As Single Implements IM12.StopStartCorrection
+ Get
+
+ Return BaseFuelConsumptionWithTrueAuxiliaryLoads \ M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
+
+ End Get
+ End Property
+
+ 'Diagnostics Signal Exposure only. Does not materially affect class operation.
+ Public ReadOnly Property INTRP1 As Single Implements IM12.INTRP1
Get
- Return _INTERP1
+ Return _INTERP1
End Get
End Property
- Public ReadOnly Property INTRP2 As Single Implements IM12.INTRP2
+ Public ReadOnly Property INTRP2 As Single Implements IM12.INTRP2
Get
- Return _INTERP2
+ Return _INTERP2
End Get
End Property
- Public ReadOnly Property P1X As Single Implements IM12.P1X
+ Public ReadOnly Property P1X As Single Implements IM12.P1X
Get
- Return _P1X
+ Return _P1X
End Get
End Property
- Public ReadOnly Property P1Y As Single Implements IM12.P1Y
+ Public ReadOnly Property P1Y As Single Implements IM12.P1Y
Get
- Return _p1Y
+ Return _p1Y
End Get
End Property
- Public ReadOnly Property P2X As Single Implements IM12.P2X
+ Public ReadOnly Property P2X As Single Implements IM12.P2X
Get
- Return _P2X
+ Return _P2X
End Get
End Property
- Public ReadOnly Property P2Y As Single Implements IM12.P2Y
+ Public ReadOnly Property P2Y As Single Implements IM12.P2Y
Get
- Return _P2Y
+ Return _P2Y
End Get
End Property
- Public ReadOnly Property P3X As Single Implements IM12.P3X
+ Public ReadOnly Property P3X As Single Implements IM12.P3X
Get
- Return _P3X
+ Return _P3X
End Get
End Property
- Public ReadOnly Property P3Y As Single Implements IM12.P3Y
+ Public ReadOnly Property P3Y As Single Implements IM12.P3Y
Get
- Return _P3Y
+ Return _P3Y
End Get
End Property
- Public ReadOnly Property XTAIN As Single Implements IM12.XTAIN
+ Public ReadOnly Property XTAIN As Single Implements IM12.XTAIN
Get
- Return _XT
+ Return _XT
End Get
End Property
-
-End Class
+ End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
index 555218c1d2..b9648c33a4 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
@@ -26,17 +26,17 @@ Namespace DownstreamModules
'Internal Staging Calculations
Private readonly Property Sum1 As Single
Get
- return - m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand + m12.BaseFuelConsumptionWithAverageAuxiliaryLoads
+ Return -m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand + m12.BaseFuelConsumptionWithTrueAuxiliaryLoads
End Get
End Property
Private readonly Property Sum2 As Single
Get
- Return m12.BaseFuelConsumptionWithAverageAuxiliaryLoads - m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
+ Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
End Get
End Property
Private readonly Property Sum3 As Single
Get
- Return m12.BaseFuelConsumptionWithAverageAuxiliaryLoads-Sum2
+ Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - Sum2
End Get
End Property
Private readonly Property Sum4 As Single
@@ -60,7 +60,7 @@ End Property
End Property
private readonly Property SW2 as Single
Get
- Return If( signals.SmartPneumatics,m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand, m12.BaseFuelConsumptionWithAverageAuxiliaryLoads)
+ Return If(signals.SmartPneumatics, m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand, m12.BaseFuelConsumptionWithTrueAuxiliaryLoads)
End Get
End Property
Private readonly Property SW3 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
index 1d4a485c1e..e808e7d0a6 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
@@ -37,12 +37,12 @@ Public Class M14
End Property
Private ReadOnly Property S2 As Single
Get
- Return constants.FuelEnergyToHeatToCoolant * s1
+ Return ssm.GenInputs.AH_FuelEnergyToHeatToCoolant * S1
End Get
End Property
Private ReadOnly Property S3 As Single
Get
- Return S2 * constants.CoolantHeatTransferredToAirCabinHeater
+ Return S2 * ssm.GenInputs.AH_CoolantHeatTransferredToAirCabinHeater
End Get
End Property
Private ReadOnly Property S4 As Single
@@ -50,8 +50,6 @@ Public Class M14
Return (S3 / signals.CurrentCycleTimeInSeconds) / 1000
End Get
End Property
-
-
Private ReadOnly Property S5 As Single
Get
Return signals.CurrentCycleTimeInSeconds / 3600
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
index ec06814647..37d27d6be2 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
@@ -30,10 +30,6 @@ Public Class ElectricConstants
public const AlternatorPulleyEfficiencyMin as single =0.1
public const AlternatorPulleyEfficiencyMax as single =1
- 'Stored Energy Efficiency
- Public Const StoredEnergyEfficiency As Single = 0.935
-
-
End Class
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
index fb735e2e95..a37264be5e 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
@@ -16,17 +16,18 @@ Public Class ElectricsUserInputsConfig
Implements IElectricsUserInputsConfig
- Public Property PowerNetVoltage As Single Implements IElectricsUserInputsConfig.PowerNetVoltage
- Public Property AlternatorMap As String Implements IElectricsUserInputsConfig.AlternatorMap
- Public Property AlternatorGearEfficiency As Single Implements IElectricsUserInputsConfig.AlternatorGearEfficiency
- Public Property ElectricalConsumers As IElectricalConsumerList Implements IElectricsUserInputsConfig.ElectricalConsumers
- Public Property DoorActuationTimeSecond As Integer Implements IElectricsUserInputsConfig.DoorActuationTimeSecond
-
- Public Property ResultCardIdle As IResultCard Implements IElectricsUserInputsConfig.ResultCardIdle
- Public Property ResultCardTraction As IResultCard Implements IElectricsUserInputsConfig.ResultCardTraction
- Public Property ResultCardOverrun As IResultCard Implements IElectricsUserInputsConfig.ResultCardOverrun
-
- Public Property SmartElectrical As Boolean Implements IElectricsUserInputsConfig.SmartElectrical
+ Public Property PowerNetVoltage As Single Implements IElectricsUserInputsConfig.PowerNetVoltage
+ Public Property AlternatorMap As String Implements IElectricsUserInputsConfig.AlternatorMap
+ Public Property AlternatorGearEfficiency As Single Implements IElectricsUserInputsConfig.AlternatorGearEfficiency
+ Public Property ElectricalConsumers As IElectricalConsumerList Implements IElectricsUserInputsConfig.ElectricalConsumers
+ Public Property DoorActuationTimeSecond As Integer Implements IElectricsUserInputsConfig.DoorActuationTimeSecond
+ Public Property StoredEnergyEfficiency As Single Implements IElectricsUserInputsConfig.StoredEnergyEfficiency
+
+ Public Property ResultCardIdle As IResultCard Implements IElectricsUserInputsConfig.ResultCardIdle
+ Public Property ResultCardTraction As IResultCard Implements IElectricsUserInputsConfig.ResultCardTraction
+ Public Property ResultCardOverrun As IResultCard Implements IElectricsUserInputsConfig.ResultCardOverrun
+
+ Public Property SmartElectrical As Boolean Implements IElectricsUserInputsConfig.SmartElectrical
End Class
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
index a66e4b131b..026da7a5a1 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb
@@ -15,69 +15,76 @@ Namespace Electrics
Public Interface IElectricsUserInputsConfig
- ''' <summary>
- ''' Power Net Voltage - The supply voltage used on the vehilce.
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property PowerNetVoltage As Single
- ''' <summary>
- ''' The Path for the Alternator map
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property AlternatorMap As String
- ''' <summary>
- ''' Alternator Gear Efficiency
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property AlternatorGearEfficiency As Single
- ''' <summary>
- ''' List of Electrical Consumers
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property ElectricalConsumers As IElectricalConsumerList
- ''' <summary>
- ''' Door Actuation Time In Seconds ( Time Taken to Open/Close the door )
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property DoorActuationTimeSecond As Integer
- ''' <summary>
- ''' Result Card Taken During Idle.
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property ResultCardIdle As IResultCard
- ''' <summary>
- ''' Result Card Taken During Traction
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property ResultCardTraction As IResultCard
- ''' <summary>
- ''' Result Card Taken During Overrun
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Property ResultCardOverrun As IResultCard
- ''' <summary>
- ''' Smart Electrical System
- ''' </summary>
- ''' <value></value>
- ''' <returns>True For Smart Electrical Systems/ False For non Smart.</returns>
- ''' <remarks></remarks>
- Property SmartElectrical As Boolean
+ ''' <summary>
+ ''' Power Net Voltage - The supply voltage used on the vehilce.
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property PowerNetVoltage As Single
+ ''' <summary>
+ ''' The Path for the Alternator map
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property AlternatorMap As String
+ ''' <summary>
+ ''' Alternator Gear Efficiency
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property AlternatorGearEfficiency As Single
+ ''' <summary>
+ ''' List of Electrical Consumers
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property ElectricalConsumers As IElectricalConsumerList
+ ''' <summary>
+ ''' Door Actuation Time In Seconds ( Time Taken to Open/Close the door )
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property DoorActuationTimeSecond As Integer
+ ''' <summary>
+ ''' Result Card Taken During Idle.
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property ResultCardIdle As IResultCard
+ ''' <summary>
+ ''' Result Card Taken During Traction
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property ResultCardTraction As IResultCard
+ ''' <summary>
+ ''' Result Card Taken During Overrun
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Property ResultCardOverrun As IResultCard
+ ''' <summary>
+ ''' Smart Electrical System
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns>True For Smart Electrical Systems/ False For non Smart.</returns>
+ ''' <remarks></remarks>
+ Property SmartElectrical As Boolean
+ ''' <summary>
+ ''' Stored Energy Efficiency
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns>Stored Energy Efficiency</returns>
+ ''' <remarks></remarks>
+ Property StoredEnergyEfficiency As Single
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
index cd13f98593..d2719e36b7 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
@@ -24,24 +24,12 @@ Namespace Hvac
_fuelDensity = fuelDensitySingle
End Sub
- Public ReadOnly Property CoolantHeatTransferredToAirCabinHeater As Single Implements IHVACConstants.CoolantHeatTransferredToAirCabinHeater
- Get
- Return 0.75
- End Get
- End Property
-
Public ReadOnly Property DieselGCVJperGram As Single Implements IHVACConstants.DieselGCVJperGram
Get
Return 44800
End Get
End Property
- Public ReadOnly Property FuelEnergyToHeatToCoolant As Single Implements IHVACConstants.FuelEnergyToHeatToCoolant
- Get
- Return 0.2
- End Get
- End Property
-
Public ReadOnly Property FuelDensity As Single Implements IHVACConstants.FuelDensity
Get
Return _fuelDensity
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb b/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
index a6aa839503..f8af7548ec 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
@@ -3,10 +3,9 @@
Public Interface IHVACConstants
- ReadOnly Property FuelEnergyToHeatToCoolant As Single
- ReadOnly Property CoolantHeatTransferredToAirCabinHeater As Single
ReadOnly Property DieselGCVJperGram As Single
ReadOnly Property FuelDensity As Single
+
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/ISSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/ISSMGenInputs.vb
index 60835cfcc7..66cacc7bb4 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/ISSMGenInputs.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/ISSMGenInputs.vb
@@ -68,7 +68,8 @@ Namespace Hvac
'Aux. Heater
Property AH_EngineWasteHeatkW As Double
Property AH_FuelFiredHeaterkW As Double
-
+ Property AH_FuelEnergyToHeatToCoolant As Double
+ Property AH_CoolantHeatTransferredToAirCabinHeater As Double
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
index 71fe1de89e..2da831a504 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
@@ -324,6 +324,8 @@ Namespace Hvac
'C71 - ( KW )
Public Property AH_FuelFiredHeaterkW As Double Implements ISSMGenInputs.AH_FuelFiredHeaterkW
+ Public Property AH_FuelEnergyToHeatToCoolant As Double Implements ISSMGenInputs.AH_FuelEnergyToHeatToCoolant
+ Public Property AH_CoolantHeatTransferredToAirCabinHeater As Double Implements ISSMGenInputs.AH_CoolantHeatTransferredToAirCabinHeater
#End Region
#Region "Default Values"
@@ -400,7 +402,8 @@ Namespace Hvac
'AUX HEATER
'**********
AH_FuelFiredHeaterkW = 30.0R
-
+ AH_FuelEnergyToHeatToCoolant = 0.2
+ AH_CoolantHeatTransferredToAirCabinHeater = 0.75
End Sub
#End Region
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 51675037c7..a4d37ba4d1 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -120,6 +120,7 @@ Partial Class frmAuxiliaryConfig
Me.txtPerStopBrakeActuationNIperKG = New System.Windows.Forms.TextBox()
Me.txtSmartRegenFractionTotalAirDemand = New System.Windows.Forms.TextBox()
Me.tabHVACConfig = New System.Windows.Forms.TabPage()
+ Me.chkDisableHVAC = New System.Windows.Forms.CheckBox()
Me.btnOpenABDB = New System.Windows.Forms.Button()
Me.btnBusDatabaseSource = New System.Windows.Forms.Button()
Me.txtBusDatabaseFilePath = New System.Windows.Forms.TextBox()
@@ -136,7 +137,8 @@ Partial Class frmAuxiliaryConfig
Me.CmFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.chkDisableHVAC = New System.Windows.Forms.CheckBox()
+ Me.txtStoredEnergyEfficiency = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
Me.pnlMain.SuspendLayout()
Me.tabMain.SuspendLayout()
Me.tabGeneralConfig.SuspendLayout()
@@ -274,6 +276,8 @@ Partial Class frmAuxiliaryConfig
'tabElectricalConfig
'
Me.tabElectricalConfig.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+ Me.tabElectricalConfig.Controls.Add(Me.txtStoredEnergyEfficiency)
+ Me.tabElectricalConfig.Controls.Add(Me.Label2)
Me.tabElectricalConfig.Controls.Add(Me.btnAALTOpen)
Me.tabElectricalConfig.Controls.Add(Me.btnAlternatorMapPath)
Me.tabElectricalConfig.Controls.Add(Me.gvResultsCardOverrun)
@@ -445,7 +449,7 @@ Partial Class frmAuxiliaryConfig
'chkSmartElectricals
'
Me.chkSmartElectricals.AutoSize = True
- Me.chkSmartElectricals.Location = New System.Drawing.Point(162, 132)
+ Me.chkSmartElectricals.Location = New System.Drawing.Point(162, 162)
Me.chkSmartElectricals.Name = "chkSmartElectricals"
Me.chkSmartElectricals.Size = New System.Drawing.Size(96, 17)
Me.chkSmartElectricals.TabIndex = 12
@@ -455,7 +459,7 @@ Partial Class frmAuxiliaryConfig
'lblElectricalConsumables
'
Me.lblElectricalConsumables.AutoSize = True
- Me.lblElectricalConsumables.Location = New System.Drawing.Point(34, 154)
+ Me.lblElectricalConsumables.Location = New System.Drawing.Point(34, 184)
Me.lblElectricalConsumables.Name = "lblElectricalConsumables"
Me.lblElectricalConsumables.Size = New System.Drawing.Size(116, 13)
Me.lblElectricalConsumables.TabIndex = 11
@@ -480,7 +484,7 @@ Partial Class frmAuxiliaryConfig
DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
- Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
+ Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 200)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
@@ -490,7 +494,7 @@ Partial Class frmAuxiliaryConfig
DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
- Me.gvElectricalConsumables.Size = New System.Drawing.Size(830, 250)
+ Me.gvElectricalConsumables.Size = New System.Drawing.Size(830, 220)
Me.gvElectricalConsumables.TabIndex = 10
'
'txtDoorActuationTimeSeconds
@@ -1087,6 +1091,16 @@ Partial Class frmAuxiliaryConfig
Me.tabHVACConfig.Text = "HVAC"
Me.tabHVACConfig.UseVisualStyleBackColor = True
'
+ 'chkDisableHVAC
+ '
+ Me.chkDisableHVAC.AutoSize = True
+ Me.chkDisableHVAC.Location = New System.Drawing.Point(34, 73)
+ Me.chkDisableHVAC.Name = "chkDisableHVAC"
+ Me.chkDisableHVAC.Size = New System.Drawing.Size(131, 17)
+ Me.chkDisableHVAC.TabIndex = 61
+ Me.chkDisableHVAC.Text = "Disable HVAC Module"
+ Me.chkDisableHVAC.UseVisualStyleBackColor = True
+ '
'btnOpenABDB
'
Me.btnOpenABDB.Image = CType(resources.GetObject("btnOpenABDB.Image"), System.Drawing.Image)
@@ -1204,15 +1218,22 @@ Partial Class frmAuxiliaryConfig
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Open In Folder"
'
- 'chkDisableHVAC
+ 'txtStoredEnergyEfficiency
'
- Me.chkDisableHVAC.AutoSize = True
- Me.chkDisableHVAC.Location = New System.Drawing.Point(34, 73)
- Me.chkDisableHVAC.Name = "chkDisableHVAC"
- Me.chkDisableHVAC.Size = New System.Drawing.Size(131, 17)
- Me.chkDisableHVAC.TabIndex = 61
- Me.chkDisableHVAC.Text = "Disable HVAC Module"
- Me.chkDisableHVAC.UseVisualStyleBackColor = True
+ Me.txtStoredEnergyEfficiency.Location = New System.Drawing.Point(162, 133)
+ Me.txtStoredEnergyEfficiency.Name = "txtStoredEnergyEfficiency"
+ Me.txtStoredEnergyEfficiency.ReadOnly = True
+ Me.txtStoredEnergyEfficiency.Size = New System.Drawing.Size(100, 20)
+ Me.txtStoredEnergyEfficiency.TabIndex = 22
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(30, 137)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(123, 13)
+ Me.Label2.TabIndex = 21
+ Me.Label2.Text = "Stored Energy Efficiency"
'
'frmAuxiliaryConfig
'
@@ -1351,5 +1372,7 @@ End Sub
Friend WithEvents txtBusDatabaseFilePath As System.Windows.Forms.TextBox
Friend WithEvents lblBusDatabaseFilePath As System.Windows.Forms.Label
Friend WithEvents chkDisableHVAC As System.Windows.Forms.CheckBox
+ Friend WithEvents txtStoredEnergyEfficiency As System.Windows.Forms.TextBox
+ Friend WithEvents Label2 As System.Windows.Forms.Label
End Class
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index e6e21d82dc..714776af7a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -383,7 +383,7 @@ Public Class frmAuxiliaryConfig
End Function
'***** ELECTRICAL VALIDATION
- Public Sub Validating_ElectricsHandler(sender As Object, e As CancelEventArgs) Handles txtPowernetVoltage.Validating, txtAlternatorMapPath.Validating, txtAlternatorGearEfficiency.Validating, txtDoorActuationTimeSeconds.Validating
+ Public Sub Validating_ElectricsHandler(sender As Object, e As CancelEventArgs) Handles txtPowernetVoltage.Validating, txtAlternatorMapPath.Validating, txtAlternatorGearEfficiency.Validating, txtDoorActuationTimeSeconds.Validating, txtStoredEnergyEfficiency.Validating
e.Cancel = Not Validate_Electrics()
@@ -439,6 +439,14 @@ Public Class frmAuxiliaryConfig
ErrorProvider.SetError(txtDoorActuationTimeSeconds, String.Empty)
End If
+ 'Stored Energy Efficiency : txtStoredEnergyEfficiency
+ If Not IsPostiveNumber(txtStoredEnergyEfficiency.Text) Then
+ ErrorProvider.SetError(txtStoredEnergyEfficiency, "Please provide a non negative number.")
+ result = False
+ Else
+ ErrorProvider.SetError(txtStoredEnergyEfficiency, String.Empty)
+ End If
+
UpdateTabStatus("tabElectricalConfig", result)
@@ -1442,6 +1450,7 @@ Public Class frmAuxiliaryConfig
txtAlternatorMapPath.DataBindings.Add("Text", auxConfig.ElectricalUserInputsConfig, "AlternatorMap")
txtAlternatorGearEfficiency.DataBindings.Add("Text", auxConfig.ElectricalUserInputsConfig, "AlternatorGearEfficiency")
txtDoorActuationTimeSeconds.DataBindings.Add("Text", auxConfig.ElectricalUserInputsConfig, "DoorActuationTimeSecond")
+ txtStoredEnergyEfficiency.DataBindings.Add("Text", auxConfig.ElectricalUserInputsConfig, "StoredEnergyEfficiency")
chkSmartElectricals.DataBindings.Add("Checked", auxConfig.ElectricalUserInputsConfig, "SmartElectrical", False, DataSourceUpdateMode.OnPropertyChanged)
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
index 2c496f621c..315c9e666a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
@@ -83,6 +83,7 @@ Partial Class frmHVACTool
Me.cboBuses = New System.Windows.Forms.ComboBox()
Me.tabGeneralInputsBC = New System.Windows.Forms.TabPage()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.Label24 = New System.Windows.Forms.Label()
Me.txtBC_TemperatureCoolingOff = New System.Windows.Forms.TextBox()
Me.Label5 = New System.Windows.Forms.Label()
Me.lblUnitsBC_MaxPossibleBenefitFromTechnologyList = New System.Windows.Forms.Label()
@@ -169,6 +170,10 @@ Partial Class frmHVACTool
Me.lblUnitstxtEC_EnviromentalTemperature = New System.Windows.Forms.Label()
Me.lblUnitstxtEC_Solar = New System.Windows.Forms.Label()
Me.grpAuxHeater = New System.Windows.Forms.GroupBox()
+ Me.txtAH_CoolantHeatToAirCabinHeater = New System.Windows.Forms.TextBox()
+ Me.txtAH_FuelEnergyHeatToCoolant = New System.Windows.Forms.TextBox()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.Label25 = New System.Windows.Forms.Label()
Me.lblUnitsAH_FuelFiredHeater = New System.Windows.Forms.Label()
Me.txtAH_FuelFiredHeaterkW = New System.Windows.Forms.TextBox()
Me.lbltxtAH_FuelFiredHeaterkW = New System.Windows.Forms.Label()
@@ -186,6 +191,8 @@ Partial Class frmHVACTool
Me.lblchkVEN_VentilationDuringAC = New System.Windows.Forms.Label()
Me.lblchkVEN_VentilationWhenBothHeatingAndACInactive = New System.Windows.Forms.Label()
Me.grpACSystem = New System.Windows.Forms.GroupBox()
+ Me.txtAC_CompressorType = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.txtAC_COP = New System.Windows.Forms.TextBox()
Me.lblBC_COP = New System.Windows.Forms.Label()
Me.cboAC_CompressorType = New System.Windows.Forms.ComboBox()
@@ -247,9 +254,6 @@ Partial Class frmHVACTool
Me.CMFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.txtAC_CompressorType = New System.Windows.Forms.TextBox()
- Me.Label24 = New System.Windows.Forms.Label()
Me.tabMain.SuspendLayout()
Me.tabGeneralInputsBP.SuspendLayout()
Me.BusParamGroupEdit.SuspendLayout()
@@ -1003,6 +1007,17 @@ Partial Class frmHVACTool
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Boundary Conditions"
'
+ 'Label24
+ '
+ Me.Label24.AutoSize = True
+ Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label24.Location = New System.Drawing.Point(349, 349)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(22, 15)
+ Me.Label24.TabIndex = 78
+ Me.Label24.Text = "oC"
+ Me.ToolTip1.SetToolTip(Me.Label24, "Degrees Centigrade")
+ '
'txtBC_TemperatureCoolingOff
'
Me.txtBC_TemperatureCoolingOff.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
@@ -1879,6 +1894,10 @@ Partial Class frmHVACTool
'grpAuxHeater
'
Me.grpAuxHeater.BackColor = System.Drawing.Color.Transparent
+ Me.grpAuxHeater.Controls.Add(Me.txtAH_CoolantHeatToAirCabinHeater)
+ Me.grpAuxHeater.Controls.Add(Me.txtAH_FuelEnergyHeatToCoolant)
+ Me.grpAuxHeater.Controls.Add(Me.Label26)
+ Me.grpAuxHeater.Controls.Add(Me.Label25)
Me.grpAuxHeater.Controls.Add(Me.lblUnitsAH_FuelFiredHeater)
Me.grpAuxHeater.Controls.Add(Me.txtAH_FuelFiredHeaterkW)
Me.grpAuxHeater.Controls.Add(Me.lbltxtAH_FuelFiredHeaterkW)
@@ -1887,16 +1906,56 @@ Partial Class frmHVACTool
Me.grpAuxHeater.ForeColor = System.Drawing.SystemColors.MenuHighlight
Me.grpAuxHeater.Location = New System.Drawing.Point(474, 209)
Me.grpAuxHeater.Name = "grpAuxHeater"
- Me.grpAuxHeater.Size = New System.Drawing.Size(409, 77)
+ Me.grpAuxHeater.Size = New System.Drawing.Size(428, 121)
Me.grpAuxHeater.TabIndex = 32
Me.grpAuxHeater.TabStop = False
Me.grpAuxHeater.Text = "Aux Heater"
'
+ 'txtAH_CoolantHeatToAirCabinHeater
+ '
+ Me.txtAH_CoolantHeatToAirCabinHeater.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.txtAH_CoolantHeatToAirCabinHeater.Location = New System.Drawing.Point(282, 88)
+ Me.txtAH_CoolantHeatToAirCabinHeater.Name = "txtAH_CoolantHeatToAirCabinHeater"
+ Me.txtAH_CoolantHeatToAirCabinHeater.ReadOnly = True
+ Me.txtAH_CoolantHeatToAirCabinHeater.Size = New System.Drawing.Size(97, 21)
+ Me.txtAH_CoolantHeatToAirCabinHeater.TabIndex = 31
+ '
+ 'txtAH_FuelEnergyHeatToCoolant
+ '
+ Me.txtAH_FuelEnergyHeatToCoolant.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.txtAH_FuelEnergyHeatToCoolant.Location = New System.Drawing.Point(282, 56)
+ Me.txtAH_FuelEnergyHeatToCoolant.Name = "txtAH_FuelEnergyHeatToCoolant"
+ Me.txtAH_FuelEnergyHeatToCoolant.ReadOnly = True
+ Me.txtAH_FuelEnergyHeatToCoolant.Size = New System.Drawing.Size(97, 21)
+ Me.txtAH_FuelEnergyHeatToCoolant.TabIndex = 30
+ '
+ 'Label26
+ '
+ Me.Label26.AutoSize = True
+ Me.Label26.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.Label26.ForeColor = System.Drawing.Color.Black
+ Me.Label26.Location = New System.Drawing.Point(22, 62)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(172, 15)
+ Me.Label26.TabIndex = 29
+ Me.Label26.Text = "Fuel Energy to Heat to Coolant"
+ '
+ 'Label25
+ '
+ Me.Label25.AutoSize = True
+ Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.Label25.ForeColor = System.Drawing.Color.Black
+ Me.Label25.Location = New System.Drawing.Point(22, 91)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(249, 15)
+ Me.Label25.TabIndex = 28
+ Me.Label25.Text = "Coolant Heat Transferred to Air Cabin Heater"
+ '
'lblUnitsAH_FuelFiredHeater
'
Me.lblUnitsAH_FuelFiredHeater.AutoSize = True
Me.lblUnitsAH_FuelFiredHeater.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblUnitsAH_FuelFiredHeater.Location = New System.Drawing.Point(360, 36)
+ Me.lblUnitsAH_FuelFiredHeater.Location = New System.Drawing.Point(398, 30)
Me.lblUnitsAH_FuelFiredHeater.Name = "lblUnitsAH_FuelFiredHeater"
Me.lblUnitsAH_FuelFiredHeater.Size = New System.Drawing.Size(24, 15)
Me.lblUnitsAH_FuelFiredHeater.TabIndex = 27
@@ -1906,7 +1965,7 @@ Partial Class frmHVACTool
'txtAH_FuelFiredHeaterkW
'
Me.txtAH_FuelFiredHeaterkW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
- Me.txtAH_FuelFiredHeaterkW.Location = New System.Drawing.Point(226, 33)
+ Me.txtAH_FuelFiredHeaterkW.Location = New System.Drawing.Point(282, 27)
Me.txtAH_FuelFiredHeaterkW.Name = "txtAH_FuelFiredHeaterkW"
Me.txtAH_FuelFiredHeaterkW.Size = New System.Drawing.Size(97, 21)
Me.txtAH_FuelFiredHeaterkW.TabIndex = 1
@@ -2093,6 +2152,26 @@ Partial Class frmHVACTool
Me.grpACSystem.TabStop = False
Me.grpACSystem.Text = "AC-System"
'
+ 'txtAC_CompressorType
+ '
+ Me.txtAC_CompressorType.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.txtAC_CompressorType.Location = New System.Drawing.Point(214, 59)
+ Me.txtAC_CompressorType.Name = "txtAC_CompressorType"
+ Me.txtAC_CompressorType.ReadOnly = True
+ Me.txtAC_CompressorType.Size = New System.Drawing.Size(101, 21)
+ Me.txtAC_CompressorType.TabIndex = 58
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
+ Me.Label6.ForeColor = System.Drawing.Color.Black
+ Me.Label6.Location = New System.Drawing.Point(13, 30)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(122, 15)
+ Me.Label6.TabIndex = 57
+ Me.Label6.Text = "AC-Compressor Type"
+ '
'txtAC_COP
'
Me.txtAC_COP.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
@@ -2649,37 +2728,6 @@ Partial Class frmHVACTool
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(176, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Open in Folder"
'
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
- Me.Label6.ForeColor = System.Drawing.Color.Black
- Me.Label6.Location = New System.Drawing.Point(13, 30)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(122, 15)
- Me.Label6.TabIndex = 57
- Me.Label6.Text = "AC-Compressor Type"
- '
- 'txtAC_CompressorType
- '
- Me.txtAC_CompressorType.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
- Me.txtAC_CompressorType.Location = New System.Drawing.Point(214, 59)
- Me.txtAC_CompressorType.Name = "txtAC_CompressorType"
- Me.txtAC_CompressorType.ReadOnly = True
- Me.txtAC_CompressorType.Size = New System.Drawing.Size(101, 21)
- Me.txtAC_CompressorType.TabIndex = 58
- '
- 'Label24
- '
- Me.Label24.AutoSize = True
- Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label24.Location = New System.Drawing.Point(349, 349)
- Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(22, 15)
- Me.Label24.TabIndex = 78
- Me.Label24.Text = "oC"
- Me.ToolTip1.SetToolTip(Me.Label24, "Degrees Centigrade")
- '
'frmHVACTool
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2964,4 +3012,8 @@ Partial Class frmHVACTool
Friend WithEvents txtAC_CompressorType As System.Windows.Forms.TextBox
Friend WithEvents Label6 As System.Windows.Forms.Label
Friend WithEvents Label24 As System.Windows.Forms.Label
+ Friend WithEvents txtAH_CoolantHeatToAirCabinHeater As System.Windows.Forms.TextBox
+ Friend WithEvents txtAH_FuelEnergyHeatToCoolant As System.Windows.Forms.TextBox
+ Friend WithEvents Label26 As System.Windows.Forms.Label
+ Friend WithEvents Label25 As System.Windows.Forms.Label
End Class
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.resx b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.resx
index 2f5c2ad9f6..dd597e10d7 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.resx
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.resx
@@ -120,9 +120,6 @@
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOpenAenv.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -155,7 +152,4 @@
<metadata name="CMFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>429, 17</value>
</metadata>
- <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
index 4d1d2d4557..90b063cf41 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
@@ -295,6 +295,8 @@ Public Class frmHVACTool
'Aux. Heater
txtAH_FuelFiredHeaterkW.DataBindings.Add("Text", ssmTOOL.GenInputs, "AH_FuelFiredHeaterkW")
+ txtAH_FuelEnergyHeatToCoolant.DataBindings.Add("Text", ssmTOOL.GenInputs, "AH_FuelEnergyToHeatToCoolant")
+ txtAH_CoolantHeatToAirCabinHeater.DataBindings.Add("Text", ssmTOOL.GenInputs, "AH_CoolantHeatTransferredToAirCabinHeater")
End Sub
@@ -347,7 +349,7 @@ Public Class frmHVACTool
e.Cancel = Not Validate_GeneralInputsBC()
End Sub
- Public Sub Validating_GeneralInputsOther(sender As Object, e As CancelEventArgs) Handles txtEC_Solar.Validating, txtEC_EnviromentalTemperature.Validating, txtAH_FuelFiredHeaterkW.Validating, txtAC_CompressorCapacitykW.Validating, txtEC_EnvironmentConditionsFilePath.Validating
+ Public Sub Validating_GeneralInputsOther(sender As Object, e As CancelEventArgs) Handles txtEC_Solar.Validating, txtEC_EnviromentalTemperature.Validating, txtAH_FuelFiredHeaterkW.Validating, txtAC_CompressorCapacitykW.Validating, txtEC_EnvironmentConditionsFilePath.Validating, txtAH_FuelEnergyHeatToCoolant.Validating, txtAH_CoolantHeatToAirCabinHeater.Validating
e.Cancel = Not Validate_GeneralInputsOther()
@@ -555,6 +557,8 @@ Public Class frmHVACTool
''Aux. Heater
'txtAH_FuelFiredHeaterkW
IsTextBoxNumber(txtAH_FuelFiredHeaterkW, "Please enter a number ( Fuel fired heater )", result)
+ IsTextBoxNumber(txtAH_FuelEnergyHeatToCoolant, "Please enter a number ( Fuel Energy Heat To Coolant )", result)
+ IsTextBoxNumber(txtAH_CoolantHeatToAirCabinHeater, "Please enter a number ( Coolant Heat Transfered To Air CabinHeater )", result)
Try
Dim environmentalConditionsMap As IEnvironmentalConditionsMap = New EnvironmentalConditionsMap(txtEC_EnvironmentConditionsFilePath.Tag, fPATH(vectoFile))
@@ -1382,4 +1386,5 @@ Public Class frmHVACTool
End If
End Sub
+
End Class
--
GitLab