diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs index 004080d3a943e2f9f99fc955e4eeb1eb7c33e765..78f89066346511e36de02ce73874fc12e19e559f 100644 --- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs +++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs @@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl //'* * AirSuspension * * // '=IF(K12 = "electrically", 0, G38 * F54) - Suplied Spreadsheet var AirSuspension = (_pneumaticUserInputsConfig.AirSuspensionControl == "Electrically" ? 0 : - _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * _cycleDurationMinutes).SI<NormLiter>(); + _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * (_signals.TotalCycleTimeSeconds / 60.0)).SI<NormLiter>(); //'* * Total Air Demand** var TotalAirDemand = Breaks + ParkBrakesplus2Doors + Kneeling + AdBlue + Regeneration + DeadVolBlowOuts + diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb index b6be23c6c1b82e9dd8fc6abf0f6e878928ded073..8ca7a4b982cc4b4c429e059d14cbd7090ebe649b 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb @@ -262,7 +262,7 @@ Namespace UnitTests New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG.SI(Of Kilogram), "Urban", _Signals) - Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds + Dim expected As Double = 8726.1840 / _Signals.TotalCycleTimeSeconds Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001) End Sub