From 241bb3aff13c6558e011e03985dfe957a19f8939 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 29 Jan 2021 10:46:21 +0100 Subject: [PATCH] TestTimeCorrection and MassOfEvapWater are stored in SummaryResults columns BK resp. BB --- Results/Entities/TestRslt.cs | 12 +++---- Results/Mappings/TestRsltMap.cs | 2 +- TBF/BenchControl/Sequences/SequenceBase.cs | 31 ++++++++++--------- .../TestMethods/Adjustment/AdjustmentSeq.cs | 2 +- .../CombinedWithDetectionSeq.cs | 4 +-- .../DiverterTest/DiverterTestSeq.cs | 4 +-- .../TestMethods/Endurance/EnduranceSeq.cs | 2 +- .../TestMethods/FixedStart/FixedStartSeq.cs | 2 +- .../FixedStartAdvancedSeq.cs | 2 +- .../FixedStartDeferredEvalSeq.cs | 2 +- .../FixedStartMassCollDeferredEvalSeq.cs | 4 +-- .../FixedStartMassCollectionSeq.cs | 4 +-- .../FixedStartTankCollectionSeq.cs | 2 +- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 2 +- .../FlyingStartFirstRepetWithMassCollSeq.cs | 9 +++--- .../FlyingStartMassCollComparativeSeq.cs | 4 +-- .../FlyingStartMassCollProlongedSeq.cs | 4 +-- .../FlyingStartMassCollectionSeq.cs | 4 +-- .../FlyingStartTankCollectionSeq.cs | 2 +- .../TestMethods/LeakTest/LeakTestSeq.cs | 2 +- .../TestMethods/ManualEntry/ManualEntrySeq.cs | 2 +- .../TestMethods/PMaxTest/PMaxTestSeq.cs | 2 +- .../TestMethods/PulsesTest/PulsesTestSeq.cs | 2 +- .../PulsesTestManual/PulsesTestManualSeq.cs | 2 +- .../SensitivityTest/SensitivityTestSeq.cs | 2 +- .../iPerlCommunicationForm.cs | 2 +- .../iPerlCommunicationSeq.cs | 4 +-- 27 files changed, 59 insertions(+), 57 deletions(-) diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 577bcc254..970bdc135 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -41,7 +41,7 @@ namespace Results.Entities public virtual double DensityIn { get; set; } /// [kg/m3] public virtual double DensityLine { get; set; } /// [kg/m3] public virtual double DensityDiv { get; set; } /// [kg/m3] - public virtual double Buoyancy { get; set; } + public virtual double MassOfEvapWater { get; set; } /// [kg] public virtual double FlowMass { get; set; } /// [kg/h] calculated from conventional true value public virtual double FlowVolume { get; set; } /// [m3/h] public virtual double VolumeCTV { get; set; } /// [l] Volume conventional true value @@ -269,7 +269,7 @@ namespace Results.Entities DensityIn = src.DensityIn; DensityLine = src.DensityLine; DensityDiv = src.DensityDiv; - Buoyancy = src.Buoyancy; + MassOfEvapWater = src.MassOfEvapWater; FlowMass = src.FlowMass; FlowVolume = src.FlowVolume; VolumeCTV = src.VolumeCTV; @@ -390,10 +390,10 @@ namespace Results.Entities public virtual string ToString(int i) { - return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} Buoyancy={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33} AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", + return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWaater={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33} AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84}", Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime, PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd, - DensityIn, DensityLine, DensityDiv, Buoyancy, FlowMass, FlowVolume, + DensityIn, DensityLine, DensityDiv, MassOfEvapWater, FlowMass, FlowVolume, VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax, AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax, @@ -461,7 +461,7 @@ namespace Results.Entities writer.Write(DensityIn); writer.Write(DensityLine); writer.Write(DensityDiv); - writer.Write(Buoyancy); + writer.Write(MassOfEvapWater); writer.Write(FlowMass); writer.Write(FlowVolume); writer.Write(VolumeCTV); @@ -602,7 +602,7 @@ namespace Results.Entities DensityIn = reader.ReadDouble(); DensityLine = reader.ReadDouble(); DensityDiv = reader.ReadDouble(); - Buoyancy = reader.ReadDouble(); + MassOfEvapWater = reader.ReadDouble(); FlowMass = reader.ReadDouble(); FlowVolume = reader.ReadDouble(); VolumeCTV = reader.ReadDouble(); diff --git a/Results/Mappings/TestRsltMap.cs b/Results/Mappings/TestRsltMap.cs index d7cf3437b..dcd0d0bf7 100644 --- a/Results/Mappings/TestRsltMap.cs +++ b/Results/Mappings/TestRsltMap.cs @@ -39,7 +39,7 @@ namespace Results.Mappings Map(x => x.DensityIn); Map(x => x.DensityLine).Column("DensityOut"); Map(x => x.DensityDiv); - Map(x => x.Buoyancy); + Map(x => x.MassOfEvapWater).Column("Buoyancy"); Map(x => x.FlowMass); Map(x => x.FlowVolume); Map(x => x.VolumeCTV); diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index 3e6ef98ed..2bd9d6e76 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -1303,17 +1303,18 @@ namespace TBF.BenchControl.Sequences sb.Append(";"); sb.Append(tstRslt.DensityDiv); /// AY [kg/m3] sb.Append(";"); sb.Append((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2); /// AZ [°C] Tline ... priemerna teplota v linii sb.Append(";"); sb.Append(tstRslt.DensityLine); /// BA [kg/m3] - sb.Append(";"); sb.Append(" "); /// BB d_air: Hustota vzduchu: Sheet1 - K9 - sb.Append(";"); sb.Append(tstRslt.Buoyancy); /// BC Buoyancy: Sheet1 - X9 + sb.Append(";"); sb.Append(tstRslt.MassOfEvapWater); /// BB [kg] mass of evaporated water + sb.Append(";"); sb.Append(tstRslt.Batch.Buoyancy); /// BC Buoyancy: Sheet1 - X9 - sb.Append(";"); sb.Append(Config.Formulas.RealDensity()); /// BD - sb.Append(";"); sb.Append(Config.Formulas.AtTemperature()); /// BE + sb.Append(";"); sb.Append(tstRslt.Batch.RealDensity); /// BD + sb.Append(";"); sb.Append(tstRslt.Batch.AtTemperature); /// BE sb.Append(";"); sb.Append(tstRslt.FlowMax); /// BF pipe expansion: teraz vynechat sb.Append(";"); sb.Append(tstRslt.FlowMin); /// BG [kg/h] Qm sb.Append(";"); sb.Append(tstRslt.FlowVolume); /// BH [l/h] Qv sb.Append(";"); sb.Append(tstRslt.VolumeCTV); /// BI [l] Vet .... komercne prava hodnota objemu - podla vahy sb.Append(";"); sb.Append(tstRslt.VolumeMaster); /// BJ [l] Velm ... objem podla etalonu (Prolonged: objem do vahy podla impulzov hradlovanych klapkou) - sb.Append(";"); sb.Append(" "); /// BK [l] Vmass .. objem podla druheho etalonu / prietokomeru pred tratou (teraz vynechavame) + sb.Append(";"); sb.Append(tstRslt.TestTimeCorrection); /// BK [s] test time correction (diverter correction) + /// (ori.) BK [l] Vmass .. objem podla druheho etalonu / prietokomeru pred tratou (teraz vynechavame) sb.Append(";"); sb.Append(tstRslt.TestTime); /// BL [s] sb.Append(";"); sb.Append(isVolumeMethod ? Config.Formulas.ErrorFromVolumes(tstRslt.ConstMasterCorr, tstRslt.ConstMasterRaw) : tstRslt.ErrorMaster); @@ -1580,8 +1581,8 @@ namespace TBF.BenchControl.Sequences tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, outPath.Scale.Corrections); tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; tstRslt.FlowVolume = 3.6 * outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster / tstRslt.TestTime; - tstRslt.Buoyancy = Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.MassOfEvapWater = 0; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.DensityLine; /// [l] commercially true volume tstRslt.VolumeMaster = outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, 0); /// Corrected master pulses per liter @@ -1661,10 +1662,10 @@ namespace TBF.BenchControl.Sequences tstRslt.MassStart = 0; tstRslt.MassEndRaw = tstRslt.TargetVolume() * Config.Formulas.RealDensity() / 1000.0f; tstRslt.MassEnd = tstRslt.MassEndRaw; - tstRslt.DensityIn = Config.Formulas.RealDensity(); - tstRslt.DensityLine = Config.Formulas.RealDensity(); - tstRslt.DensityDiv = Config.Formulas.RealDensity(); - tstRslt.Buoyancy = Formulas.Buoyancy(); + tstRslt.DensityIn = tstRslt.Batch.RealDensity; + tstRslt.DensityLine = tstRslt.Batch.RealDensity; + tstRslt.DensityDiv = tstRslt.Batch.RealDensity; + tstRslt.MassOfEvapWater = 0; tstRslt.FlowMass = tstRslt.MassEnd / tstRslt.TargetTime(); tstRslt.FlowVolume = tstRslt.TargetVolume() / tstRslt.TargetTime(); tstRslt.VolumeCTV = tstRslt.TargetVolume(); @@ -1792,10 +1793,10 @@ namespace TBF.BenchControl.Sequences tstRslt.MassStart = 0; tstRslt.MassEndRaw = tstRslt.TargetVolume() * Config.Formulas.RealDensity() / 1000.0f; tstRslt.MassEnd = tstRslt.MassEndRaw; - tstRslt.DensityIn = Config.Formulas.RealDensity(); - tstRslt.DensityLine = Config.Formulas.RealDensity(); - tstRslt.DensityDiv = Config.Formulas.RealDensity(); - tstRslt.Buoyancy = Formulas.Buoyancy(); + tstRslt.DensityIn = tstRslt.Batch.RealDensity; + tstRslt.DensityLine = tstRslt.Batch.RealDensity; + tstRslt.DensityDiv = tstRslt.Batch.RealDensity; + tstRslt.MassOfEvapWater = 0; tstRslt.FlowMass = tstRslt.MassEnd / tstRslt.TargetTime(); tstRslt.FlowVolume = tstRslt.TargetVolume() / tstRslt.TargetTime(); tstRslt.VolumeCTV = tstRslt.TargetVolume(); diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index a7448b458..a07c052f3 100644 --- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -413,7 +413,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flow, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 55daf7763..fe641924a 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -683,8 +683,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections); tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = outPath.Diverter.TestTimeCorrection(flow); diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs index 1c267fd03..c196339d4 100644 --- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs +++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs @@ -699,8 +699,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections); tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = testParams.DivRepetitions * outPath.Diverter.TestTimeCorrection(tstRslt.FlowVolume); diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 76a2a851b..6f81eacf7 100644 --- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -369,7 +369,7 @@ namespace TBF.BenchControl.TestMethods.Endurance tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs index 72e74c313..e68e46455 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs @@ -805,7 +805,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = constMasterCorr; /// Corrected master pulses per liter tstRslt.ConstMaster = constMasterCorr; /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index d13dea2fe..d26604841 100644 --- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -585,7 +585,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced tstRslt.MassEnd = massEnd; /// [kg] calculated before displaying 'End state' dialog tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; - tstRslt.Buoyancy = buoyancy; + tstRslt.MassOfEvapWater = massOfEvaporatedWater; tstRslt.VolumeCTV = volumeCTV; /// [kg] calculated before displaying 'End state' dialog tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs index c39347bc8..ad22ba757 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs @@ -801,7 +801,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = constMasterCorr; /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs index 7e555f434..dd47ab94d 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs @@ -947,8 +947,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = buoyancy; - tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flow, rangeIx); /// Corrected master pulses per liter tstRslt.ConstMaster = (tstRslt.VolumeMaster == 0) ? tstRslt.ConstMasterCorr : (LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster); diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index b00897967..f97dfde8e 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -983,8 +983,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = buoyancy; - tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flow, rangeIx); /// Corrected master pulses per liter tstRslt.ConstMaster = (tstRslt.VolumeMaster == 0) ? tstRslt.ConstMasterCorr : (LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster); diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs index 3a5100c40..08b629f1f 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs @@ -725,7 +725,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection tstRslt.FlowMass = 0; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = 0; + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flow, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 2034f0181..0c06cef3c 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -479,7 +479,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flow, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index 5f16bab0a..812d09414 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -750,15 +750,15 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] /// - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); - if (repetitionNr == 1) + if (repetitionNr == 1) { - tstRslt.MassStartRaw = StartMass.Val; + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.MassStartRaw = StartMass.Val; tstRslt.MassStart = Config.Formulas.CorrectedValue(tstRslt.MassStartRaw, scale.Corrections); tstRslt.MassEndRaw = EndMass.Val; tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections); tstRslt.FlowMass = 3600 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = outPath.Diverter.TestTimeCorrection(flow); @@ -791,6 +791,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl { Results.Entities.TestRslt tstResRepet1 = BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, test.Repeats, 1), test.Part); + tstRslt.MassOfEvapWater = 0; tstRslt.MassStartRaw = 0; tstRslt.MassStart = 0; tstRslt.MassEndRaw = 0; diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs index 84719ed9f..7930f1622 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs @@ -871,8 +871,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative tstRslt.MassEnd = EndMass.Val + (refMass - (measuredRefMass.Val - StartMass.Val)); tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = outPath.Diverter.TestTimeCorrection(flow); diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index 1e0a9b048..adfb8e543 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -818,8 +818,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged tstRslt.MassEnd = Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections); tstRslt.FlowMass = 3600 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) * totalPulses / (tstRslt.TestTime * massPulses); /// [kg/h] double flow = 3.6 * LtrPerRefPulse * totalPulses / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume of collected water + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume of collected water if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = outPath.Diverter.TestTimeCorrection(flow); diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 2f4c88294..3ae28ec42 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -744,8 +744,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection tstRslt.MassEnd = Config.Formulas.CorrectedValue(tstRslt.MassEndRaw, scale.Corrections); tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.TestTime; /// [kg/h] double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); - tstRslt.VolumeCTV = 1000 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume + tstRslt.MassOfEvapWater = massOfEvaporatedWater; + tstRslt.VolumeCTV = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart + massOfEvaporatedWater) / tstRslt.DensityLine; /// [l] commercially true volume if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { tstRslt.TestTimeCorrection = outPath.Diverter.TestTimeCorrection(flow); diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs index 23016eb20..e9ea5d2ac 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs @@ -502,7 +502,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; double flow = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = 0; + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeCTV = volumeBox.Val; /// [l] if ((outPath.Diverter != null) && (tstRslt.TestTime > float.Epsilon)) { diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index bf10c03cf..443c7b7a2 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -373,7 +373,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest tstRslt.MassEnd = EndMass.Val; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 0; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = 0; /// [l] volume from the master flow meter tstRslt.VolumeCTV = 0; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = 0; /// Convert the flow to [m3/h] diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs index 30c640bb6..9bf25df13 100644 --- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs +++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs @@ -68,7 +68,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; tstRslt.FlowVolume = 0; - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = 0; tstRslt.ConstMasterRaw = 0; tstRslt.ConstMasterCorr = 0; diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index b14ceea19..f9c31d911 100644 --- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -208,7 +208,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 0; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = 0; /// [l] volume from the master flow meter tstRslt.VolumeCTV = 0; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ConstMasterRaw = 0; /// Convert the flow to [m3/h] diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs index 067fea98f..1bc04a5af 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs @@ -406,7 +406,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs index 7ca3334a5..6dc3dff21 100644 --- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs +++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs @@ -408,7 +408,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse; /// Uncorrected master flowmeter coefficient tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index ac7a3540f..1525d9189 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -477,7 +477,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest tstRslt.MassEnd = 0; tstRslt.FlowMass = 0; tstRslt.FlowVolume = 0; - tstRslt.Buoyancy = Config.Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.VolumeCTV = 0; tstRslt.VolumeMaster = 0; tstRslt.ConstMasterRaw = 0; diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index c6828184e..40f4a6114 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -2705,7 +2705,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication tstRslt.StartTime = tstRslt.Batch.StartTime; tstRslt.EndTime = endTime; tstRslt.FlowSetTime = 0; - tstRslt.Buoyancy = Formulas.Buoyancy(); + tstRslt.MassOfEvapWater = 0; tstRslt.TestTime += testTime; /// [s] total communication time of all tests for (int i = 0; i < iperlHeads.Count; i++) diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 4885bea33..d19115065 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -528,7 +528,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication tstRslt.MassStart = oriTestRslt.MassStart; tstRslt.MassEndRaw = oriTestRslt.MassEndRaw; tstRslt.MassEnd = oriTestRslt.MassEnd; - tstRslt.Buoyancy = oriTestRslt.Buoyancy; + tstRslt.MassOfEvapWater = oriTestRslt.MassOfEvapWater; tstRslt.FlowMass = oriTestRslt.FlowMass; tstRslt.FlowVolume = oriTestRslt.FlowVolume; tstRslt.VolumeCTV = oriTestRslt.VolumeCTV; @@ -678,7 +678,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication tstRslt.MassStart = testRsltQ2ac.MassStart; tstRslt.MassEndRaw = testRsltQ2ac.MassEndRaw; tstRslt.MassEnd = testRsltQ2ac.MassEnd; - tstRslt.Buoyancy = testRsltQ2ac.Buoyancy; + tstRslt.MassOfEvapWater = testRsltQ2ac.MassOfEvapWater; tstRslt.FlowMass = testRsltQ2ac.FlowMass; tstRslt.FlowVolume = testRsltQ2ac.FlowVolume; tstRslt.VolumeCTV = testRsltQ2ac.VolumeCTV;