From 35cd5335cdff5386571661553c01d4c5e2cc05fb Mon Sep 17 00:00:00 2001 From: "Burns, Terry" <Terry.Burns@ricardo.com> Date: Fri, 16 Jan 2015 13:14:01 +0000 Subject: [PATCH] Replace 1000*EDP and EMP on M6 git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1724 --- VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb index cf8cfe2523..766805a9ee 100644 --- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb +++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb @@ -148,7 +148,7 @@ End Property Get - Dim returnValue As Single = _signals.PreExistingAuxPower +_m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics + Dim returnValue As Single = _signals.PreExistingAuxPower +_m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics Return returnValue @@ -159,13 +159,9 @@ End Property Public ReadOnly Property Sum3 As Single Get - 'Return (_signals.EngineMotoringPower * 1000) + _ - ' (_signals.EngineDrivelinePower * 1000) + _ - ' Sum2 - - Return (_signals.EngineMotoringPower ) + _ - (_signals.EngineDrivelinePower ) + _ - Sum2 + Return (_signals.EngineMotoringPower * 1000) + _ + (_signals.EngineDrivelinePower * 1000) + _ + Sum2 End Get End Property -- GitLab