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

TBF/Rig/GenericDevices/IFlowMeter.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using TBF.Rig.Generic;
@@ -13,15 +13,9 @@ namespace TBF.Rig.GenericDevices
 	public interface IFlowMeter : IComponent
 	{
         /// <summary>
-        /// Nominal flow in m3/h at the nominal output frequency (see below).
-        /// In case of a flowmeter couple, the sum of two nominal flows (reached at sum of nominal freq.).
+        /// Reference flow meter communicated to the board: 1-based index, 0 for parallel flow meters
         /// </summary>
-        double NominalFlow { get; }
-
-        /// <summary>
-        /// Nominal frequency in Hz.
-        /// </summary>
-        double NominalFreq { get; }
+        int Idx1 { get; }
 
         /// <summary>
         /// Nominal (uncorrected) volume per flowmeter pulse in [l].
@@ -32,12 +26,19 @@ namespace TBF.Rig.GenericDevices
         /// Corrected volume per flowmeter pulse in [l].
         /// </summary>
         /// <param name="flow">Water flow in [m3/h]</param>
-        double LtrPerPulseCorrected(double flow, int rangeIx);
+        /// <param name="temperature">Water temperature in [°C]</param>
+        double LtrPerPulseCorrected(double flow, float temperature);
 
         /// <summary>
-        /// Reference flow meter communicated to the board: 1-based index, 0 for flow meter twins
+        /// Nominal flow in m3/h at the nominal output frequency (see below).
+        /// In case of a flowmeter couple, the sum of two nominal flows (reached at sum of nominal freq.).
         /// </summary>
-        int Idx1 { get; }
+        double NominalFlow { get; }
+
+        /// <summary>
+        /// Nominal frequency in Hz.
+        /// </summary>
+        double NominalFreq { get; }
 
         /// <summary>
         /// Returns current flow value in [m3/h]
@@ -51,7 +52,7 @@ namespace TBF.Rig.GenericDevices
         /// <returns>Frequency in Hz</returns>
         double ReadFrequency();
 
-		/// <summary>
+        /// <summary>
 		/// Events:  FlowDone, Error
 		/// </summary>
 		/// <param name="flow">Reference to a variable for the measured flow in xxx</param>