diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb
index af26e2ac960eb1fe307812c65fa84dda6434c62d..f2ecc200596fc52ef0b12bc61856a66a85e48cba 100644
--- a/VECTO/Input Files/cMAP.vb
+++ b/VECTO/Input Files/cMAP.vb
@@ -188,9 +188,10 @@ lbEr:
#End Region
- Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond _
+ Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As KilogramPerSecond _
Implements IFuelConsumptionMap.GetFuelConsumption
- Return (fFCdelaunay_Intp(angularVelocity, torque.Value()) / 3600).SI(Of GramPerSecond)()
+ 'MQ: TODO: check units!
+ Return (fFCdelaunay_Intp(angularVelocity, torque.Value()) / 3600).SI(Of KilogramPerSecond)()
End Function
End Class
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 5716776c34043f19348e056c477d1e52c5cd8bf8..14f62188b501ad4e1425e11de57136c9f360ee57 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -272,12 +272,12 @@ Public Class AdvancedAuxiliaries
Throw New NotImplementedException
End Function
- Public ReadOnly Property TotalFuelGRAMS As Gram Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
+ Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
Get
If Not M13 Is Nothing Then
Return M14.TotalCycleFCGrams
Else
- Return 0.SI(Of Gram)()
+ Return 0.SI(Of Kilogram)()
End If
End Get
End Property
@@ -412,7 +412,7 @@ Public Class AdvancedAuxiliaries
End Get
End Property
- Public ReadOnly Property AA_TotalCycleFC_Grams As Gram Implements IAdvancedAuxiliaries.AA_TotalCycleFC_Grams
+ Public ReadOnly Property AA_TotalCycleFC_Grams As Kilogram Implements IAdvancedAuxiliaries.AA_TotalCycleFC_Grams
Get
Return M14.TotalCycleFCGrams
End Get
@@ -459,14 +459,14 @@ Public Class AdvancedAuxiliaries
End Get
End Property
- Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Gram _
+ Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Kilogram _
Implements IAdvancedAuxiliaries.AA_TotalCycleFuelConsumptionCompressorOff
Get
Return M9.TotalCycleFuelConsumptionCompressorOffContinuously
End Get
End Property
- Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Gram _
+ Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Kilogram _
Implements IAdvancedAuxiliaries.AA_TotalCycleFuelConsumptionCompressorOn
Get
Return M9.TotalCycleFuelConsumptionCompressorOnContinuously
@@ -477,13 +477,13 @@ Public Class AdvancedAuxiliaries
'TODO:REMOVE WHEN TESTING IS COMPLETE
'PURE DIAGNOSTICS SHOULD ONLY BE USED IN MOD FOR ENGINEERING TESTS
- Public ReadOnly Property AA_D_M12_INTERP1 As Gram Implements IAdvancedAuxiliaries.AA_D_M12_INTERP1
+ Public ReadOnly Property AA_D_M12_INTERP1 As Kilogram Implements IAdvancedAuxiliaries.AA_D_M12_INTERP1
Get
Return M12.INTRP1()
End Get
End Property
- Public ReadOnly Property AA_D_M12_INTERP2 As Gram Implements IAdvancedAuxiliaries.AA_D_M12_INTERP2
+ Public ReadOnly Property AA_D_M12_INTERP2 As Kilogram Implements IAdvancedAuxiliaries.AA_D_M12_INTERP2
Get
Return M12.INTRP2()
End Get
@@ -495,7 +495,7 @@ Public Class AdvancedAuxiliaries
End Get
End Property
- Public ReadOnly Property AA_D_M12_P1Y As Gram Implements IAdvancedAuxiliaries.AA_D_M12_P1Y
+ Public ReadOnly Property AA_D_M12_P1Y As Kilogram Implements IAdvancedAuxiliaries.AA_D_M12_P1Y
Get
Return M12.P1Y()
End Get
@@ -507,7 +507,7 @@ Public Class AdvancedAuxiliaries
End Get
End Property
- Public ReadOnly Property AA_D_M12_P2Y As Gram Implements IAdvancedAuxiliaries.AA_D_M12_P2Y
+ Public ReadOnly Property AA_D_M12_P2Y As Kilogram Implements IAdvancedAuxiliaries.AA_D_M12_P2Y
Get
Return M12.P2Y()
End Get
@@ -519,7 +519,7 @@ Public Class AdvancedAuxiliaries
End Get
End Property
- Public ReadOnly Property AA_D_M12_P3Y As Gram Implements IAdvancedAuxiliaries.AA_D_M12_P3Y
+ Public ReadOnly Property AA_D_M12_P3Y As Kilogram Implements IAdvancedAuxiliaries.AA_D_M12_P3Y
Get
Return M12.P3Y()
End Get
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
index ce93b721f216d803b062bdc65309f48de5d2139e..33375e64882a43e66712723ce171d6fc484a56ec 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb
@@ -18,23 +18,23 @@ Imports VectoAuxiliaries.DownstreamModules
Namespace DownstreamModules
Public Interface IM10
'AverageLoadsFuelConsumptionInterpolatedForPneumatics
- ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Gram
+ ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Kilogram
'Interpolated FC between points 2-3-1 Representing smart Pneumatics = Fuel consumption with smart Pneumatics and average electrical power demand
- ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Gram
+ ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Kilogram
Sub CycleStep(stepTimeInSeconds As Second)
'Added for diagnostic inspection purposes only, does not materially affect the class function.
ReadOnly Property P1X As NormLiter
- ReadOnly Property P1Y As Gram
+ ReadOnly Property P1Y As Kilogram
ReadOnly Property P2X As NormLiter
- ReadOnly Property P2Y As Gram
+ ReadOnly Property P2Y As Kilogram
ReadOnly Property P3X As NormLiter
- ReadOnly Property P3Y As Gram
+ ReadOnly Property P3Y As Kilogram
ReadOnly Property XTAIN As NormLiter
- ReadOnly Property INTRP1 As Gram
- ReadOnly Property INTRP2 As Gram
+ ReadOnly Property INTRP1 As Kilogram
+ ReadOnly Property INTRP2 As Kilogram
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
index 83e604ab7391840ace196dc32cf58f90670ff3e0..af031dbca530f1b6ea72a382ee346fa636a45783 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
@@ -46,7 +46,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalCycleFuelConsumptionSmartElectricalLoad As Gram
+ ReadOnly Property TotalCycleFuelConsumptionSmartElectricalLoad As Kilogram
''' <summary>
''' Total Cycle Fuel Consumption: Zero Electrical Load (g)
@@ -54,7 +54,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalCycleFuelConsumptionZeroElectricalLoad As Gram
+ ReadOnly Property TotalCycleFuelConsumptionZeroElectricalLoad As Kilogram
''' <summary>
''' Stop Start Sensitive: Total Cycle Electrical Demand (J)
@@ -70,7 +70,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalCycleFuelConsuptionAverageLoads As Gram
+ ReadOnly Property TotalCycleFuelConsuptionAverageLoads As Kilogram
''' <summary>
''' Clears aggregated values ( Sets them to zero ).
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
index 5fcc6dd7eff44f87eb3adff935bd368552dc92c1..4f8a681b71efdce16e20d2a763dda7a29fdb91ea 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb
@@ -18,7 +18,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Gram
+ ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Kilogram
''' <summary>
''' Base Fuel Consumption With Average Auxiliary Loads
@@ -26,7 +26,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Gram
+ ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Kilogram
''' <summary>
''' Stop Start Correction
@@ -39,14 +39,14 @@ Namespace DownstreamModules
'Diagnostic Signals Only For Testing - No Material interference with operation of class.
ReadOnly Property P1X As Joule
- ReadOnly Property P1Y As Gram
+ ReadOnly Property P1Y As Kilogram
ReadOnly Property P2X As Joule
- ReadOnly Property P2Y As Gram
+ ReadOnly Property P2Y As Kilogram
ReadOnly Property P3X As Joule
- ReadOnly Property P3Y As Gram
+ ReadOnly Property P3Y As Kilogram
ReadOnly Property XTAIN As Joule
- ReadOnly Property INTRP1 As Gram
- ReadOnly Property INTRP2 As Gram
+ ReadOnly Property INTRP1 As Kilogram
+ ReadOnly Property INTRP2 As Kilogram
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
index 8bee38952acb1497cd0ea021533c87fead980985..04531c6a0bc7945747c45c4bf145a57a659bc6c0 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
@@ -23,7 +23,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks>WHTC and Start Stop Adjusted</remarks>
- ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Gram
+ ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Kilogram
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM14.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM14.vb
index 1904285f492b607a0c0464a31a35df49b67c4a6e..cd9537fc048ef1a08bd19f28bf3176f61cacedf2 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM14.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM14.vb
@@ -6,7 +6,7 @@ Imports VectoAuxiliaries.Hvac
Namespace DownstreamModules
Public Interface IM14
- ReadOnly Property TotalCycleFCGrams As Gram
+ ReadOnly Property TotalCycleFCGrams As Kilogram
ReadOnly Property TotalCycleFCLitres As Liter
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb
index b16d3994f48451d154eb476e6487b8af9b9c837f..a3477464b0458b9576aec1ff46d7c3f912755e2d 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb
@@ -53,7 +53,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalCycleFuelConsumptionCompressorOnContinuously As Gram
+ ReadOnly Property TotalCycleFuelConsumptionCompressorOnContinuously As Kilogram
''' <summary>
''' Total Cycle Fuel Consumption Compressor *OFF* Continuously (G)
@@ -61,7 +61,7 @@ Namespace DownstreamModules
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalCycleFuelConsumptionCompressorOffContinuously As Gram
+ ReadOnly Property TotalCycleFuelConsumptionCompressorOffContinuously As Kilogram
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
index 28999c4fb32d31ec585320d560c56b17740f3c22..1eb3be4564cbd8e64dbd2a6d47e03784f6623c49 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
@@ -25,14 +25,14 @@ Namespace DownstreamModules
'Diagnostics
Private x1 As NormLiter
- Private y1 As Gram
+ Private y1 As Kilogram
Private x2 As NormLiter
- Private y2 As Gram
+ Private y2 As Kilogram
Private x3 As NormLiter
- Private y3 As Gram
+ Private y3 As Kilogram
Private xTA As NormLiter
- Private interp1 As Gram
- Private interp2 As Gram
+ Private interp1 As Kilogram
+ Private interp2 As Kilogram
Public ReadOnly Property P1X As NormLiter Implements IM10.P1X
Get
@@ -40,7 +40,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P1Y As Gram Implements IM10.P1Y
+ Public ReadOnly Property P1Y As Kilogram Implements IM10.P1Y
Get
Return y1
End Get
@@ -52,7 +52,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P2Y As Gram Implements IM10.P2Y
+ Public ReadOnly Property P2Y As Kilogram Implements IM10.P2Y
Get
Return y2
End Get
@@ -64,7 +64,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P3Y As Gram Implements IM10.P3Y
+ Public ReadOnly Property P3Y As Kilogram Implements IM10.P3Y
Get
Return y3
End Get
@@ -76,13 +76,13 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property INTRP1 As Gram Implements IM10.INTRP1
+ Public ReadOnly Property INTRP1 As Kilogram Implements IM10.INTRP1
Get
Return interp1
End Get
End Property
- Public ReadOnly Property INTRP2 As Gram Implements IM10.INTRP2
+ Public ReadOnly Property INTRP2 As Kilogram Implements IM10.INTRP2
Get
Return interp2
End Get
@@ -105,9 +105,9 @@ Namespace DownstreamModules
SmartPneumtaics
End Enum
- Private Function Interpolate(interpType As InterpolationType) As Gram
+ Private Function Interpolate(interpType As InterpolationType) As Kilogram
- Dim returnValue As Gram = 0.SI(Of Gram)()
+ Dim returnValue As Kilogram = 0.SI(Of Kilogram)()
' Dim x1,y1,x2,y2,x3,y3, xTA As Single
x1 = m9.LitresOfAirCompressorOnContinually
@@ -144,23 +144,23 @@ Namespace DownstreamModules
#Region "Public Properties"
- Public ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Gram _
+ Public ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Kilogram _
Implements IM10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
Get
'SCHM 3_02
- Dim intrp1 As Gram = Interpolate(InterpolationType.NonSmartPneumtaics)
+ Dim intrp1 As Kilogram = Interpolate(InterpolationType.NonSmartPneumtaics)
'intrp1 = If(Not Single.IsNaN(intrp1), intrp1, 0)
Return intrp1
End Get
End Property
- Public ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Gram _
+ Public ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Kilogram _
Implements IM10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
Get
'SCHM 3_02
- Dim intrp2 As Gram = Interpolate(InterpolationType.SmartPneumtaics)
+ Dim intrp2 As Kilogram = Interpolate(InterpolationType.SmartPneumtaics)
'intrp2 = If(Not Single.IsNaN(intrp2), intrp2, 0)
Return intrp2
End Get
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
index 621509c9b8e354bea6410ec58bb5a2541c624b28..504dac2b530a3501c971b17d373246bda7ae24b1 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
@@ -25,10 +25,10 @@ Namespace DownstreamModules
Private AG1 As Joule
Private AG2 As Joule
Private AG3 As Joule
- Private AG4 As Gram
- Private AG5 As Gram
+ Private AG4 As Kilogram
+ Private AG5 As Kilogram
Private AG6 As Joule
- Private AG7 As Gram
+ Private AG7 As Kilogram
#End Region
@@ -89,22 +89,22 @@ Namespace DownstreamModules
End Get
End Property
- Private ReadOnly Property Sum7 As GramPerSecond
+ Private ReadOnly Property Sum7 As KilogramPerSecond
Get
'SCM 3_02
- Dim intrp1 As GramPerSecond = fmap.GetFuelConsumption(Sum6, signals.EngineSpeed)
- intrp1 = If(Not Double.IsNaN(intrp1.Value()) AndAlso intrp1 > 0, intrp1, 0.SI(Of GramPerSecond))
+ Dim intrp1 As KilogramPerSecond = fmap.GetFuelConsumption(Sum6, signals.EngineSpeed)
+ intrp1 = If(Not Double.IsNaN(intrp1.Value()) AndAlso intrp1 > 0, intrp1, 0.SI(Of KilogramPerSecond))
Return intrp1
End Get
End Property
- Private ReadOnly Property Sum8 As GramPerSecond
+ Private ReadOnly Property Sum8 As KilogramPerSecond
Get
'SCHM 3_2
- Dim intrp2 As GramPerSecond = fmap.GetFuelConsumption(Sum5, signals.EngineSpeed)
- intrp2 = If(Not Double.IsNaN(intrp2.Value()) AndAlso intrp2 > 0, intrp2, 0.SI(Of GramPerSecond))
+ Dim intrp2 As KilogramPerSecond = fmap.GetFuelConsumption(Sum5, signals.EngineSpeed)
+ intrp2 = If(Not Double.IsNaN(intrp2.Value()) AndAlso intrp2 > 0, intrp2, 0.SI(Of KilogramPerSecond))
Return intrp2
End Get
End Property
@@ -132,12 +132,12 @@ Namespace DownstreamModules
End Get
End Property
- Private ReadOnly Property Sum12 As GramPerSecond
+ Private ReadOnly Property Sum12 As KilogramPerSecond
Get
'SCHM 3_2
- Dim intrp3 As GramPerSecond = fmap.GetFuelConsumption(Sum11, signals.EngineSpeed)
- intrp3 = If(Not Double.IsNaN(intrp3.Value()) AndAlso intrp3 > 0, intrp3, 0.SI(Of GramPerSecond))
+ Dim intrp3 As KilogramPerSecond = fmap.GetFuelConsumption(Sum11, signals.EngineSpeed)
+ intrp3 = If(Not Double.IsNaN(intrp3.Value()) AndAlso intrp3 > 0, intrp3, 0.SI(Of KilogramPerSecond))
Return intrp3
End Get
End Property
@@ -163,14 +163,14 @@ Namespace DownstreamModules
End Get
End Property
'OUT4
- Public ReadOnly Property TotalCycleFuelConsumptionSmartElectricalLoad As Gram _
+ Public ReadOnly Property TotalCycleFuelConsumptionSmartElectricalLoad As Kilogram _
Implements IM11.TotalCycleFuelConsumptionSmartElectricalLoad
Get
Return AG4
End Get
End Property
'OUT5
- Public ReadOnly Property TotalCycleFuelConsumptionZeroElectricalLoad As Gram _
+ Public ReadOnly Property TotalCycleFuelConsumptionZeroElectricalLoad As Kilogram _
Implements IM11.TotalCycleFuelConsumptionZeroElectricalLoad
Get
Return AG5
@@ -184,7 +184,7 @@ Namespace DownstreamModules
End Get
End Property
'OUT7
- Public ReadOnly Property TotalCycleFuelConsuptionAverageLoads As Gram _
+ Public ReadOnly Property TotalCycleFuelConsuptionAverageLoads As Kilogram _
Implements IM11.TotalCycleFuelConsuptionAverageLoads
Get
Return AG7
@@ -203,10 +203,10 @@ Namespace DownstreamModules
AG1 = 0.SI(Of Joule)()
AG2 = 0.SI(Of Joule)()
AG3 = 0.SI(Of Joule)()
- AG4 = 0.SI(Of Gram)()
- AG5 = 0.SI(Of Gram)()
+ AG4 = 0.SI(Of Kilogram)()
+ AG5 = 0.SI(Of Kilogram)()
AG6 = 0.SI(Of Joule)()
- AG7 = 0.SI(Of Gram)()
+ AG7 = 0.SI(Of Kilogram)()
End Sub
'Add to Aggregates dependent on cycle step time.
@@ -228,7 +228,7 @@ Namespace DownstreamModules
'MQ: No longer needed - already per Second 'These need to be divided by 3600 as the Fuel Map output is in Grams/Second.
AG4 += (Sum7 * stepTimeInSeconds) '/ 3600
AG5 += (Sum8 * stepTimeInSeconds) ' / 3600
- AG7 += (Sum12 * stepTimeInSeconds) '/ 3600
+ AG7 += (Sum12 * stepTimeInSeconds) '/ 3600
End If
End Sub
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
index afa56bf6a435a31bfd50b36f7237371406e6002c..1ff23254f1ceb0e90e1d561aa1bee926274344ce 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
@@ -20,21 +20,21 @@ Namespace DownstreamModules
Private Class Point
Public X As Joule
- Public Y As Gram
+ Public Y As Kilogram
End Class
Private M11 As IM11
Private M10 As IM10
Private Signals As ISignals
Private _P1X As Joule
- Private _P1Y As Gram
+ Private _P1Y As Kilogram
Private _P2X As Joule
- Private _P2Y As Gram
+ Private _P2Y As Kilogram
Private _P3X As Joule
- Private _P3Y As Gram
+ Private _P3Y As Kilogram
Private _XT As Joule
- Private _INTERP1 As Gram
- Private _INTERP2 As Gram
+ Private _INTERP1 As Kilogram
+ Private _INTERP2 As Kilogram
Private Sub setPoints()
@@ -48,7 +48,7 @@ Namespace DownstreamModules
End Sub
'Interpolation
- Private Function Sum1() As Gram
+ Private Function Sum1() As Kilogram
Dim P1 As Point = New Point With {.X = 0.SI(Of Joule)(), .Y = M11.TotalCycleFuelConsumptionZeroElectricalLoad}
Dim P2 As Point = New Point _
@@ -56,7 +56,7 @@ Namespace DownstreamModules
.Y = M11.TotalCycleFuelConsumptionSmartElectricalLoad}
Dim IP5x As Joule = M11.TotalCycleElectricalDemand
- Dim IP5y As Gram
+ Dim IP5y As Kilogram
Dim TanTeta As SI = (P2.Y - P1.Y) / (P2.X - P1.X)
@@ -66,10 +66,10 @@ Namespace DownstreamModules
setPoints()
- Return If(Double.IsNaN(IP5y.Value()), 0.SI(Of Gram), IP5y)
+ Return If(Double.IsNaN(IP5y.Value()), 0.SI(Of Kilogram), IP5y)
End Function
- Private Function Sum2() As Gram
+ Private Function Sum2() As Kilogram
Dim P1 As Point = New Point With {.X = 0.SI(Of Joule)(), .Y = M11.TotalCycleFuelConsumptionZeroElectricalLoad}
Dim P3 As Point = New Point _
@@ -77,15 +77,15 @@ Namespace DownstreamModules
.Y = M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics}
Dim IP5x As Joule = M11.TotalCycleElectricalDemand
- Dim IP5y As Gram
+ Dim IP5y As Kilogram
Dim TanTeta As Double = (P3.Y - P1.Y).Value() / (P3.X - P1.X).Value()
- IP5y = P1.Y + (TanTeta * IP5x.Value()).SI(Of Gram)()
+ IP5y = P1.Y + (TanTeta * IP5x.Value()).SI(Of Kilogram)()
_INTERP2 = IP5y
- Return If(Double.IsNaN(IP5y.Value()), 0.SI(Of Gram), IP5y)
+ Return If(Double.IsNaN(IP5y.Value()), 0.SI(Of Kilogram), IP5y)
End Function
'Constructor
@@ -97,12 +97,12 @@ Namespace DownstreamModules
End Sub
'Main Class Outputs
- Public ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Gram _
+ Public ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Kilogram _
Implements IM12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand
Get
'SCHM 3_2
- Dim interp1 As Gram = Sum1()
+ Dim interp1 As Kilogram = Sum1()
interp1 =
If _
@@ -112,12 +112,12 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Gram _
+ Public ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Kilogram _
Implements IM12.BaseFuelConsumptionWithTrueAuxiliaryLoads
Get
'SCM 3_02
- Dim interp2 As Gram = Sum2()
+ Dim interp2 As Kilogram = Sum2()
interp2 =
If _
@@ -133,20 +133,20 @@ Namespace DownstreamModules
Dim _stopStartCorrection As Scalar = BaseFuelConsumptionWithTrueAuxiliaryLoads() /
If _
(M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics > 0,
- M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics, 1.SI(Of Gram))
+ M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics, 1.SI(Of Kilogram))
Return If(_stopStartCorrection > 0, _stopStartCorrection.Value(), 1)
End Get
End Property
'Diagnostics Signal Exposure only. Does not materially affect class operation.
- Public ReadOnly Property INTRP1 As Gram Implements IM12.INTRP1
+ Public ReadOnly Property INTRP1 As Kilogram Implements IM12.INTRP1
Get
Return _INTERP1
End Get
End Property
- Public ReadOnly Property INTRP2 As Gram Implements IM12.INTRP2
+ Public ReadOnly Property INTRP2 As Kilogram Implements IM12.INTRP2
Get
Return _INTERP2
End Get
@@ -158,7 +158,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P1Y As Gram Implements IM12.P1Y
+ Public ReadOnly Property P1Y As Kilogram Implements IM12.P1Y
Get
Return _P1Y
End Get
@@ -170,7 +170,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P2Y As Gram Implements IM12.P2Y
+ Public ReadOnly Property P2Y As Kilogram Implements IM12.P2Y
Get
Return _P2Y
End Get
@@ -182,7 +182,7 @@ Namespace DownstreamModules
End Get
End Property
- Public ReadOnly Property P3Y As Gram Implements IM12.P3Y
+ Public ReadOnly Property P3Y As Kilogram Implements IM12.P3Y
Get
Return _P3Y
End Get
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
index f2020c24d950ac08e72f4812de36c88e8123b343..357c5c0b395a648543643c72c37c318c11f6d7f1 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
@@ -25,74 +25,74 @@ Namespace DownstreamModules
'Internal Staging Calculations
- Private ReadOnly Property Sum1 As Gram
+ Private ReadOnly Property Sum1 As Kilogram
Get
Return m11.TotalCycleFuelConsuptionAverageLoads * m12.StopStartCorrection
End Get
End Property
- Private ReadOnly Property Sum2 As Gram
+ Private ReadOnly Property Sum2 As Kilogram
Get
Return m10.AverageLoadsFuelConsumptionInterpolatedForPneumatics * m12.StopStartCorrection
End Get
End Property
- Private ReadOnly Property Sum3 As Gram
+ Private ReadOnly Property Sum3 As Kilogram
Get
Return m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand * m12.StopStartCorrection
End Get
End Property
- Private ReadOnly Property Sum4 As Gram
+ Private ReadOnly Property Sum4 As Kilogram
Get
Return -m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand() + Sum1
End Get
End Property
- Private ReadOnly Property Sum5 As Gram
+ Private ReadOnly Property Sum5 As Kilogram
Get
Return Sum2 - Sum3
End Get
End Property
- Private ReadOnly Property Sum6 As Gram
+ Private ReadOnly Property Sum6 As Kilogram
Get
Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads() - Sum4
End Get
End Property
- Private ReadOnly Property Sum7 As Gram
+ Private ReadOnly Property Sum7 As Kilogram
Get
Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads() - Sum5
End Get
End Property
- Private ReadOnly Property Sum8 As Gram
+ Private ReadOnly Property Sum8 As Kilogram
Get
Return -Sum4 + Sum7
End Get
End Property
- Private ReadOnly Property Sum9 As Gram
+ Private ReadOnly Property Sum9 As Kilogram
Get
Return SW4 * SW3
End Get
End Property
'Internal Staging Switches
- Private ReadOnly Property SW1 As Gram
+ Private ReadOnly Property SW1 As Kilogram
Get
Return If(signals.SmartPneumatics, Sum8, Sum6)
End Get
End Property
- Private ReadOnly Property SW2 As Gram
+ Private ReadOnly Property SW2 As Kilogram
Get
Return If(signals.SmartPneumatics, Sum3, m12.BaseFuelConsumptionWithTrueAuxiliaryLoads())
End Get
End Property
- Private ReadOnly Property SW3 As Gram
+ Private ReadOnly Property SW3 As Kilogram
Get
Return If(signals.SmartElectrics, SW1, SW2)
End Get
@@ -114,7 +114,7 @@ Namespace DownstreamModules
End Sub
'Public class outputs
- Public ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Gram _
+ Public ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Kilogram _
Implements IM13.WHTCTotalCycleFuelConsumptionGrams
Get
Return Sum9
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
index dc3ccbb58f9ed1e96f6e40c85430a865a06899f1..a3b4ec87cbb5515780c379eee66da7d29d00ed66 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
@@ -30,7 +30,7 @@ Namespace DownstreamModules
'Staging Calculations
Private ReadOnly Property S1 As Joule
Get
- Return (m13.WHTCTotalCycleFuelConsumptionGrams.Value * constants.DieselGCVJperGram).SI(Of Joule)()
+ Return (m13.WHTCTotalCycleFuelConsumptionGrams.Value * constants.DieselGCVJperGram * 1000).SI(Of Joule)()
End Get
End Property
@@ -46,25 +46,28 @@ Namespace DownstreamModules
End Get
End Property
- Private ReadOnly Property S4 As Double 'kW
+ Private ReadOnly Property S4 As Watt 'kW
Get
- Return (S3 / signals.CurrentCycleTimeInSeconds.SI(Of Second)()).Value() / 1000.0
+ Return (S3 / signals.CurrentCycleTimeInSeconds.SI(Of Second)())
End Get
End Property
- Private ReadOnly Property S5 As Double ' hour
+ Private ReadOnly Property S5 As Second ' hour
Get
- Return signals.CurrentCycleTimeInSeconds / 3600
+ Return signals.CurrentCycleTimeInSeconds.SI(Of Second)() ' / 3600
End Get
End Property
- Private ReadOnly Property S6 As Gram
+ Private ReadOnly Property S6 As Kilogram
Get
- Return (S5 * ssm.FuelPerHBaseAsjusted(S4) * (constants.FuelDensity * 1000)).SI(Of Gram)()
+ 'Return (S5.Value() * ssm.FuelPerHBaseAsjusted(S4.Value() / 1000) / 3600 * (constants.FuelDensity)).SI(Of Kilogram)()
+ Return _
+ (S5 * ssm.FuelPerHBaseAsjusted(S4.Value() / 1000).SI().Liter.Per.Hour * constants.FuelDensity.SI().Gramm.Per.Liter).
+ Cast(Of Kilogram)()
End Get
End Property
- Private ReadOnly Property S7 As Gram
+ Private ReadOnly Property S7 As Kilogram
Get
Return m13.WHTCTotalCycleFuelConsumptionGrams + S6
End Get
@@ -72,11 +75,11 @@ Namespace DownstreamModules
Private ReadOnly Property S8 As Liter
Get
- Return (S7.Value() / (constants.FuelDensity * 1000)).SI(Of Liter)()
+ Return (S7 / (constants.FuelDensity.SI().Gramm.Per.Liter)).Cast(Of Liter)()
End Get
End Property
- Public ReadOnly Property TotalCycleFCGrams As Gram Implements IM14.TotalCycleFCGrams
+ Public ReadOnly Property TotalCycleFCGrams As Kilogram Implements IM14.TotalCycleFCGrams
Get
Return S7
End Get
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index 1d922d60ff45043f5d9703f1d9c70f77eda947cb..238a9b1eb20b229af5b4c3ba3469fac0281dd230 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -26,9 +26,9 @@ Namespace DownstreamModules
'AG2
Private _LitresOfAirCompressorOnOnlyInOverrunAggregate As NormLiter
'AG3
- Private _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate As Gram
+ Private _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate As Kilogram
'AG4
- Private _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate As Gram
+ Private _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate As Kilogram
#End Region
@@ -61,14 +61,14 @@ Namespace DownstreamModules
End Get
End Property
'OUT 3
- Public ReadOnly Property TotalCycleFuelConsumptionCompressorOffContinuously As Gram _
+ Public ReadOnly Property TotalCycleFuelConsumptionCompressorOffContinuously As Kilogram _
Implements IM9.TotalCycleFuelConsumptionCompressorOffContinuously
Get
Return _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate
End Get
End Property
'OUT 4
- Public ReadOnly Property TotalCycleFuelConsumptionCompressorOnContinuously As Gram _
+ Public ReadOnly Property TotalCycleFuelConsumptionCompressorOnContinuously As Kilogram _
Implements IM9.TotalCycleFuelConsumptionCompressorOnContinuously
Get
Return _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate
@@ -151,22 +151,22 @@ Namespace DownstreamModules
End Get
End Property
- Private ReadOnly Property S11 As GramPerSecond
+ Private ReadOnly Property S11 As KilogramPerSecond
Get
'SCHM 3_02
- Dim int1 As GramPerSecond = FMAP.GetFuelConsumption(S7, Signals.EngineSpeed)
- int1 = If(int1 > 0 AndAlso Not Double.IsNaN(int1.Value()), int1, 0.SI(Of GramPerSecond))
+ Dim int1 As KilogramPerSecond = FMAP.GetFuelConsumption(S7, Signals.EngineSpeed)
+ int1 = If(int1 > 0 AndAlso Not Double.IsNaN(int1.Value()), int1, 0.SI(Of KilogramPerSecond))
Return int1
End Get
End Property
- Private ReadOnly Property S12 As GramPerSecond
+ Private ReadOnly Property S12 As KilogramPerSecond
Get
'SCHM 3_02
- Dim int2 As GramPerSecond = FMAP.GetFuelConsumption(S8, Signals.EngineSpeed)
- int2 = If(int2 > 0 AndAlso Not Double.IsNaN(int2.Value()), int2, 0.SI(Of GramPerSecond))
+ Dim int2 As KilogramPerSecond = FMAP.GetFuelConsumption(S8, Signals.EngineSpeed)
+ int2 = If(int2 > 0 AndAlso Not Double.IsNaN(int2.Value()), int2, 0.SI(Of KilogramPerSecond))
Return int2
End Get
@@ -198,8 +198,8 @@ Namespace DownstreamModules
_LitresOfAirCompressorOnContinuallyAggregate = SIBase(Of NormLiter).Create(0)
_LitresOfAirCompressorOnOnlyInOverrunAggregate = SIBase(Of NormLiter).Create(0)
- _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate = SIBase(Of Gram).Create(0)
- _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate = SIBase(Of Gram).Create(0)
+ _TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate = SIBase(Of Kilogram).Create(0)
+ _TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate = SIBase(Of Kilogram).Create(0)
End Sub
Public Sub CycleStep(stepTimeInSeconds As Second) Implements IM9.CycleStep
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
index b6b321f546f155fa62b7a1975d9132ff6c90c40d..ce28e88848736b2a0fa6e5b1c5eff9199d186385 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
@@ -184,10 +184,10 @@ lbEr:
#End Region
- Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond _
+ Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As KilogramPerSecond _
Implements IFuelConsumptionMap.GetFuelConsumption
Return _
- (fFCdelaunay_Intp(CType(angularVelocity, Single), CType(torque.Value(), Single)) / 3600.0).SI(Of GramPerSecond)()
+ (fFCdelaunay_Intp(CType(angularVelocity, Single), CType(torque.Value(), Single)) / 3600.0 / 1000.0).SI(Of KilogramPerSecond)()
End Function
End Class
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
index a325e6670324ce4c35961508bd72ba43895492f7..f59b541c296474c28b9441f4cc4d4d983edb091c 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
@@ -25,7 +25,7 @@ Namespace Electrics
Private _ElectricalPowerW As Watt
Private _MechanicalPowerW As Watt
- Private _FuelingLPerH As LiterPerHour
+ Private _FuelingLPerH As LiterPerSecond
'Constructor
Public Sub New(electricalConsumers As IElectricalConsumerList, alternatorEfficiencyMap As IAlternatorMap,
@@ -45,7 +45,7 @@ Namespace Electrics
_ElectricalPowerW = ssmHvac.ElectricalWAdjusted.SI(Of Watt)()
_MechanicalPowerW = ssmHvac.MechanicalWBaseAdjusted.SI(Of Watt)()
- _FuelingLPerH = ssmHvac.FuelPerHBaseAdjusted.SI(Of LiterPerHour)()
+ _FuelingLPerH = ssmHvac.FuelPerHBaseAdjusted.SI(Of LiterPerSecond)()
End Sub
'Public class outputs (Properties)
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb b/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
index 820df6746134ba314e181bdd7b05736373e93904..4b93b7b9d354f5c69748278f45a2b29beefe09b9 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/IHVACConstants.vb
@@ -2,7 +2,20 @@
Namespace Hvac
Public Interface IHVACConstants
+ ''' <summary>
+ ''' Diesel: 44800 [J/g]
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
ReadOnly Property DieselGCVJperGram As Double
+
+ ''' <summary>
+ ''' 835 [g/l]
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
ReadOnly Property FuelDensity As Double
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
index da2ea3993681cf6363a6318f5e1a5c306b8d31ff..36c741a55bfaa68183e97fc6d60d3f96ee6566e1 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
@@ -38,7 +38,7 @@ Namespace Hvac
''' </summary>
''' <returns>Litres Per Hour</returns>
''' <remarks></remarks>
- Function HVACFuelingLitresPerHour() As LiterPerHour
+ Function HVACFuelingLitresPerHour() As LiterPerSecond
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
index 7472cb3f5dfdd2301a1487579d05b7f1ec44fac9..8e3afcc9a5b73fad3f5d6518c7cca779c52bc58e 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
@@ -26,7 +26,7 @@ Namespace Hvac
Private _ElectricalPowerW As Watt
Private _MechanicalPowerW As Watt
- Private _FuelingLPerH As LiterPerHour
+ Private _FuelingLPerH As LiterPerSecond
'Constructor
@@ -67,7 +67,7 @@ Namespace Hvac
_ElectricalPowerW = ssm.ElectricalWAdjusted.SI(Of Watt)()
_MechanicalPowerW = ssm.MechanicalWBaseAdjusted.SI(Of Watt)()
- _FuelingLPerH = ssm.FuelPerHBaseAdjusted.SI(Of LiterPerHour)()
+ _FuelingLPerH = ssm.FuelPerHBaseAdjusted.SI().Liter.Per.Hour.Cast(Of LiterPerSecond)() ' SI(Of LiterPerHour)()
End Sub
'Public Methods - Implementation
@@ -89,7 +89,7 @@ Namespace Hvac
Return _ElectricalPowerW * (1 / _m0.AlternatorsEfficiency() / _alternatorGearEfficiency)
End Function
- Public Function HVACFuelingLitresPerHour() As LiterPerHour _
+ Public Function HVACFuelingLitresPerHour() As LiterPerSecond _
Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
Return _FuelingLPerH
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index aea9d549272bfa52b3f1c9dcda8d5a7c9b633e40..58f061f3c67d82830605f975a28455f8dfd1850d 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -96,9 +96,10 @@ Namespace IntegrationTests
For i As Integer = 0 To 9
Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
aux.CycleStep(1.SI(Of Second), msg)
+ Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Next
- Assert.AreEqual(79.303, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(79.303.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
aux.Signals.EngineDrivelinePower = -15
aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower * 1000 / (1256 * 2 * Math.PI / 60)
@@ -107,9 +108,10 @@ Namespace IntegrationTests
For i As Integer = 0 To 9
Assert.AreEqual(8954.1435, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
aux.CycleStep(1.SI(Of Second), msg)
+ Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Next
- Assert.AreEqual(82.5783, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(82.5783.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
aux.Signals.EngineDrivelinePower = driveLinePower
aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower * 1000 / (1256 * 2 * Math.PI / 60)
@@ -120,7 +122,7 @@ Namespace IntegrationTests
aux.CycleStep(1.SI(Of Second), msg)
Next
- Assert.AreEqual(162.4655, aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(162.4655.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
End Sub
End Class
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index 42d2ef3d3bf5ce277b2745f37bbd6b5a60a2316d..c5e3815812e9a90deef961d7a280c544876b7fa9 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -12,7 +12,7 @@ Public Class M1_Mock
Public _AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Watt
Public _AveragePowerDemandAtCrankFromHVACElectricsWatts As Watt
Public _AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Watt
- Public _HVACFuelingLitresPerHour As LiterPerHour
+ Public _HVACFuelingLitresPerHour As LiterPerSecond
Public Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Watt _
Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
@@ -29,7 +29,7 @@ Public Class M1_Mock
Return _AveragePowerDemandAtCrankFromHVACMechanicalsWatts
End Function
- Public Function HVACFuelingLitresPerHour() As LiterPerHour _
+ Public Function HVACFuelingLitresPerHour() As LiterPerSecond _
Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
Return _HVACFuelingLitresPerHour
End Function
@@ -48,7 +48,8 @@ Public Class M1_Mock
AveragePowerDemandAtAlternatorFromHVACElectricsWatts.SI(Of Watt)()
_AveragePowerDemandAtCrankFromHVACElectricsWatts = AveragePowerDemandAtCrankFromHVACElectricsWatts.SI(Of Watt)()
_AveragePowerDemandAtCrankFromHVACMechanicalsWatts = AveragePowerDemandAtCrankFromHVACMechanicalsWatts.SI(Of Watt)()
- _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI(Of LiterPerHour)()
+ _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI().Liter.Per.Hour.Cast(Of LiterPerSecond)() _
+ '(Of LiterPerHour)()
End Sub
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
index 12e46d286c731f701ab7373bfb401142142287d7..c481c5cf136e8c2ed13e117b2dcbd2388efd6bbf 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -15,9 +15,9 @@ Public Class MockFuel50PC
End Function
- Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond _
+ Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As KilogramPerSecond _
Implements IFuelConsumptionMap.GetFuelConsumption
- Return (fFCdelaunay_Intp(angularVelocity, torque.Value()) / 3600).SI(Of GramPerSecond)()
+ Return (fFCdelaunay_Intp(angularVelocity, torque.Value()) / 3600 / 1000).SI(Of KilogramPerSecond)()
End Function
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index 8cf37b0d068e632eaf5e75786caae9877bd53acc..c637132d749fef1318dfd3dec09e7dda28fcc1be 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -11,7 +11,7 @@ Namespace UnitTests
<TestFixture()>
Public Class M10Test
<Test()> _
- <TestCase(8, 8, 0, 2, 4, 2, 5, 5.75F, 3.5F)>
+ <TestCase(8, 8, 0, 2, 4, 2, 5, 5.75, 3.5)>
Public Sub InterpolationTests(x1 As Double, y1 As Double, x2 As Double, y2 As Double, x3 As Double, y3 As Double,
xTAir As Double, out1 As Double, out2 As Double)
@@ -21,19 +21,19 @@ Namespace UnitTests
m3.Setup(Function(x) x.AverageAirConsumedPerSecondLitre).Returns(xTAir.SI(Of NormLiterPerSecond))
m9.Setup(Function(x) x.LitresOfAirCompressorOnContinually).Returns(x1.SI(Of NormLiter))
- m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOnContinuously).Returns(y1.SI(Of Gram))
+ m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOnContinuously).Returns((y1 / 1000).SI(Of Kilogram))
'x2 is not an output of m9, an is allways zero, but to keep in line with schematic, is represented anyway although it is a constant.
- m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns(y2.SI(Of Gram))
+ m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns((y2 / 1000).SI(Of Kilogram))
m9.Setup(Function(x) x.LitresOfAirCompressorOnOnlyInOverrun).Returns(x3.SI(Of NormLiter))
- m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns(y3.SI(Of Gram))
+ m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns((y3 / 1000).SI(Of Kilogram))
Dim target As IM10 = New M10(m3.Object, m9.Object, signals)
target.CycleStep(1.SI(Of Second))
- Assert.AreEqual(out1, target.AverageLoadsFuelConsumptionInterpolatedForPneumatics.Value(), 0.001)
- Assert.AreEqual(out2, target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand.Value(), 0.001)
+ Assert.AreEqual(out1.SI().Gramm.Value(), target.AverageLoadsFuelConsumptionInterpolatedForPneumatics.Value(), 0.001)
+ Assert.AreEqual(out2.SI().Gramm.Value(), target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand.Value(), 0.001)
End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index 8829b3227f234d00ed29d4e3a29432db6cc36b89..8f3437b768770f233b5dfa1eb89147b4cee0e017 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -63,8 +63,8 @@ Namespace UnitTests
Assert.AreEqual(target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly.Value(), OUT1, 0.00001)
Assert.AreEqual(target.SmartElectricalTotalCycleEletricalEnergyGenerated.Value(), OUT2, 0.00001)
Assert.AreEqual(target.TotalCycleElectricalDemand.Value(), OUT3, 0.00001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.Value(), OUT4, 0.00001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5, 0.00001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.ConvertTo().Gramm.Value(), OUT4, 0.00001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5.SI().Gramm.Value(), 0.00001)
Assert.AreEqual(target.StopStartSensitiveTotalCycleElectricalDemand.Value(), OUT6, 0.00001)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index 7bc21271c644b5da1c5617d98a34a2d576763e36..bc46d489552919a60ff9250a6acc7e809928f7a2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -31,19 +31,20 @@ Namespace UnitTests
sgnlsMock.Setup(Function(x) x.StoredEnergyEfficiency).Returns(0.935)
- m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionZeroElectricalLoad).Returns(IP2.SI(Of Gram))
+ m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionZeroElectricalLoad).Returns((IP2 / 1000).SI(Of Kilogram))
m11Mock.Setup(Function(x) x.SmartElectricalTotalCycleEletricalEnergyGenerated).Returns(IP3.SI(Of Joule))
- m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionSmartElectricalLoad).Returns(IP4.SI(Of Gram))
+ m11Mock.Setup(Function(x) x.TotalCycleFuelConsumptionSmartElectricalLoad).Returns((IP4 / 1000).SI(Of Kilogram))
m11Mock.Setup(Function(x) x.TotalCycleElectricalDemand).Returns(IP5.SI(Of Joule))
m11Mock.Setup(Function(x) x.StopStartSensitiveTotalCycleElectricalDemand).Returns(IP6.SI(Of Joule))
- M10Mock.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns(IP7.SI(Of Gram))
+ M10Mock.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns((IP7 / 1000).SI(Of Kilogram))
'Act
Dim target = New M12(M10Mock.Object, m11Mock.Object, sgnlsMock.Object)
'Assert
- Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(), OUT1, 0.001)
- Assert.AreEqual(target.BaseFuelConsumptionWithTrueAuxiliaryLoads().Value(), OUT2, 0.001)
+ Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(),
+ OUT1.SI().Gramm.Value(), 0.001)
+ Assert.AreEqual(target.BaseFuelConsumptionWithTrueAuxiliaryLoads().Value(), OUT2.SI().Gramm.Value(), 0.001)
End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index bf8736dcf03bc6fb7536e53b776cec5ba2115a0a..a5be740128f5a252576b27ab22366c4172ab94b6 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -17,11 +17,11 @@ Namespace UnitTests
'<TestCase(50, 60, 70, TRUE, TRUE ,100, 1,False, 72287.5f , 86.57185629f )> _
<Test()> _
- <TestCase(50, 60, 70, False, False, 100, 1, False, 60.0F)> _
- <TestCase(50, 60, 70, False, True, 100, 1, False, 110.0F)> _
- <TestCase(50, 60, 70, True, False, 100, 1, False, 0.0F)> _
- <TestCase(50, 60, 70, True, True, 100, 1, False, 110.0F)> _
- <TestCase(50, 60, 70, True, True, 100, 2, True, 220.0F)>
+ <TestCase(50, 60, 70, False, False, 100, 1, False, 60.0)> _
+ <TestCase(50, 60, 70, False, True, 100, 1, False, 110.0)> _
+ <TestCase(50, 60, 70, True, False, 100, 1, False, 0.0)> _
+ <TestCase(50, 60, 70, True, True, 100, 1, False, 110.0)> _
+ <TestCase(50, 60, 70, True, True, 100, 2, True, 220.0)>
Public Sub InputOutputValues(IP1 As Double,
IP2 As Double,
IP3 As Double,
@@ -38,11 +38,13 @@ Namespace UnitTests
Dim m12 As New Mock(Of IM12)
Dim Signals As New Mock(Of ISignals)
- m12.Setup(Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand()).Returns(IP1.SI(Of Gram))
- m12.Setup(Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads()).Returns(IP2.SI(Of Gram))
- m10.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns(0.SI(Of Gram))
- m10.Setup(Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand).Returns(IP3.SI(Of Gram))
- m11.Setup(Function(x) x.TotalCycleFuelConsuptionAverageLoads).Returns(0.SI(Of Gram))
+ m12.Setup(Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand()).Returns(
+ (IP1 / 1000).SI(Of Kilogram))
+ m12.Setup(Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads()).Returns((IP2 / 1000).SI(Of Kilogram))
+ m10.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns((0 / 1000).SI(Of Kilogram))
+ m10.Setup(Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand).Returns(
+ (IP3 / 1000).SI(Of Kilogram))
+ m11.Setup(Function(x) x.TotalCycleFuelConsuptionAverageLoads).Returns((0 / 1000).SI(Of Kilogram))
Signals.Setup(Function(x) x.SmartPneumatics).Returns(IP4)
Signals.Setup(Function(x) x.SmartElectrics).Returns(IP5)
Signals.Setup(Function(x) x.WHTC).Returns(IP7)
@@ -54,7 +56,7 @@ Namespace UnitTests
Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
'Assert
- Assert.AreEqual(OUT1, target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
+ Assert.AreEqual(OUT1.SI().Gramm.Value(), target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 10f7ad00688d04ab100174fce2dfa3685da98373..052403e6d6bb381a799d1c8208f5c601ed79a18c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -97,9 +97,8 @@ Namespace UnitTests
Public Sub ValuesTest()
'Arrange
- Dim ip1 As Single = 1000.0F
- Dim ip5 As Single = 3114
- Dim ip6 As Single = 3114
+ Dim ip1 As Double = 1000.0
+ Dim ip5 As Double = 3114
Dim expectedOut1 As Double = 780333.4
Dim expectedOut2 As Double = 0.934531
@@ -111,7 +110,7 @@ Namespace UnitTests
Dim constants As IHVACConstants = New HVACConstants(835)
'Moq' Arrangements
- m13.Setup(Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1.SI(Of Gram))
+ m13.Setup(Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns((ip1 / 1000).SI(Of Kilogram))
signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(ip5)
@@ -119,7 +118,7 @@ Namespace UnitTests
Dim m14 As New M14(m13.Object, ssmMock, constants, signals.Object)
'Assert
- Assert.AreEqual(expectedOut1, m14.TotalCycleFCGrams.Value(), 0.1)
+ Assert.AreEqual(expectedOut1.SI().Gramm.Value(), m14.TotalCycleFCGrams.Value(), 0.1)
Assert.AreEqual(expectedOut2, m14.TotalCycleFCLitres.Value(), 0.00001)
End Sub
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index fac22d765aeaf8775427804ca5e2409fe967fc9d..17b5dc2e47fafd01e0b6f8bdbf0ce816cdf78aef 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -31,7 +31,7 @@ Namespace UnitTests
ssm.Load(_SSMMAP)
m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage, 0.096, True),
- alternatorMap,powernetVoltage.SI(Of Volt), signals, ssm)
+ alternatorMap, powernetVoltage.SI(Of Volt), signals, ssm)
End Sub
Private Function GETM1Instance() As IM1_AverageHVACLoadDemand
@@ -95,7 +95,7 @@ Namespace UnitTests
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
Dim expected As Single = 0
- Dim actual As LiterPerHour = target.HVACFuelingLitresPerHour()
+ Dim actual As LiterPerSecond = target.HVACFuelingLitresPerHour()
Assert.AreEqual(expected, actual.Value(), 0.001)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index ea356b0f8803db83d52bcada485ad59765f929e5..08211892dc8f6cfdba219fdd594c697aa6de0e5e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -60,8 +60,8 @@ Namespace UnitTests
Assert.AreEqual(target.LitresOfAirCompressorOnContinually.Value(), AG1, 0.000001)
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun.Value(), AG2, 0.000001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), AG3, 0.000001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), AG4, 0.000001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), AG3.SI().Gramm.Value(), 0.000001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), AG4.SI().Gramm.Value(), 0.000001)
End Sub
@@ -91,7 +91,8 @@ Namespace UnitTests
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
- fMapMock.Setup(Function(x) x.GetFuelConsumption(1.SI(Of NewtonMeter), 1)).Returns(-1.SI(Of GramPerSecond)())
+ fMapMock.Setup(Function(x) x.GetFuelConsumption(1.SI(Of NewtonMeter), 1)).Returns(
+ (-1 / 1000).SI(Of KilogramPerSecond)())
m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1.SI(Of Watt))
m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2.SI(Of Watt))
m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3.SI(Of Watt))
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
index 7a3e39357e5e48ac25ba7da89e90887202fc11c9..4b8a27b5c980ca826fa3ad3024166e289fb53b8a 100644
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
+++ b/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
@@ -25,14 +25,14 @@ Public Interface IAdvancedAuxiliaries
'Diagnostic Only - Remove when beta over.
ReadOnly Property AA_D_M12_P1X As Joule
- ReadOnly Property AA_D_M12_P1Y As Gram
+ ReadOnly Property AA_D_M12_P1Y As Kilogram
ReadOnly Property AA_D_M12_P2X As Joule
- ReadOnly Property AA_D_M12_P2Y As Gram
+ ReadOnly Property AA_D_M12_P2Y As Kilogram
ReadOnly Property AA_D_M12_P3X As Joule
- ReadOnly Property AA_D_M12_P3Y As Gram
+ ReadOnly Property AA_D_M12_P3Y As Kilogram
ReadOnly Property AA_D_M12_XTAIN As Joule
- ReadOnly Property AA_D_M12_INTERP1 As Gram
- ReadOnly Property AA_D_M12_INTERP2 As Gram
+ ReadOnly Property AA_D_M12_INTERP1 As Kilogram
+ ReadOnly Property AA_D_M12_INTERP2 As Kilogram
'Additional Permenent Monitoring Signals - Required by engineering
ReadOnly Property AA_NonSmartAlternatorsEfficiency As Double
@@ -46,14 +46,14 @@ Public Interface IAdvancedAuxiliaries
ReadOnly Property AA_OverrunFlag As Boolean
ReadOnly Property AA_EngineIdleFlag As Integer?
ReadOnly Property AA_CompressorFlag As Boolean
- ReadOnly Property AA_TotalCycleFC_Grams As Gram
+ ReadOnly Property AA_TotalCycleFC_Grams As Kilogram
ReadOnly Property AA_TotalCycleFC_Litres As Liter
ReadOnly Property AA_AveragePowerDemandCrankHVACMechanicals As Watt
ReadOnly Property AA_AveragePowerDemandCrankHVACElectricals As Watt
ReadOnly Property AA_AveragePowerDemandCrankElectrics As Watt
ReadOnly Property AA_AveragePowerDemandCrankPneumatics As Watt
- ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Gram
- ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Gram
+ ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Kilogram
+ ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Kilogram
''' <summary>
''' Total Cycle Fuel In Grams
@@ -61,7 +61,7 @@ Public Interface IAdvancedAuxiliaries
''' <value></value>
''' <returns></returns>
''' <remarks></remarks>
- ReadOnly Property TotalFuelGRAMS As Gram
+ ReadOnly Property TotalFuelGRAMS As Kilogram
''' <summary>
''' Total Cycle Fuel in Litres
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
index 415916187afef0e414f4e4c510c06bbaade725d9..8b21811128dde5389105fdc0b94e70f8bc972de1 100644
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
+++ b/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
@@ -8,5 +8,5 @@ Public Interface IFuelConsumptionMap
''' <param name="angularVelocity"></param>
''' <returns></returns>
''' <remarks></remarks>
- Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As GramPerSecond
+ Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As Double) As KilogramPerSecond
End Interface
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 10885bcc699f60a5abf599c670b5205b375a211a..35626c22f165f2a341c42f8d002d68173255073a 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -244,10 +244,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public bool AllowExtrapolation { get; set; }
- public GramPerSecond GetFuelConsumption(NewtonMeter torque, double angularVelocity)
+ public KilogramPerSecond GetFuelConsumption(NewtonMeter torque, double angularVelocity)
{
- return (FcMap.GetFuelConsumption(torque, angularVelocity.RPMtoRad(), AllowExtrapolation).Value() *
- 1000 * 3600).SI<GramPerSecond>();
+ return FcMap.GetFuelConsumption(torque, angularVelocity.RPMtoRad(), AllowExtrapolation);
}
}