From 7c93ad3f73baf856069147f48e47c09afa513a2b Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Wed, 12 Nov 2014 16:40:51 +0000
Subject: [PATCH] WIP. Changes to M9 and M4 regarding Unit Rates to get Flow
per second and FC per second in M9 ( grams )
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1674
---
VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb | 6 ++++--
.../VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb | 13 ++++++++++---
.../UnitTests/AirCompressorTests.vb | 2 +-
VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb | 2 +-
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index 58eb2c7855..fb6bbc289c 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -118,12 +118,14 @@ End Property
End Property
private ReadOnly Property S11 As Single
Get
- Return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7)
+ 'Divide by 3600 to get grams per second.
+ Return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7) / 3600
End Get
End Property
private ReadOnly Property S12 As Single
Get
- return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s8)
+ 'Divide by 3600 to get grams per second.
+ return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s8) /3600
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
index 8c29e35bf9..48946be34a 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
@@ -105,7 +105,10 @@ Namespace Pneumatics
''' <remarks></remarks>
Public Function GetFlowRate() As Single Implements IM4_AirCompressor.GetFlowRate
Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
- Return _map.GetFlowRate(compressorRpm)
+
+ ''Flow Rate in the map is Litres/Hour so divide by 60 to get Units per second.
+ Return _map.GetFlowRate(compressorRpm) / 60
+
End Function
''' <summary>
@@ -152,10 +155,14 @@ Namespace Pneumatics
End If
End Function
-
+ ''' <summary>
+ ''' Aver
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Single Implements IM4_AirCompressor.GetAveragePowerDemandPerCompressorUnitFlowRate
- Return _map.GetAveragePowerDemandPerCompressorUnitFlowRate()
+ Return _map.GetAveragePowerDemandPerCompressorUnitFlowRate()
End Function
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index ef81cf56f6..c3e3a0c855 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -132,7 +132,7 @@ End Sub
<Test()>
Public Sub GetCompressorFlowRateTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
- Dim expected As Single = 2.0
+ Dim expected As Single = 0.0333333351f
Dim actual = comp.GetFlowRate()
Assert.AreEqual(expected, actual)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 5412a452bd..0ca71bed3e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -4,7 +4,7 @@ Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries.DownstreamModules
Imports NUnit.Framework
Imports VectoAuxiliaries
-Imports Moq;
+Imports Moq
Namespace UnitTests
--
GitLab