michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IFlowMeterSingle with GetRange(.) and CorrectedFlow(.), Test method calculations clean-up, refactorization, ver. 3.1.1901

Browse Source
This commit is contained in:
Milan Hanajik
2022-05-04 10:23:21 +02:00
parent 9a42e199e3
commit 2c0ae68db0
51 changed files with 1001 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs
+4 -5
View File
@@ -166,8 +166,8 @@ namespace TBF.Rig.TestMethods.PMaxTest
///
int flowSetTime = (int)Math.Round((DateTime.Now - TestStartTime).TotalSeconds);
StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
UpdateAllStatistics(StateMachine.Time);
StartNewStatistics(null, BatchRslts.Batch.BatchNr, test, repetitionNr, 0);
UpdateAllStatistics();
int startTime = StateMachine.Time;
int endTime = startTime + testParams.DurationPMax;
@@ -187,7 +187,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; }
UpdateAllStatistics(StateMachine.Time);
UpdateAllStatistics();
int remainingTime = Math.Max(endTime - StateMachine.Time, 0);
if (remainingTime > 60)
@@ -233,8 +233,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
tstRslt.MassEndRaw = 0;
tstRslt.MassEnd = 0;
tstRslt.MassOfEvapWater = 0;
tstRslt.FlowMass = 0; /// [kg/h]
tstRslt.FlowVolume = 0; /// [m3/h]
tstRslt.Flow = 0; /// [m3/h]
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]