From d35bc5fa4fbd3fcdea3d23c5a4de3d90f0c19027 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Mon, 16 Mar 2015 17:59:54 +0000
Subject: [PATCH] WIP - SSM - M0 Recalculation issues with SSM Fixed.
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1828
---
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 19 ++++++++++---------
.../M0_NonSmart_AlternatorsSetEfficiency.vb | 12 +++++++++++-
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 9447311bb2..5d806f0e1b 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -104,12 +104,21 @@ Public Class AdvancedAuxiliaries
auxConfig.ElectricalUserInputsConfig.ElectricalConsumers.DoorDutyCycleFraction = GetDoorActuationTimeFraction( )
+ 'SSM HVAC
+ Dim ssmPath as string = FilePathUtils.ResolveFilePath(vectoDirectory,auxConfig.HvacUserInputsConfig.SSMFilePath)
+ Dim BusDatabase as String = FilePathUtils.ResolveFilePath(vectoDirectory,auxConfig.HvacUserInputsConfig.BusDatabasePath)
+ Dim ssmTool As New SSMTOOL( ssmPath)
+ If( ssmTool.Load(ssmPath)=False )
+
+ Throw New Exception(String.Format("Unable to load the ssmTOOL with file {0}", ssmPath))
+
+ End If
M0 = New M0_NonSmart_AlternatorsSetEfficiency( auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
alternatorMap,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,
Signals,
- auxConfig.HvacUserInputsConfig.SteadyStateModel)
+ ssmTool)
M05 = New M0_5_SmartAlternatorSetEfficiency(M0,
@@ -118,15 +127,7 @@ Public Class AdvancedAuxiliaries
auxConfig.ElectricalUserInputsConfig.ResultCardIdle,
auxConfig.ElectricalUserInputsConfig.ResultCardTraction,
auxConfig.ElectricalUserInputsConfig.ResultCardOverrun,Signals)
-
- Dim ssmPath as string = FilePathUtils.ResolveFilePath(vectoDirectory,auxConfig.HvacUserInputsConfig.SSMFilePath)
- Dim BusDatabase as String = FilePathUtils.ResolveFilePath(vectoDirectory,auxConfig.HvacUserInputsConfig.BusDatabasePath)
- Dim ssmTool As New SSMTOOL( ssmPath)
- If( ssmTool.Load(ssmPath)=False )
- Throw New Exception(String.Format("Unable to load the ssmTOOL with file {0}", ssmPath))
-
- End If
M1 = New M1_AverageHVACLoadDemand(M0,
auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
index 8370f71322..b7ff52f2af 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
@@ -22,6 +22,11 @@ Namespace Electrics
Private _signals As ISignals
Private _steadyStateModelHVAC As ISSMTOOL
+
+ Private _ElectricalPowerW As Single
+ Private _MechanicalPowerW As Single
+ Private _FuelingLPerH As Single
+
'Constructor
Public Sub New(electricalConsumers As IElectricalConsumerList, alternatorEfficiencyMap As IAlternatorMap, powernetVoltage As Single, signals As ISignals, ssmHvac As ISSMTOOL)
@@ -36,6 +41,11 @@ Namespace Electrics
Me._signals = signals
Me._steadyStateModelHVAC = ssmHvac
+ _ElectricalPowerW= ssmHvac.ElectricalWAdjusted
+ _MechanicalPowerW= ssmHvac.MechanicalWBaseAdjusted
+ _FuelingLPerH = ssmHvac.FuelLPerHBaseAdjusted
+
+
End Sub
@@ -51,7 +61,7 @@ Namespace Electrics
End property
Public readonly property GetHVACElectricalPowerDemandAmps As Single Implements IM0_NonSmart_AlternatorsSetEfficiency.GetHVACElectricalPowerDemandAmps
Get
- Return _steadyStateModelHVAC.ElectricalWAdjusted / _powernetVoltage
+ Return _ElectricalPowerW / _powernetVoltage
End Get
End Property
--
GitLab