From b0a534315e090cbd72f608003b52272b0c552ee9 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 13 May 2022 18:17:58 +0200 Subject: [PATCH] Flow control problems when parallel flow meters are used fixed, ver. 3.2.1912 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs | 4 ++-- TBF/Rig/Uni/RegValve/SetFlowOp.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 960dd2707..1f374098e 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.2.1911.0")] -[assembly: AssemblyFileVersion("3.2.1911.0")] +[assembly: AssemblyVersion("3.2.1912.0")] +[assembly: AssemblyFileVersion("3.2.1912.0")] diff --git a/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs b/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs index 1018f9300..de9250d41 100644 --- a/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs +++ b/TBF/Rig/ControlBoard/Uni/FlyingStartStopTestOp.cs @@ -145,8 +145,8 @@ namespace TBF.Rig.ControlBoard.Uni double reqFlowLo = (0.7 * qFrom) + (0.3 * reqFlowAve); /// Move the lower limit 15% of the range up double reqFlowHi = (0.7 * qTo) + (0.3 * reqFlowAve); /// Move the upper limit 15% of the range down /// - uniCB.SetFlow(false, regV.Idx1, flowMeter.NominalFreq * reqFlowLo / flowMeter.NominalFlow, - flowMeter.NominalFreq * reqFlowHi / flowMeter.NominalFlow); + uniCB.SetFlow(false, regV.Idx1, 2000.0 * reqFlowLo / flowMeter.NominalFlow, + 2000.0 * reqFlowHi / flowMeter.NominalFlow); if (readDivTransition) { /// Schedule reading diverter transition data diff --git a/TBF/Rig/Uni/RegValve/SetFlowOp.cs b/TBF/Rig/Uni/RegValve/SetFlowOp.cs index 217acf5df..02f301cdb 100644 --- a/TBF/Rig/Uni/RegValve/SetFlowOp.cs +++ b/TBF/Rig/Uni/RegValve/SetFlowOp.cs @@ -228,8 +228,8 @@ namespace TBF.Rig.Uni.RegValve if (StateMachine.Time > setFlowTime) { - uniCB.SetFlow(false, regV.Idx1, flowMeter.NominalFreq * currentReqFlowLo / flowMeter.NominalFlow, - flowMeter.NominalFreq * currentReqFlowHi / flowMeter.NominalFlow); + uniCB.SetFlow(false, regV.Idx1, 2000.0 * currentReqFlowLo / flowMeter.NominalFlow, + 2000.0 * currentReqFlowHi / flowMeter.NominalFlow); log.InfoFormat("Run(): rv#={0} TARGET: flowLo={1} flowHi={2}", regV.Idx1, currentReqFlowLo, currentReqFlowHi);