PressMtrDelta added to BenchPath, PressDeltaXyz added to TestRslt, test methods modified, ver. 2.12.373
This commit is contained in:
Milan Hanajik
@@ -61,11 +61,12 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
|
||||
State.Create("PMaxTest : Starting the pump")
|
||||
.AddOperation(checkUiOp)
|
||||
.AddOperation(benchPath.TempIn.ReadTempOp(ref TempIn))
|
||||
.AddOperation(benchPath.TempOut.ReadTempOp(ref TempOut))
|
||||
.AddOperation(benchPath.PressIn.ReadPressureOp(ref PressureUp))
|
||||
.AddOperation(benchPath.PressOut.ReadPressureOp(ref PressureDown))
|
||||
.AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60))
|
||||
.AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp))
|
||||
.AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown))
|
||||
.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
|
||||
.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
|
||||
.AddOperation(benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
|
||||
.AddOperation(new Operations.SetAllRegulValvesOp(inPath.RegulValves, inPath.RegulValvesPct, 60))
|
||||
.AddOperation(inPath.Pump != null ? cBrd.SetValvesOp(inPath.Pump, null) : null)
|
||||
.EnterState();
|
||||
do
|
||||
@@ -91,10 +92,11 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
|
||||
State.Create("PMaxTest : Setting the water pressure")
|
||||
.AddOperation(checkUiOp)
|
||||
.AddOperation(benchPath.TempIn.ReadTempOp(ref TempIn))
|
||||
.AddOperation(benchPath.TempOut.ReadTempOp(ref TempOut))
|
||||
.AddOperation(benchPath.PressIn.ReadPressureOp(ref PressureUp))
|
||||
.AddOperation(benchPath.PressOut.ReadPressureOp(ref PressureDown))
|
||||
.AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp))
|
||||
.AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown))
|
||||
.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
|
||||
.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
|
||||
.AddOperation(benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
|
||||
.AddOperation(new Operations.TimerOp(5))
|
||||
.EnterState();
|
||||
do
|
||||
@@ -109,17 +111,17 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
UiBridge.Bridge.OnLog(this, string.Format("time = {0}, pump_power = {1}%, pressure_up = {2}bar, pressure_down = {3}bar\r\n",
|
||||
StateMachine.Time - startTime,
|
||||
pumpPower.ToString("F0"),
|
||||
PressureUp.ToString(),
|
||||
PressureDown.ToString()));
|
||||
PressUp.ToString(),
|
||||
PressDown.ToString()));
|
||||
|
||||
float step = (pumpPower < 40.0f) ? 5.0f : ((pumpPower < 60.0f) ? 3.0f : ((pumpPower < 80.0f) ? 2.0f : 1.0f));
|
||||
|
||||
if (PressureDown.Val < testParams.PressureLo)
|
||||
if (PressDown.Val < testParams.PressureLo)
|
||||
{
|
||||
if (pumpPower == 100.0f) break; /// Already at max. pump power -> Quit loop
|
||||
pumpPower = Math.Min(pumpPower + step, 100.0f); /// Limit max. power to 100%
|
||||
}
|
||||
else if (PressureDown.Val > testParams.PressureHi)
|
||||
else if (PressDown.Val > testParams.PressureHi)
|
||||
{
|
||||
if (pumpPower == 0) break; /// Already at min. pump power -> Quit loop
|
||||
pumpPower = Math.Max(pumpPower - step, 0); /// Limit min. power to 0%
|
||||
@@ -144,10 +146,11 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
//------------------------------------------------
|
||||
State.Create("PMaxTest : Starting the test")
|
||||
.AddOperation(checkUiOp)
|
||||
.AddOperation(benchPath.TempIn.ReadTempOp(ref TempIn))
|
||||
.AddOperation(benchPath.TempOut.ReadTempOp(ref TempOut))
|
||||
.AddOperation(benchPath.PressIn.ReadPressureOp(ref PressureUp))
|
||||
.AddOperation(benchPath.PressOut.ReadPressureOp(ref PressureDown))
|
||||
.AddOperation(benchPath.TempMtrUp.ReadTempOp(ref TempUp))
|
||||
.AddOperation(benchPath.TempMtrDown.ReadTempOp(ref TempDown))
|
||||
.AddOperation(benchPath.PressMtrUp.ReadPressureOp(ref PressUp))
|
||||
.AddOperation(benchPath.PressMtrDown.ReadPressureOp(ref PressDown))
|
||||
.AddOperation(benchPath.PressMtrDelta.ReadPressureOp(ref PressDelta))
|
||||
.AddOperation(new Operations.TimerOp(testParams.DurationPMax))
|
||||
.EnterState();
|
||||
do
|
||||
@@ -192,48 +195,53 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
|
||||
if (tstRslt != null)
|
||||
{
|
||||
/// Auxiliary results
|
||||
tstRslt.AmbientTempAve = (float)AmbientTempStat.Average;
|
||||
tstRslt.AmbTempStart = (float)AmbientTempStat.First;
|
||||
tstRslt.AmbTempEnd = (float)AmbientTempStat.Last;
|
||||
tstRslt.AmbTempMin = (float)AmbientTempStat.Min;
|
||||
tstRslt.AmbTempMax = (float)AmbientTempStat.Max;
|
||||
tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average;
|
||||
tstRslt.AmbPressStart = (float)AmbientPressureStat.First;
|
||||
tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last;
|
||||
tstRslt.AmbPressMin = (float)AmbientPressureStat.Min;
|
||||
tstRslt.AmbPressMax = (float)AmbientPressureStat.Max;
|
||||
tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average;
|
||||
tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First;
|
||||
tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last;
|
||||
tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min;
|
||||
tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max;
|
||||
tstRslt.PressUpAvrg = (float)PressureUpStat.Average;
|
||||
tstRslt.PressUpStart = (float)PressureUpStat.First;
|
||||
tstRslt.PressUpEnd = (float)PressureUpStat.Last;
|
||||
tstRslt.PressUpMin = (float)PressureUpStat.Min;
|
||||
tstRslt.PressUpMax = (float)PressureUpStat.Max;
|
||||
tstRslt.PressDownAvrg = (float)PressureDownStat.Average;
|
||||
tstRslt.PressDownStart = (float)PressureDownStat.First;
|
||||
tstRslt.PressDownEnd = (float)PressureDownStat.Last;
|
||||
tstRslt.PressDownMin = (float)PressureDownStat.Min;
|
||||
tstRslt.PressDownMax = (float)PressureDownStat.Max;
|
||||
tstRslt.TempInAvrg = (float)TempInStat.Average;
|
||||
tstRslt.TempInStart = (float)TempInStat.First;
|
||||
tstRslt.TempInEnd = (float)TempInStat.Last;
|
||||
tstRslt.TempInMin = (float)TempInStat.Min;
|
||||
tstRslt.TempInMax = (float)TempInStat.Max;
|
||||
tstRslt.TempOutAvrg = (float)TempOutStat.Average;
|
||||
tstRslt.TempOutStart = (float)TempOutStat.First;
|
||||
tstRslt.TempOutEnd = (float)TempOutStat.Last;
|
||||
tstRslt.TempOutMin = (float)TempOutStat.Min;
|
||||
tstRslt.TempOutMax = (float)TempOutStat.Max;
|
||||
tstRslt.TempDivAvrg = (float)TempDivStat.Average;
|
||||
tstRslt.AmbTempMean = (float)AmbTempStat.Average;
|
||||
tstRslt.AmbTempStart = (float)AmbTempStat.First;
|
||||
tstRslt.AmbTempEnd = (float)AmbTempStat.Last;
|
||||
tstRslt.AmbTempMin = (float)AmbTempStat.Min;
|
||||
tstRslt.AmbTempMax = (float)AmbTempStat.Max;
|
||||
tstRslt.AmbPressMean = (float)AmbPressStat.Average;
|
||||
tstRslt.AmbPressStart = (float)AmbPressStat.First;
|
||||
tstRslt.AmbPressEnd = (float)AmbPressStat.Last;
|
||||
tstRslt.AmbPressMin = (float)AmbPressStat.Min;
|
||||
tstRslt.AmbPressMax = (float)AmbPressStat.Max;
|
||||
tstRslt.AmbHumiMean = (float)AmbHumiStat.Average;
|
||||
tstRslt.AmbHumiStart = (float)AmbHumiStat.First;
|
||||
tstRslt.AmbHumiEnd = (float)AmbHumiStat.Last;
|
||||
tstRslt.AmbHumiMin = (float)AmbHumiStat.Min;
|
||||
tstRslt.AmbHumiMax = (float)AmbHumiStat.Max;
|
||||
tstRslt.PressUpMean = (float)PressUpStat.Average;
|
||||
tstRslt.PressUpStart = (float)PressUpStat.First;
|
||||
tstRslt.PressUpEnd = (float)PressUpStat.Last;
|
||||
tstRslt.PressUpMin = (float)PressUpStat.Min;
|
||||
tstRslt.PressUpMax = (float)PressUpStat.Max;
|
||||
tstRslt.PressDownMean = (float)PressDownStat.Average;
|
||||
tstRslt.PressDownStart = (float)PressDownStat.First;
|
||||
tstRslt.PressDownEnd = (float)PressDownStat.Last;
|
||||
tstRslt.PressDownMin = (float)PressDownStat.Min;
|
||||
tstRslt.PressDownMax = (float)PressDownStat.Max;
|
||||
tstRslt.PressDeltaMean = (float)PressDeltaStat.Average;
|
||||
tstRslt.PressDeltaStart = (float)PressDeltaStat.First;
|
||||
tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
|
||||
tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
|
||||
tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
|
||||
tstRslt.TempUpMean = (float)TempUpStat.Average;
|
||||
tstRslt.TempUpStart = (float)TempUpStat.First;
|
||||
tstRslt.TempUpEnd = (float)TempUpStat.Last;
|
||||
tstRslt.TempUpMin = (float)TempUpStat.Min;
|
||||
tstRslt.TempUpMax = (float)TempUpStat.Max;
|
||||
tstRslt.TempDownMean = (float)TempDownStat.Average;
|
||||
tstRslt.TempDownStart = (float)TempDownStat.First;
|
||||
tstRslt.TempDownEnd = (float)TempDownStat.Last;
|
||||
tstRslt.TempDownMin = (float)TempDownStat.Min;
|
||||
tstRslt.TempDownMax = (float)TempDownStat.Max;
|
||||
tstRslt.TempDivMean = (float)TempDivStat.Average;
|
||||
tstRslt.TempDivStart = (float)TempDivStat.First;
|
||||
tstRslt.TempDivEnd = (float)TempDivStat.Last;
|
||||
tstRslt.TempDivMin = (float)TempDivStat.Min;
|
||||
tstRslt.TempDivMax = (float)TempDivStat.Max;
|
||||
tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3]
|
||||
tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3]
|
||||
tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempUpMean); /// [kg/m3]
|
||||
tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempDownMean); /// [kg/m3]
|
||||
tstRslt.DensityDiv = 0;
|
||||
|
||||
/// Main results
|
||||
|
||||
Reference in New Issue
Block a user