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

Heat meters evaluation added to FlyingStartMassCollectionSeq and FlyingStartSeq, ver. 2.10.345

Browse Source
This commit is contained in:
Milan Hanajik
2016-08-24 18:30:00 +02:00
parent 49c6ebf9c7
commit c842c50361
6 changed files with 294 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+9 -5
View File
@@ -26,7 +26,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
/// Event.OpArgumentError . Target flow is out of range
/// Event.Error . . . . . . Unspecified error
/// </returns>
public IList<Event> Execute(Config.Entities.Test test, bool compound, HeatMeters.TestParams heatMetersTestParams)
public IList<Event> Execute(Config.Entities.Test test,
bool compound,
HeatMeters.TestParams heatMetersTestParams)
{
Elde.ControlBoardDev cBrd = StateMachine.ControlBoard;
@@ -105,7 +107,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
while (!e.Contains(Event.ValvesSet));
///
/// Display prompt to emerge temperature meters to appropriate baths for heat meters test
///
if (heatMetersTestParams != null && !string.IsNullOrEmpty(heatMetersTestParams.Prompt))
{
State.Create("FixedStartMassCollection : Show heat meters prompt (exchange temperature meters)")
@@ -430,6 +434,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
RefFlow.Val = cBrd.ReferenceFlow;
UpdateAllStatistics();
if (heatMetersTestParams != null)
{
if (lastEnergyUpdateTime == 0)
@@ -449,7 +454,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
}
if (compound)
{
/// TODO: Reimplement for combined meters
@@ -733,11 +737,11 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
}
else if (heatMetersTestParams != null)
{
tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV / VolumeForEnergy.Sum; /// [J]=[J]*[l]/[l]
///
/// Heat meters
///
tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV / VolumeForEnergy.Sum; /// [J]=[J]*[l]/[l]
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
if (test.Part != 0 && test.Part != Utils.PartNr(i + 1, BatchRslts.Batch.Compound)) continue;