From d8bb450a2e3050c9bfff424dcacb3be72a5eca3a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 22 Aug 2016 09:58:27 +0200 Subject: [PATCH] VolumeForEnergy calculated in [l], ver. 2.10.341 --- .../FixedStartMassCollectionSeq.cs | 14 +++++++------- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 005e821c6..bfa0a55f3 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -405,10 +405,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection else { //double deltaTime = (double)(StateMachine.Time - lastEnergyUpdateTime); - float T_in = (heatMetersPath.TMeterRefWarm1.ReadTemperature() + heatMetersPath.TMeterRefWarm2.ReadTemperature()) / 2; /// [°C] - float T_out = (heatMetersPath.TMeterRefCold1.ReadTemperature() + heatMetersPath.TMeterRefCold2.ReadTemperature()) / 2; /// [°C] - double deltaVolume = 0.001 * LtrPerRefPulse * RefPulsesDelta; /// [m3] - double deltaEnergy = deltaVolume * (T_in - T_out) * Formulas.HeatCoefficientWater(16, T_in, T_out, heatMetersTestParams.FlowMeasuredAtHiTempPipe); /// [J] + float T_in = (heatMetersPath.TMeterRefWarm1.ReadTemperature() + heatMetersPath.TMeterRefWarm2.ReadTemperature()) / 2; /// [°C] + float T_out = (heatMetersPath.TMeterRefCold1.ReadTemperature() + heatMetersPath.TMeterRefCold2.ReadTemperature()) / 2; /// [°C] + double deltaVolume = LtrPerRefPulse * RefPulsesDelta; /// [l] + double deltaEnergy = 0.001 * deltaVolume * (T_in - T_out) * Formulas.HeatCoefficientWater(16, T_in, T_out, heatMetersTestParams.FlowMeasuredAtHiTempPipe); /// [J] = [m3] * [K] * [J/(m3 K)] Energy.Update(deltaEnergy); VolumeForEnergy.Update(deltaVolume); lastEnergyUpdateTime = StateMachine.Time; @@ -648,8 +648,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (meterRslt != null && regReader != null) { meterRslt.PulsesPerLiter = 1.0f; - meterRslt.VolumeStart = regReader.BeginWMState; /// [l] - meterRslt.VolumeEnd = regReader.EndWMState; /// [l] + meterRslt.VolumeStart = regReader.BeginWMState; /// [l] + meterRslt.VolumeEnd = regReader.EndWMState; /// [l] meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l] meterRslt.VolumeRef = tstRslt.VolumeCTV; /// [l] meterRslt.PulsesMeter = meterRslt.VolumeMeter; @@ -677,7 +677,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection } else if (heatMetersTestParams != null) { - tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV * 0.001 / VolumeForEnergy.Sum; + tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV / VolumeForEnergy.Sum; /// [J] = [J] * [l] / [l] /// /// Heat meters diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index d83ea1bd7..f745c7a76 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.10.340.1")] -[assembly: AssemblyFileVersion("2.10.340.1")] +[assembly: AssemblyVersion("2.10.341.1")] +[assembly: AssemblyFileVersion("2.10.341.1")]