diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb index 3e0e97e4399a75b492ed946bae94b5c4720d96bd..306c02c1df8ec90fec347d52180db66b9d2f5dd5 100644 --- a/VECTO/Input Files/cMAP.vb +++ b/VECTO/Input Files/cMAP.vb @@ -192,7 +192,8 @@ lbEr: Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As PerSecond) As KilogramPerSecond _ Implements IFuelConsumptionMap.GetFuelConsumption 'MQ: TODO: check units! - Return (fFCdelaunay_Intp(angularVelocity.Value() / Constants.RPMToRad, torque.Value()) / 3600).SI(Of KilogramPerSecond)() + Return _ + (fFCdelaunay_Intp(angularVelocity.Value() / Constants.RPMToRad, torque.Value()) / 3600 / 1000).SI(Of KilogramPerSecond)() End Function End Class diff --git a/VECTO/mAAUX_Global.vb b/VECTO/mAAUX_Global.vb index 19a2d421c3fd64c677a869af82083f1690c8a08d..e671561c10542a6fdca33581e63d21ffa8a9c81c 100644 --- a/VECTO/mAAUX_Global.vb +++ b/VECTO/mAAUX_Global.vb @@ -63,7 +63,7 @@ Module mAAUX_Global advancedAuxModel.VectoInputs.Cycle = DetermineCycleNameFromCurrentFile() advancedAuxModel.VectoInputs.VehicleWeightKG = VEH.Mass.SI(Of Kilogram)() advancedAuxModel.VectoInputs.FuelMap = fuelMap 'ENG.FuelMapFullPath - advancedAuxModel.VectoInputs.FuelDensity = CType(Cfg.FuelDens, Double).SI().Kilo.Gramm.Per.Liter + advancedAuxModel.VectoInputs.FuelDensity = CType(Cfg.FuelDens * 1000, Double).SI(Of KilogramPerCubicMeter)() 'Set Signals advancedAuxModel.Signals.TotalCycleTimeSeconds = CycleTimeInSeconds