SCHEMA 3_03 - COMPLETED AND TESTED

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1716

AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb

@@ -10,15 +10,15 @@ ReadOnly Property Running          As boolean
 ReadOnly Property AuxiliaryName    As String
 ReadOnly Property AuxiliaryVersion As String
 
-readonly property AA_D_M10_P1X as single
-readonly property AA_D_M10_P1Y as single
-readonly property AA_D_M10_P2X as single
-readonly property AA_D_M10_P2Y as single
-readonly property AA_D_M10_P3X as single
-readonly property AA_D_M10_P3Y as single
-readonly property AA_D_M10_XTAIN as single
-readonly property AA_D_M10_INTERP1 as single
-readonly property AA_D_M10_INTERP2 as single
+readonly property AA_D_M12_P1X as single
+readonly property AA_D_M12_P1Y as single
+readonly property AA_D_M12_P2X as single
+readonly property AA_D_M12_P2Y as single
+readonly property AA_D_M12_P3X as single
+readonly property AA_D_M12_P3Y as single
+readonly property AA_D_M12_XTAIN as single
+readonly property AA_D_M12_INTERP1 as single
+readonly property AA_D_M12_INTERP2 as single
 
 
 

VECTO/MODcalc/cMOD.vb

@@ -56,15 +56,15 @@ Public Class cMOD
     public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams        As List(Of single? )
     public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres       As List(Of single? )
 
-    public  AA_D_M10_P1X                            as list( of single  )
-    public  AA_D_M10_P1Y                            as list( of single  )
-    public  AA_D_M10_P2X                            as list( of single  )
-    public  AA_D_M10_P2Y                            as list( of single  )
-    public  AA_D_M10_P3X                            as list( of single  )
-    public  AA_D_M10_P3Y                            as list( of single  )
-    public  AA_D_M10_XTAIN                          as list( of single  )
-    public  AA_D_M10_INTERP1                        as list( of single  )
-    public  AA_D_M10_INTERP2                        as list( of single  )
+    public  AA_D_M12_P1X                            as list( of single  )
+    public  AA_D_M12_P1Y                            as list( of single  )
+    public  AA_D_M12_P2X                            as list( of single  )
+    public  AA_D_M12_P2Y                            as list( of single  )
+    public  AA_D_M12_P3X                            as list( of single  )
+    public  AA_D_M12_P3Y                            as list( of single  )
+    public  AA_D_M12_XTAIN                          as list( of single  )
+    public  AA_D_M12_INTERP1                        as list( of single  )
+    public  AA_D_M12_INTERP2                        as list( of single  )
 
 
     '***********************************************************
@@ -122,15 +122,15 @@ Public Class cMOD
         AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams     = new  List(Of  single? )
         AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres    = new  List(Of  single? )
 
-        AA_D_M10_P1X                                         = new List(Of single )
-        AA_D_M10_P1Y                                         = new List(Of single )
-        AA_D_M10_P2X                                         = new List(Of single )
-        AA_D_M10_P2Y                                         = new List(Of single )
-        AA_D_M10_P3X                                         = new List(Of single )
-        AA_D_M10_P3Y                                         = new List(Of single )
-        AA_D_M10_XTAIN                                       = new List(Of single )
-        AA_D_M10_INTERP1                                     = new List(Of single )
-        AA_D_M10_INTERP2                                     = new List(Of single )
+        AA_D_M12_P1X                                         = new List(Of single )
+        AA_D_M12_P1Y                                         = new List(Of single )
+        AA_D_M12_P2X                                         = new List(Of single )
+        AA_D_M12_P2Y                                         = new List(Of single )
+        AA_D_M12_P3X                                         = new List(Of single )
+        AA_D_M12_P3Y                                         = new List(Of single )
+        AA_D_M12_XTAIN                                       = new List(Of single )
+        AA_D_M12_INTERP1                                     = new List(Of single )
+        AA_D_M12_INTERP2                                     = new List(Of single )
 
         '*************************************************************************
 
@@ -602,15 +602,15 @@ Public Class cMOD
             s.Append(",AA_CompressorFlag [Integer 0/1]")                                    
             s.Append(",AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams")  
             s.Append(",AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres")   
-            s.Append(",AA_D_M10_P1X      [Single]")
-            s.Append(",AA_D_M10_P1Y      [Single]")
-            s.Append(",AA_D_M10_P2X      [Single]")
-            s.Append(",AA_D_M10_P2Y      [Single]")
-            s.Append(",AA_D_M10_P3X      [Single]")
-            s.Append(",AA_D_M10_P3Y      [Single]")
-            s.Append(",AA_D_M10_XTAIN    [Single]")
-            s.Append(",AA_D_M10_INTERP1  [Single]")
-            s.Append(",AA_D_M10_INTERP2  [Single]")
+            s.Append(",AA_D_M12_P1X      [Single]")
+            s.Append(",AA_D_M12_P1Y      [Single]")
+            s.Append(",AA_D_M12_P2X      [Single]")
+            s.Append(",AA_D_M12_P2Y      [Single]")
+            s.Append(",AA_D_M12_P3X      [Single]")
+            s.Append(",AA_D_M12_P3Y      [Single]")
+            s.Append(",AA_D_M12_XTAIN    [Single]")
+            s.Append(",AA_D_M12_INTERP1  [Single]")
+            s.Append(",AA_D_M12_INTERP2  [Single]")
 
 
 
@@ -788,15 +788,15 @@ Public Class cMOD
                       s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC",AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams(t).ToString(),""))  
                       s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC",AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres(t).ToString(),""))
 
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P1X      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P1Y      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P2X      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P2Y      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P3X      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_P3Y      (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_XTAIN    (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_INTERP1  (t).toString(),""))
-                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M10_INTERP2  (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1X      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1Y      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2X      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2Y      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3X      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3Y      (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_XTAIN    (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP1  (t).toString(),""))
+                      s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP2  (t).toString(),""))
 
 
 

VECTO/MODcalc/cPower.vb

@@ -1475,15 +1475,15 @@ lb_nOK:
          ModData.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams   .Add( advancedAuxModel.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams)
          ModData.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres  .Add( advancedAuxModel.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres)
 
-         ModData.AA_D_M10_P1X                                      .Add( advancedAuxModel.AA_D_M10_P1X)
-         ModData.AA_D_M10_P1Y                                      .Add( advancedAuxModel.AA_D_M10_P1Y)
-         ModData.AA_D_M10_P2X                                      .Add( advancedAuxModel.AA_D_M10_P2X)
-         ModData.AA_D_M10_P2Y                                      .Add( advancedAuxModel.AA_D_M10_P2Y)
-         ModData.AA_D_M10_P3X                                      .Add( advancedAuxModel.AA_D_M10_P3X)
-         ModData.AA_D_M10_P3Y                                      .Add( advancedAuxModel.AA_D_M10_P3Y)
-         ModData.AA_D_M10_XTAIN                                    .Add( advancedAuxModel.AA_D_M10_XTAIN)
-         ModData.AA_D_M10_INTERP1                                  .Add( advancedAuxModel.AA_D_M10_INTERP1)
-         ModData.AA_D_M10_INTERP2                                  .Add( advancedAuxModel.AA_D_M10_INTERP2)
+         ModData.AA_D_M12_P1X                                      .Add( advancedAuxModel.AA_D_M12_P1X)
+         ModData.AA_D_M12_P1Y                                      .Add( advancedAuxModel.AA_D_M12_P1Y)
+         ModData.AA_D_M12_P2X                                      .Add( advancedAuxModel.AA_D_M12_P2X)
+         ModData.AA_D_M12_P2Y                                      .Add( advancedAuxModel.AA_D_M12_P2Y)
+         ModData.AA_D_M12_P3X                                      .Add( advancedAuxModel.AA_D_M12_P3X)
+         ModData.AA_D_M12_P3Y                                      .Add( advancedAuxModel.AA_D_M12_P3Y)
+         ModData.AA_D_M12_XTAIN                                    .Add( advancedAuxModel.AA_D_M12_XTAIN)
+         ModData.AA_D_M12_INTERP1                                  .Add( advancedAuxModel.AA_D_M12_INTERP1)
+         ModData.AA_D_M12_INTERP2                                  .Add( advancedAuxModel.AA_D_M12_INTERP2)
 
 
          Catch ex   as Exception

VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb

@@ -408,49 +408,49 @@ End Sub
 
     'PURE DIAGNOSTICS SHOULD ONLY BE USED IN  MOD FOR ENGINEERING TESTS
 
-    Public ReadOnly Property AA_D_M10_INTERP1 As Single Implements IAdvancedAuxiliaries.AA_D_M10_INTERP1
+    Public ReadOnly Property AA_D_M10_INTERP1 As Single Implements IAdvancedAuxiliaries.AA_D_M12_INTERP1
         Get
-         Return M10.INTRP1
+         Return M12.INTRP1
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_INTERP2 As Single Implements IAdvancedAuxiliaries.AA_D_M10_INTERP2
+    Public ReadOnly Property AA_D_M10_INTERP2 As Single Implements IAdvancedAuxiliaries.AA_D_M12_INTERP2
         Get
-         Return M10.INTRP2
+         Return M12.INTRP2
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P1X As Single Implements IAdvancedAuxiliaries.AA_D_M10_P1X
+    Public ReadOnly Property AA_D_M12_P1X As Single Implements IAdvancedAuxiliaries.AA_D_M12_P1X
         Get
-          Return M10.P1X
+          Return M12.P1X
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P1Y As Single Implements IAdvancedAuxiliaries.AA_D_M10_P1Y
+    Public ReadOnly Property AA_D_M12_P1Y As Single Implements IAdvancedAuxiliaries.AA_D_M12_P1Y
         Get
-         Return M10.P1Y
+         Return M12.P1Y
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P2X As Single Implements IAdvancedAuxiliaries.AA_D_M10_P2X
+    Public ReadOnly Property AA_D_M12_P2X As Single Implements IAdvancedAuxiliaries.AA_D_M12_P2X
         Get
-         Return M10.P2X
+         Return M12.P2X
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P2Y As Single Implements IAdvancedAuxiliaries.AA_D_M10_P2Y
+    Public ReadOnly Property AA_D_M12_P2Y As Single Implements IAdvancedAuxiliaries.AA_D_M12_P2Y
         Get
-          Return M10.P2Y
+          Return M12.P2Y
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P3X As Single Implements IAdvancedAuxiliaries.AA_D_M10_P3X
+    Public ReadOnly Property AA_D_M12_P3X As Single Implements IAdvancedAuxiliaries.AA_D_M12_P3X
         Get
-          Return M10.P3X
+          Return M12.P3X
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_P3Y As Single Implements IAdvancedAuxiliaries.AA_D_M10_P3Y
+    Public ReadOnly Property AA_D_M12_P3Y As Single Implements IAdvancedAuxiliaries.AA_D_M12_P3Y
         Get
-         Return M10.P3Y
+         Return M12.P3Y
         End Get
     End Property
-    Public ReadOnly Property AA_D_M10_XTAIN As Single Implements IAdvancedAuxiliaries.AA_D_M10_XTAIN
+    Public ReadOnly Property AA_D_M12_XTAIN As Single Implements IAdvancedAuxiliaries.AA_D_M12_XTAIN
         Get
-          Return M10.XTAIN
+          Return M12.XTAIN
         End Get
     End Property
 

VECTOAux/VectoAuxiliaries/DownstreamModules/IM12.vb

@@ -10,7 +10,23 @@ ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDeman
 
 ReadOnly Property BaseFuelConsumptionWithAverageAuxiliaryLoads As Single
 
+ReadOnly Property P1X as single
 
+ReadOnly Property P1Y as single
+
+ReadOnly Property P2X as single
+
+ReadOnly Property P2Y  as single
+
+ReadOnly Property P3X as single
+
+ReadOnly Property P3Y as single
+
+ReadOnly Property XTAIN  as single
+
+ReadOnly Property INTRP1  as single
+
+ReadOnly Property INTRP2   as single
 
 
 End Interface

VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb

@@ -123,12 +123,29 @@ End Function
 
  Public ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Single Implements IM10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
             Get
-             Return  If( Single.IsNaN( Interpolate(InterpolationType.NonSmartPneumtaics)),0,Interpolate(InterpolationType.NonSmartPneumtaics))
+
+            'SCHM 3_02
+            Dim intrp1 As Single=Interpolate(InterpolationType.NonSmartPneumtaics)
+            intrp1 = If( Not Single.IsNaN( intrp1)  andalso m9.LitresOfAirCompressorOnContinually>0, intrp1,0)            
+            Return  intrp1
+
+
+            'TODO: Remove when tested.
+             'Return  If( Single.IsNaN( Interpolate(InterpolationType.NonSmartPneumtaics)),0,Interpolate(InterpolationType.NonSmartPneumtaics))
+
             End Get
         End Property
  Public ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Single Implements IM10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
             Get
-             Return If( Single.IsNaN(Interpolate( InterpolationType.SmartPneumtaics)),0,Interpolate(InterpolationType.SmartPneumtaics))
+
+            'SCHM 3_02
+            Dim intrp2 As Single=Interpolate(InterpolationType.SmartPneumtaics)
+            intrp2 = If( Not Single.IsNaN( intrp2)  andalso m9.LitresOfAirCompressorOnContinually>0, intrp2,0)            
+            Return  intrp2
+
+            'TODO: Remove when tested.          
+            'Return If( Single.IsNaN(Interpolate( InterpolationType.SmartPneumtaics)),0,Interpolate(InterpolationType.SmartPneumtaics))
+
             End Get
         End Property
  

VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb

@@ -76,12 +76,29 @@ End Property
 End Property
   Private readonly Property Sum7 As Single
     Get
-      Return fmap.fFCdelaunay_Intp(signals.EngineSpeed, sum6)
+
+      'SCM 3_02
+      Dim intrp1 As Single = fmap.fFCdelaunay_Intp(signals.EngineSpeed, sum6)
+      intrp1 = If( Not Single.IsNaN( intrp1) andAlso intrp1>0,intrp1,0)
+      Return intrp1
+
+
+      'TODO: Remove after testing
+      'Return fmap.fFCdelaunay_Intp(signals.EngineSpeed, sum6)
+
+
     End Get
 End Property
   Private ReadOnly Property Sum8 As Single
     Get
-     Return fmap.fFCdelaunay_Intp( signals.EngineSpeed, Sum5)
+
+    'SCHM 3_2
+      Dim intrp2 As Single = fmap.fFCdelaunay_Intp(signals.EngineSpeed, sum5)
+      intrp2 = If( Not Single.IsNaN( intrp2) andAlso intrp2>0,intrp2,0)
+      Return intrp2
+
+     'TODO:Remove after testing Return fmap.fFCdelaunay_Intp( signals.EngineSpeed, Sum5)
+
     End Get
   End Property
 

VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb

@@ -8,6 +8,7 @@ Public Class M12
 Implements IM12
 
 
+
 Private Class Point
 
 Public X As Single
@@ -21,6 +22,23 @@ Private M10 As IM10
 
 Private Signals As ISignals
 
+private _P1X,_P1Y,_P2X,_P2Y,_P3X,_P3Y,_XT, _INTERP1, _INTERP2 As single
+
+Private Sub setPoints()
+
+_P1X=0
+_P1Y=M11.TotalCycleFuelConsumptionZeroElectricalLoad 
+_P2X=M11.SmartElectricalTotalCycleEletricalEnergyGenerated
+_P2Y=M11.TotalCycleFuelConsumptionSmartElectricalLoad
+_P3X=M11.StopStartSensitiveTotalCycleElectricalDemand
+_P3Y=M10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
+_XT=M11.TotalCycleElectricalDemand
+
+
+
+
+End Sub
+
 'Interpolation 
 Private function Sum1()As single
 
@@ -34,7 +52,11 @@ Dim TanTeta as Single = (P2.Y-P1.Y)/(P2.X-P1.X)
 
 IP5y = P1.Y + ( TanTeta * IP5x )
 
-Return  If( Single.IsNaN(IP5Y),0, IP5y)
+_INTERP1= IP5Y
+
+setPoints
+
+Return if( Single.IsNaN(IP5Y),0, IP5y)
 
 End Function
 
@@ -51,6 +73,8 @@ Dim TanTeta as Single = (P3.Y-P1.Y)/(P3.X-P1.X)
 
 IP5y = P1.Y + ( TanTeta * IP5x )
 
+_INTERP2  = IP5y
+
 Return  If( Single.IsNaN(IP5Y),0, IP5y)
 
 End Function
@@ -67,14 +91,88 @@ End Sub
 
 Public ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Single Implements IM12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand
   Get
-     Return Sum1()
+
+     'SCHM 3_2
+     Dim interp1 As Single = Sum1
+     
+     interp1 = If( Not Single.IsNaN(interp1) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand>0, interp1,0)
+     Return interp1
+
+     'TODO:REMOVE AFTER TESTING
+     'Return Sum1()
+
   End Get
 
 End Property
 
+
 Public ReadOnly Property BaseFuelConsumptionWithAverageAuxiliaryLoads As Single Implements IM12.BaseFuelConsumptionWithAverageAuxiliaryLoads
     Get
-      Return Sum2()
+       
+      'SCM 3_02
+     Dim interp2 As Single = Sum2
+     
+     interp2 = If( Not Single.IsNaN(interp2) AndAlso M11.StopStartSensitiveTotalCycleElectricalDemand>0, interp2,0)
+     Return interp2
+
+      'TODO:REMOVE AFTER TESTING
+      'Return Sum2()
+
+    End Get
+End Property
+
+
+        Public ReadOnly Property INTRP1 As Single Implements IM12.INTRP1
+            Get
+             Return _INTERP1
+            End Get
+        End Property
+
+        Public ReadOnly Property INTRP2 As Single Implements IM12.INTRP2
+            Get
+             Return _INTERP2
+            End Get
+        End Property
+
+        Public ReadOnly Property P1X As Single Implements IM12.P1X
+            Get
+             Return _P1X
+            End Get
+        End Property
+
+        Public ReadOnly Property P1Y As Single Implements IM12.P1Y
+            Get
+             Return _p1Y
+            End Get
+        End Property
+
+        Public ReadOnly Property P2X As Single Implements IM12.P2X
+            Get
+             Return _P2X
+            End Get
+        End Property
+
+        Public ReadOnly Property P2Y As Single Implements IM12.P2Y
+            Get
+             Return _P2Y
+            End Get
+        End Property
+
+        Public ReadOnly Property P3X As Single Implements IM12.P3X
+            Get
+              Return _P3X
+            End Get
+        End Property
+
+        Public ReadOnly Property P3Y As Single Implements IM12.P3Y
+            Get
+              Return _P3Y
+            End Get
+        End Property
+
+        Public ReadOnly Property XTAIN As Single Implements IM12.XTAIN
+            Get
+              Return _XT
             End Get
         End Property
 End Class

VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb

@@ -131,23 +131,29 @@ End Property
  End Property
  private ReadOnly Property S11 As Single
      Get
-       'Divide by 3600 to get grams per second.
-
-       Dim int1 As Single = FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7) /3600
-       
+      'SCHM 3_02
+       Dim int1 As Single = FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7)   
        int1 = If( int1 >0 Andalso Not Single.IsNaN(int1), int1,0)
        
+      'TODO:REMOVE ONCE TESTED OK
+      'Return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7) / 3600
 
-      Return FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s7) / 3600
-
-      'Return int1
+       Return int1/3600 
 
      End Get
  End Property
  private ReadOnly Property S12 As Single
       Get
          'Divide by 3600 to get grams per second.
-          return   FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s8) /3600
+         'SCHM 3_02
+         Dim int2 As Single = FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s8)
+         int2 = If( int2 >0 Andalso Not Single.IsNaN(int2), int2,0)
+
+         'TODO:REMOVE ONCE TESTED OK
+         'return   FMAP.fFCdelaunay_Intp(Signals.EngineSpeed,s8) /3600
+
+         Return  int2 /3600
+
       End Get
   End Property
 

VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb

@@ -66,6 +66,59 @@ End Sub
 
 
 
+<Test()> _
+<TestCase(50,50,400,200,100,1200,50,0,0,0.5f,false,50f,0,  0.18110822f,0.18088715f)> _
+Public Sub NEGATIVEINTERPADJUSTMENTValuesInOutTests(IP1  As Single,
+                            IP2  As Single,
+                            IP3  As Single,
+                            IP4  As Single,
+                            IP5  As Single,
+                            IP6  As Single,
+                            IP7  As Single,
+                            IP8  As Single,
+                            IP9  As Single,
+                            IP10 As Single, 
+                            IP11 As Boolean,
+                            AG1  As Single,
+                            AG2  As Single,
+                            AG3  As Single,
+                            AG4  As Single)
+
+      Dim m1Mock    As New Mock(Of IM1_AverageHVACLoadDemand)
+      Dim m4Mock    As New Mock(Of IM4_AirCompressor)
+      Dim m6Mock    As New Mock(Of IM6)
+      Dim m8Mock    As New Mock(Of IM8)
+      Dim fMapMock  As New Mock(Of IFuelMap )
+      Dim sgnlsMock As New Mock(Of ISignals)
+      Dim psac      As New Mock(Of IPneumaticsAuxilliariesConfig )
+
+      fMapMock.Setup ( Function(x) x.fFCdelaunay_Intp(1,1)                             ).Returns(-1)
+      m6Mock.Setup   ( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC )        .Returns(IP1)
+      m1Mock.Setup   ( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts ).Returns(IP2)
+      m4Mock.Setup   ( Function(x) x.GetPowerCompressorOn)                              .Returns(IP3)
+      m4Mock.Setup   ( Function(x) x.GetPowerCompressorOff)                             .Returns(IP4)
+      sgnlsMock.Setup( Function(x) x.EngineDrivelineTorque)                             .Returns(IP5)
+      sgnlsMock.Setup( Function(x) x.EngineSpeed)                                       .Returns(IP6)
+      m4Mock.Setup   ( Function(x) x.GetFlowRate)                                       .Returns(IP7)
+      m6Mock.Setup   ( Function(x) x.OverrunFlag)                                       .Returns(IP8)
+      m8Mock.Setup   ( Function(x) x.CompressorFlag)                                    .Returns(IP9)
+      psac.Setup     ( Function(x) x.OverrunUtilisationForCompressionFraction)          .Returns(IP10)
+      sgnlsMock.Setup( Function(x) x.EngineStopped)                                     .Returns(IP11)
+
+      Dim target As New M9( m1Mock.Object, m4Mock.Object, m6Mock.Object,m8Mock.Object,fMapMock.Object,psac.Object,sgnlsMock.Object)
+
+      target.CycleStep(1)
+
+      Assert.AreEqual(target.LitresOfAirCompressorOnContinually                , AG1 )
+      Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun              , AG2 )
+      Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously , 0 )
+      Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, 0)
+
+
+End Sub
+
+
+
 End Class
 
 End Namespace