From 3ac720bfddb01b01d5e17875a6c6f5f97a172685 Mon Sep 17 00:00:00 2001
From: "Zarb, Glenn" <STC\GZ1>
Date: Fri, 24 Jul 2015 14:23:56 +0000
Subject: [PATCH] convert pre aux power to watts in aa module
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2041
---
VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb | 2 +-
VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb | 5 +----
VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
index 3b356e4fbf..75538ad01e 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
@@ -104,7 +104,7 @@ Namespace DownstreamModules
Private ReadOnly Property Sum9 As Single
Get
- Return signals.EngineDrivelineTorque + signals.PreExistingAuxPower
+ Return signals.EngineDrivelineTorque + ((signals.PreExistingAuxPower * 1000) / Sum0(signals.EngineSpeed))
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
index 8d763ec3af..80b19a614b 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
@@ -147,13 +147,10 @@ Namespace DownstreamModules
Public ReadOnly Property Sum2 As Single
Get
-
- Dim returnValue As Single = _signals.PreExistingAuxPower + _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics
+ Dim returnValue As Single = (_signals.PreExistingAuxPower * 1000) + _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics
Return returnValue
-
-
End Get
End Property
Public ReadOnly Property Sum3 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index c556509142..072121cc48 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -166,7 +166,7 @@ Namespace DownstreamModules
Private ReadOnly Property S14 As Single
Get
- Return Signals.EngineDrivelineTorque + Signals.PreExistingAuxPower
+ Return Signals.EngineDrivelineTorque + ((Signals.PreExistingAuxPower * 1000) / S0(Signals.EngineSpeed))
End Get
End Property
--
GitLab