diff --git a/IBPSA/Examples/SimpleHouse.mo b/IBPSA/Examples/SimpleHouse.mo
index a54bba36a4..d50cc363c5 100644
--- a/IBPSA/Examples/SimpleHouse.mo
+++ b/IBPSA/Examples/SimpleHouse.mo
@@ -87,7 +87,7 @@ model SimpleHouse
 
   Fluid.Movers.FlowControlled_m_flow pum(
     redeclare package Medium = MediumWater,
-    use_inputFilter=false,
+    use_riseTime=false,
     m_flow_nominal=mWat_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=allowFlowReversal,
@@ -109,7 +109,7 @@ model SimpleHouse
   Fluid.Movers.FlowControlled_dp fan(
     redeclare package Medium = MediumAir,
     dp_nominal=dpAir_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mAir_flow_nominal,
diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
index 335d544c15..3e14034314 100644
--- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
+++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
@@ -31,7 +31,7 @@ model SimpleHouse4 "Heating model"
 
   Fluid.Movers.Preconfigured.FlowControlled_m_flow pum(
     redeclare package Medium = MediumWater,
-    use_inputFilter=false,
+    use_riseTime=false,
     m_flow_nominal=mWat_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=false) "Pump"
diff --git a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
index 09a9db3065..361421752c 100644
--- a/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
+++ b/IBPSA/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
@@ -19,12 +19,10 @@ model SimpleHouse6 "Free cooling model"
     redeclare package Medium = MediumAir,
     show_T=true,
     dp_nominal=dpAir_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    m_flow_nominal=mAir_flow_nominal)
-    "Constant head fan" annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        origin={0,130})));
+    m_flow_nominal=mAir_flow_nominal) "Constant head fan" annotation (Placement(
+        transformation(extent={{-10,10},{10,-10}}, origin={0,130})));
 
   IBPSA.Fluid.HeatExchangers.ConstantEffectiveness hexRec(
     redeclare package Medium1 = MediumAir,
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index 3106701fb4..3263ad5ff3 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -2,22 +2,23 @@ within IBPSA.Fluid.Actuators.BaseClasses;
 model ActuatorSignal
   "Partial model that implements the filtered opening for valves and dampers"
 
-  constant Integer order(min=1) = 2 "Order of filter";
+  parameter Boolean use_strokeTime=true
+    "Set to true to continuously open and close valve using strokeTime"
+    annotation(Dialog(tab="Dynamics", group="Actuator position"));
 
-  parameter Boolean use_inputFilter=true
-    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening"));
-  parameter Modelica.Units.SI.Time riseTime=120
-    "Rise time of the filter (time to reach 99.6 % of an opening step)"
+  parameter Modelica.Units.SI.Time strokeTime=120
+    "Time needed to fully open or close actuator"
     annotation (Dialog(
       tab="Dynamics",
-      group="Filtered opening",
-      enable=use_inputFilter));
+      group="Actuator position",
+      enable=use_strokeTime));
   parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
     "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+    annotation(Dialog(tab="Dynamics", group="Actuator position",
+                      enable=use_strokeTime));
   parameter Real y_start=1 "Initial position of actuator"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+    annotation(Dialog(tab="Dynamics", group="Actuator position",
+                      enable=use_strokeTime));
 
   Modelica.Blocks.Interfaces.RealInput y(min=0, max=1)
     "Actuator position (0: closed, 1: open)"
@@ -33,37 +34,36 @@ model ActuatorSignal
     annotation (Placement(transformation(extent={{40,60},{60,80}})));
 
   // Classes used to implement the filtered opening
-protected
-  final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi*
-      riseTime) "Cut-off frequency of filter";
 
+protected
   parameter Boolean casePreInd = false
     "In case of PressureIndependent the model I/O is modified"
     annotation(Evaluate=true);
   Modelica.Blocks.Interfaces.RealOutput y_internal(unit="1")
     "Output connector for internal use (= y_actual if not casePreInd)";
-  Modelica.Blocks.Interfaces.RealOutput y_filtered if use_inputFilter
+  Modelica.Blocks.Interfaces.RealOutput y_filtered if use_strokeTime
     "Filtered valve position in the range 0..1"
     annotation (Placement(transformation(extent={{40,78},{60,98}}),
         iconTransformation(extent={{60,50},{80,70}})));
 
-  IBPSA.Fluid.BaseClasses.ActuatorFilter filter(
-    final n=order,
-    final f=fCut,
-    final normalized=true,
-    final initType=init,
-    final y_start=y_start) if use_inputFilter
-    "Second order filter to approximate actuator opening time, and to improve numerics"
-    annotation (Placement(transformation(extent={{6,81},{20,95}})));
-
+  Modelica.Blocks.Nonlinear.SlewRateLimiter actPos(
+    Rising=1/strokeTime,
+    Falling=-1/strokeTime,
+    Td=0.001*strokeTime,
+    initType=init,
+    y_start=y_start,
+    strict=true) if use_strokeTime "Actuator position"
+    annotation (Placement(transformation(extent={{14,82},{26,94}})));
 equation
-  connect(filter.y, y_filtered)
-    annotation (Line(points={{20.7,88},{50,88}}, color={0,0,127}));
-  if use_inputFilter then
-    connect(y, filter.u) annotation (Line(points={{1.11022e-15,120},{1.11022e-15,
-            88},{4.6,88}}, color={0,0,127}));
-    connect(filter.y, y_internal) annotation (Line(points={{20.7,88},{30,88},{30,
-            70},{50,70}}, color={0,0,127}));
+  connect(actPos.y, y_filtered)
+    annotation (Line(points={{26.6,88},{50,88}},
+                    color={0,0,127}));
+
+  if use_strokeTime then
+  connect(actPos.u, y)
+    annotation (Line(points={{12.8,88},{0,88},{0,120}}, color={0,0,127}));
+
+    connect(y_filtered, y_internal);
   else
     connect(y, y_internal) annotation (Line(
       points={{1.11022e-15,120},{0,120},{0,70},{50,70}},
@@ -72,6 +72,7 @@ equation
   if not casePreInd then
     connect(y_internal, y_actual);
   end if;
+
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
         Line(
@@ -79,19 +80,19 @@ equation
         Line(
           points={{0,70},{40,70}}),
         Rectangle(
-          visible=use_inputFilter,
+          visible=use_strokeTime,
           extent={{-32,40},{34,100}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          visible=use_inputFilter,
+          visible=use_strokeTime,
           extent={{-32,100},{34,40}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
         Text(
-          visible=use_inputFilter,
+          visible=use_strokeTime,
           extent={{-20,94},{22,48}},
           textColor={0,0,0},
           fillColor={135,135,135},
@@ -119,6 +120,12 @@ for a description of the filter.
 </html>", revisions="<html>
 <ul>
 <li>
+August 26, 2024, by Michael Wetter:<br/>
+Implemented linear actuator travel dynamics.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3965\">Buildings, #3965</a> and
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>.
+</li>
+<li>
 June 10, 2021, by Michael Wetter:<br/>
 Changed implementation of the filter and changed the parameter <code>order</code> to a constant
 as most users need not change this value.<br/>
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index 458806ad14..07369a32f5 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -1,36 +1,33 @@
 within IBPSA.Fluid.Actuators.BaseClasses;
 partial model PartialThreeWayValve "Partial three way valve"
   extends IBPSA.Fluid.BaseClasses.PartialThreeWayResistance(
-    m_flow_small = m_flow_nominal*1e-4,
-    final mDyn_flow_nominal = m_flow_nominal,
-      redeclare replaceable
-      IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res1
-        constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
-          deltaM=deltaM,
-          from_dp=from_dp,
-          final linearized=linearized[1],
-          final homotopyInitialization=homotopyInitialization,
-          final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
-          final m_flow_nominal=m_flow_nominal,
-          final dpValve_nominal=dpValve_nominal,
-          final dpFixed_nominal=dpFixed_nominal[1],
-          final use_inputFilter=false,
-          final riseTime=riseTime),
-      redeclare FixedResistances.LosslessPipe res2(
-        m_flow_nominal=m_flow_nominal),
-      redeclare replaceable
-      IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res3
-        constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
-          deltaM=deltaM,
-          from_dp=from_dp,
-          final linearized=linearized[2],
-          final homotopyInitialization=homotopyInitialization,
-          final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
-          final m_flow_nominal=m_flow_nominal,
-          final dpValve_nominal=dpValve_nominal/fraK^2,
-          final dpFixed_nominal=dpFixed_nominal[2],
-          final use_inputFilter=false,
-          final riseTime=riseTime));
+    m_flow_small=m_flow_nominal*1e-4,
+    final mDyn_flow_nominal=m_flow_nominal,
+    redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res1
+      constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
+        deltaM=deltaM,
+        from_dp=from_dp,
+        final linearized=linearized[1],
+        final homotopyInitialization=homotopyInitialization,
+        final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
+        final m_flow_nominal=m_flow_nominal,
+        final dpValve_nominal=dpValve_nominal,
+        final dpFixed_nominal=dpFixed_nominal[1],
+        final use_strokeTime=false,
+        final strokeTime=strokeTime),
+    redeclare FixedResistances.LosslessPipe res2(m_flow_nominal=m_flow_nominal),
+    redeclare replaceable IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve res3
+      constrainedby IBPSA.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
+        deltaM=deltaM,
+        from_dp=from_dp,
+        final linearized=linearized[2],
+        final homotopyInitialization=homotopyInitialization,
+        final CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
+        final m_flow_nominal=m_flow_nominal,
+        final dpValve_nominal=dpValve_nominal/fraK^2,
+        final dpFixed_nominal=dpFixed_nominal[2],
+        final use_strokeTime=false,
+        final strokeTime=strokeTime));
     extends IBPSA.Fluid.Actuators.BaseClasses.ActuatorSignal;
     extends IBPSA.Fluid.Actuators.BaseClasses.ValveParameters(
       rhoStd=Medium.density_pTX(101325, 273.15+4, Medium.X_default));
@@ -115,12 +112,12 @@ equation
           fillColor=DynamicSelect({0,0,0}, (1-y)*{255,255,255}),
           fillPattern=FillPattern.Solid),
     Line(
-      visible=use_inputFilter,
+      visible=use_strokeTime,
       points={{-30,40},{30,40}}),
             Line(
       points={{0,40},{0,0}}),
     Line(
-      visible=not use_inputFilter,
+      visible=not use_strokeTime,
       points={{0,100},{0,40}})}),
     Documentation(info="<html>
 <p>
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
index 92d92bcb1f..f9005ad151 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo
@@ -47,12 +47,12 @@ initial equation
       fillColor={255,255,255},
       fillPattern=FillPattern.Solid),
     Line(
-      visible=use_inputFilter,
+      visible=use_strokeTime,
       points={{-30,40},{30,40}}),
     Line(
       points={{0,40},{0,0}}),
     Line(
-      visible=not use_inputFilter,
+      visible=not use_strokeTime,
       points={{0,100},{0,40}})}),
 Documentation(info="<html>
 <p>
diff --git a/IBPSA/Fluid/Actuators/Dampers/Examples/Damper.mo b/IBPSA/Fluid/Actuators/Dampers/Examples/Damper.mo
index 29cc1c5bdd..75a137a8f8 100644
--- a/IBPSA/Fluid/Actuators/Dampers/Examples/Damper.mo
+++ b/IBPSA/Fluid/Actuators/Dampers/Examples/Damper.mo
@@ -6,7 +6,7 @@ model Damper
 
   IBPSA.Fluid.Actuators.Dampers.Exponential res(
     redeclare package Medium = Medium,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpDamper_nominal=10,
     m_flow_nominal=1,
     k1=0.45) "A damper with quadratic relationship between m_flow and dp"
@@ -33,7 +33,7 @@ model Damper
         transformation(extent={{94,-10},{74,10}})));
 
   IBPSA.Fluid.Actuators.Dampers.PressureIndependent preIndDpFixed_nominal(
-    use_inputFilter=false,
+    use_strokeTime=false,
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dpFixed_nominal=5,
@@ -42,7 +42,7 @@ model Damper
     annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
 
   IBPSA.Fluid.Actuators.Dampers.PressureIndependent preIndFrom_dp(
-    use_inputFilter=false,
+    use_strokeTime=false,
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dpFixed_nominal=0,
@@ -55,7 +55,7 @@ model Damper
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     dpDamper_nominal=10,
-    use_inputFilter=false)
+    use_strokeTime=false)
     "A damper with a mass flow proportional to the input signal"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
 
diff --git a/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo b/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
index 7b9faee299..2c7c5739c2 100644
--- a/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
+++ b/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo
@@ -121,7 +121,7 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     final k1=k1,
     final use_constant_density=use_constant_density,
     final allowFlowReversal=allowFlowReversal,
-    final use_inputFilter=false)
+    final use_strokeTime=false)
     "Outdoor air damper"
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
   IBPSA.Fluid.Actuators.Dampers.Exponential damExh(
@@ -143,7 +143,7 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     final k1=k1,
     final use_constant_density=use_constant_density,
     final allowFlowReversal=allowFlowReversal,
-    final use_inputFilter=false)
+    final use_strokeTime=false)
     "Exhaust air damper"
     annotation (Placement(transformation(extent={{-20,-70},{-40,-50}})));
   IBPSA.Fluid.Actuators.Dampers.Exponential damRec(
@@ -165,7 +165,7 @@ model MixingBox "Outside air mixing box with interlocked air dampers"
     final k1=k1,
     final use_constant_density=use_constant_density,
     final allowFlowReversal=allowFlowReversal,
-    final use_inputFilter=false)
+    final use_strokeTime=false)
     "Recirculation air damper"
     annotation (
       Placement(transformation(
diff --git a/IBPSA/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo b/IBPSA/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
index 1cff13a19d..7f1a8774f1 100644
--- a/IBPSA/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
+++ b/IBPSA/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo
@@ -10,7 +10,7 @@ model PressureIndependent
     "Damper nominal mass flow rate";
   IBPSA.Fluid.Actuators.Dampers.Exponential damExp(
     redeclare final package Medium = Medium,
-    use_inputFilter=false,
+    use_strokeTime=false,
     final dpDamper_nominal=dp_nominal,
     final m_flow_nominal=m_flow_nominal)
     "Damper with exponential opening characteristics"
@@ -36,12 +36,12 @@ model PressureIndependent
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final dpDamper_nominal=dp_nominal,
-    use_inputFilter=false)
+    use_strokeTime=false)
     "Pressure independent damper"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Exponential damExpPI(
     redeclare final package Medium = Medium,
-    use_inputFilter=false,
+    use_strokeTime=false,
     final dpDamper_nominal=dp_nominal,
     final m_flow_nominal=m_flow_nominal)
     "Damper with exponential opening characteristics"
diff --git a/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo b/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo
index 55aad8ddf1..2b4b80da6d 100644
--- a/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo
+++ b/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo
@@ -84,7 +84,7 @@ The output <code>y</code> is bounded between <code>0</code> and <code>1</code>.
 <p>
 <b>Note:</b> This model can introduce state events which increase the computation time.
 For a more efficient implementation that approximates a motor, set in
-the valve or damper model the parameter <code>use_inputFilter=true</code>
+the valve or damper model the parameter <code>use_strokeTime=true</code>
 instead of using this motor model.
 See also
 <a href=\"modelica://IBPSA.Fluid.Actuators.UsersGuide\">
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo b/IBPSA/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo
index 9c7d8eab3b..8515cd6b68 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/ThreeWayValves.mo
@@ -8,7 +8,7 @@ model ThreeWayValves "Three way valves with different opening characteristics"
     redeclare package Medium = Medium,
     l={0.05,0.05},
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     "Valve model, linear opening characteristics"
@@ -39,7 +39,7 @@ model ThreeWayValves "Three way valves with different opening characteristics"
     redeclare package Medium = Medium,
     R=10,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
@@ -53,7 +53,7 @@ model ThreeWayValves "Three way valves with different opening characteristics"
   IBPSA.Fluid.Actuators.Valves.ThreeWayTable valTab(
     redeclare package Medium = Medium,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     flowCharacteristics1=IBPSA.Fluid.Actuators.Valves.Data.Linear(),
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mo b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mo
index 7c5ef848e5..6aa0240d32 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvePressureIndependent.mo
@@ -27,7 +27,7 @@ model TwoWayValvePressureIndependent
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
-    use_inputFilter=false,
+    use_strokeTime=false,
     l=0.05,
     from_dp=true,
     dpFixed_nominal=0,
@@ -44,7 +44,7 @@ model TwoWayValvePressureIndependent
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
-    use_inputFilter=false,
+    use_strokeTime=false,
     l=0.05,
     dpFixed_nominal=5000,
     from_dp=true,
@@ -55,7 +55,7 @@ model TwoWayValvePressureIndependent
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
-    use_inputFilter=false,
+    use_strokeTime=false,
     l=0.05,
     from_dp=false,
     dpFixed_nominal=0,
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
index f4f5ea7fda..c804e8d163 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValveTable.mo
@@ -26,7 +26,7 @@ model TwoWayValveTable
         transformation(extent={{72,10},{52,30}})));
   Valves.TwoWayTable valTab(
     redeclare package Medium = Medium,
-    use_inputFilter=false,
+    use_strokeTime=false,
     from_dp=true,
     flowCharacteristics=datVal,
     CvData=IBPSA.Fluid.Types.CvTypes.Kv,
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValves.mo b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValves.mo
index 99f5009590..c824addcd2 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValves.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValves.mo
@@ -7,7 +7,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
     redeclare package Medium = Medium,
     l=0.05,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{0,70},{20,90}})));
     Modelica.Blocks.Sources.Ramp y(
@@ -32,7 +32,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
     redeclare package Medium = Medium,
     l=0.05,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000) "Valve model, quick opening characteristics"
     annotation (Placement(transformation(extent={{0,30},{20,50}})));
   IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage valEqu(
@@ -41,7 +41,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
     R=10,
     delta0=0.1,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000)
     "Valve model, equal percentage opening characteristics"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
@@ -51,7 +51,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
     m_flow_nominal=1,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
     dpValve_nominal=10000,
-    use_inputFilter=false,
+    use_strokeTime=false,
     l=0.05,
     l2=0.01) annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
   TwoWayPolynomial valPol(
@@ -59,7 +59,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
     l=0.05,
     m_flow_nominal=1,
     dpValve_nominal=10000,
-    use_inputFilter=false,
+    use_strokeTime=false,
     redeclare package Medium = Medium,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint)
     "Valve with polynomial opening characteristic"
@@ -67,7 +67,7 @@ model TwoWayValves "Two way valves with different opening characteristics"
   TwoWayButterfly valBut(
     redeclare package Medium = Medium,
     Kvs=1492,
-    use_inputFilter=false,
+    use_strokeTime=false,
     m_flow_nominal=1,
     l=0.05) "Butterfly valve"
     annotation (Placement(transformation(extent={{0,-120},{20,-100}})));
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mo b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mo
index 1217434500..1f05382958 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesMotor.mo
@@ -8,7 +8,7 @@ model TwoWayValvesMotor
     redeclare package Medium = Medium,
     l=0.05,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{0,50},{20,70}})));
   IBPSA.Fluid.Sources.Boundary_pT sou(             redeclare package Medium =
@@ -31,7 +31,7 @@ model TwoWayValvesMotor
     redeclare package Medium = Medium,
     l=0.05,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000) "Valve model, quick opening characteristics"
     annotation (Placement(transformation(extent={{0,10},{20,30}})));
   IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage valEqu(
@@ -40,7 +40,7 @@ model TwoWayValvesMotor
     R=10,
     delta0=0.1,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000)
     "Valve model, equal percentage opening characteristics"
     annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
@@ -56,7 +56,7 @@ model TwoWayValvesMotor
     m_flow_nominal=1,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
     dpValve_nominal=10000,
-    use_inputFilter=false,
+    use_strokeTime=false,
     l=0.05,
     l2=0.01) annotation (Placement(transformation(extent={{0,-64},{20,-44}})));
 equation
@@ -117,7 +117,7 @@ To use common values, use the default values.
 All valves are connected to a model of a motor with
 hysteresis. A more efficient implementation that approximates
 a motor but lacks hysteresis would be to
-set the valve parameter <code>use_inputFilter=true</code> instead
+set the valve parameter <code>use_strokeTime=true</code> instead
 of using the motor model.
 </p>
 </html>", revisions="<html>
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mo b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mo
index 329a3013fd..948a86d0fa 100644
--- a/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Examples/TwoWayValvesTable.mo
@@ -26,13 +26,13 @@ model TwoWayValvesTable "Two way valve with linear opening characteristics"
   Valves.TwoWayTable valTab(
     redeclare package Medium = Medium,
     m_flow_nominal=2,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=6000,
     flowCharacteristics=IBPSA.Fluid.Actuators.Valves.Data.Linear(),
     from_dp=true) "Valve model with opening characteristics based on a table"
     annotation (Placement(transformation(extent={{-10,10},{10,30}})));
   TwoWayLinear valLin(
-    use_inputFilter=false,
+    use_strokeTime=false,
     redeclare package Medium = Medium,
     l=0.0001,
     m_flow_nominal=2,
diff --git a/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo b/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
index cf68aa3dc0..6281643fdd 100644
--- a/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo
@@ -24,14 +24,14 @@ model ThreeWayValveParameterization
       273.15 + 4,
       Medium.X_default) "Standard density";
 
-  IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOPPoi(
+  IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valOpePoi(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
     dpValve_nominal(displayUnit="kPa") = 4500,
-    use_inputFilter=false,
+    use_strokeTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-                           "Three way valve with operating point as parameter"
+    "Three way valve with operating point as parameter"
     annotation (Placement(transformation(extent={{-10,80},{10,100}})));
 
   IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valKv(
@@ -39,9 +39,9 @@ model ThreeWayValveParameterization
     CvData=IBPSA.Fluid.Types.CvTypes.Kv,
     m_flow_nominal=m_flow_nominal,
     Kv=Kv,
-    use_inputFilter=false,
+    use_strokeTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-                           "Three way valve with Kv-value as parameter"
+    "Three way valve with Kv-value as parameter"
     annotation (Placement(transformation(extent={{-10,20},{10,40}})));
 
   IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valCv(
@@ -49,16 +49,16 @@ model ThreeWayValveParameterization
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.Cv,
     Cv=Cv,
-    use_inputFilter=false,
+    use_strokeTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-                           "Three way valve with Cv-value as parameter"
+    "Three way valve with Cv-value as parameter"
     annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
 
   IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valAv(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     Av=Av,
-    use_inputFilter=false,
+    use_strokeTime=false,
     CvData=IBPSA.Fluid.Types.CvTypes.Av,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Three way valve with Av-value as parameter"
@@ -84,17 +84,17 @@ model ThreeWayValveParameterization
     offset=0) "Control signal"
     annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,80},{40,100}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowKv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloKv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowCv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloCv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
         Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-94},{40,-74}})));
   IBPSA.Fluid.Sources.Boundary_pT sou3(
@@ -105,7 +105,7 @@ model ThreeWayValveParameterization
     T=293.15) "Boundary condition for flow source"
     annotation (Placement(transformation(extent={{-70,-20},{-50,0}})));
 equation
-  connect(sou1.ports[1], valOPPoi.port_1) annotation (Line(points={{-48,33},{-32,
+  connect(sou1.ports[1], valOpePoi.port_1) annotation (Line(points={{-48,33},{-32,
           33},{-32,90},{-10,90}}, color={0,127,255}));
   connect(sou1.ports[2], valKv.port_1) annotation (Line(points={{-48,31},{-42,31},
           {-42,30},{-10,30}}, color={0,127,255}));
@@ -113,7 +113,7 @@ equation
           {-32,-30},{-10,-30}}, color={0,127,255}));
   connect(sou1.ports[4], valAv.port_1) annotation (Line(points={{-48,27},{-32,27},
           {-32,-84},{-10,-84}}, color={0,127,255}));
-  connect(sou3.ports[1], valOPPoi.port_3) annotation (Line(points={{-50,-7},{-20,
+  connect(sou3.ports[1], valOpePoi.port_3) annotation (Line(points={{-50,-7},{-20,
           -7},{-20,70},{0,70},{0,80}}, color={0,127,255}));
   connect(sou3.ports[2], valKv.port_3) annotation (Line(points={{-50,-9},{-20,-9},
           {-20,12},{0,12},{0,20}}, color={0,127,255}));
@@ -121,23 +121,23 @@ equation
           {-20,-48},{0,-48},{0,-40}}, color={0,127,255}));
   connect(sou3.ports[4], valAv.port_3) annotation (Line(points={{-50,-13},{-20,-13},
           {-20,-110},{0,-110},{0,-94}}, color={0,127,255}));
-  connect(valOPPoi.port_2, senM_flowOpPoi.port_a)
+  connect(valOpePoi.port_2, senMasFloOpPoi.port_a)
     annotation (Line(points={{10,90},{20,90}}, color={0,127,255}));
-  connect(valKv.port_2, senM_flowKv.port_a)
+  connect(valKv.port_2, senMasFloKv.port_a)
     annotation (Line(points={{10,30},{20,30}}, color={0,127,255}));
-  connect(valCv.port_2, senM_flowCv.port_a)
+  connect(valCv.port_2, senMasFloCv.port_a)
     annotation (Line(points={{10,-30},{20,-30}}, color={0,127,255}));
-  connect(valAv.port_2, senM_flowAv.port_a)
+  connect(valAv.port_2, senMasFloAv.port_a)
     annotation (Line(points={{10,-84},{20,-84}}, color={0,127,255}));
-  connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
+  connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(points={{40,90},
           {52,90},{52,92},{90,92},{90,3},{100,3}}, color={0,127,255}));
-  connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
+  connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(points={{40,30},{76,
           30},{76,1},{100,1}}, color={0,127,255}));
-  connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
+  connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(points={{40,-30},{90,
           -30},{90,-1},{100,-1}}, color={0,127,255}));
-  connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
+  connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-84},{92,
           -84},{92,-3},{100,-3}}, color={0,127,255}));
-  connect(y.y, valOPPoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
+  connect(y.y, valOpePoi.y) annotation (Line(points={{-59,110},{0,110},{0,102}},
                             color={0,0,127}));
   connect(y.y, valKv.y) annotation (Line(points={{-59,110},{-40,110},{-40,52},{0,
           52},{0,42}},
diff --git a/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo b/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
index 49cd5aecd1..f49a715195 100644
--- a/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
+++ b/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo
@@ -26,12 +26,12 @@ model TwoWayValveParameterization
       273.15 + 4,
       Medium.X_default) "Standard density";
 
-  IBPSA.Fluid.Actuators.Valves.TwoWayLinear valOPPoi(
+  IBPSA.Fluid.Actuators.Valves.TwoWayLinear valOpePoi(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.OpPoint,
     dpValve_nominal(displayUnit="kPa") = dp_nominal,
-    use_inputFilter=false) "Valve model, linear opening characteristics"
+    use_strokeTime=false) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{-10,30},{10,50}})));
     Modelica.Blocks.Sources.Ramp     y(duration=1)
                                             "Control signal"
@@ -41,7 +41,7 @@ model TwoWayValveParameterization
     CvData=IBPSA.Fluid.Types.CvTypes.Kv,
     m_flow_nominal=m_flow_nominal,
     Kv=Kv,
-    use_inputFilter=false) "Valve model, linear opening characteristics"
+    use_strokeTime=false) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
   Valves.TwoWayLinear valCv(
@@ -49,7 +49,7 @@ model TwoWayValveParameterization
     m_flow_nominal=m_flow_nominal,
     CvData=IBPSA.Fluid.Types.CvTypes.Cv,
     Cv=Cv,
-    use_inputFilter=false) "Valve model, linear opening characteristics"
+    use_strokeTime=false) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
 
   IBPSA.Fluid.Sources.Boundary_pT sou(
@@ -66,27 +66,27 @@ model TwoWayValveParameterization
     T=293.15) "Boundary condition for flow sink"    annotation (Placement(
         transformation(extent={{90,-10},{70,10}})));
 
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowOpPoi(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloOpPoi(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,30},{40,50}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowKv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloKv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowCv(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloCv(
     redeclare package Medium = Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Valves.TwoWayLinear valAv(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     CvData=IBPSA.Fluid.Types.CvTypes.Av,
     Av=Av) "Valve model, linear opening characteristics"
     annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flowAv(redeclare package Medium =
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFloAv(redeclare package Medium =
         Medium) "Mass flow rate sensor"
     annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
 equation
-  connect(y.y, valOPPoi.y)
+  connect(y.y, valOpePoi.y)
                          annotation (Line(
       points={{-39,70},{-20,70},{6.66134e-16,70},{6.66134e-16,52}},
       color={0,0,127}));
@@ -94,42 +94,42 @@ equation
       points={{-39,70},{-20,70},{-20,20},{6.66134e-16,20},{6.66134e-16,12}},
       color={0,0,127}));
   connect(valKv.port_a, sou.ports[2])  annotation (Line(
-      points={{-10,6.10623e-16},{-30,6.10623e-16},{-30,1},{-50,1}},
+      points={{-10,0},{-30,0},{-30,-0.5},{-50,-0.5}},
       color={0,127,255}));
   connect(sou.ports[3], valCv.port_a) annotation (Line(
-      points={{-50,-1},{-34,-1},{-34,-40},{-10,-40}},
+      points={{-50,0.5},{-34,0.5},{-34,-40},{-10,-40}},
       color={0,127,255}));
   connect(y.y, valCv.y) annotation (Line(
       points={{-39,70},{-20,70},{-20,-20},{6.66134e-16,-20},{6.66134e-16,-28}},
       color={0,0,127}));
-  connect(sou.ports[1], valOPPoi.port_a) annotation (Line(
-      points={{-50,3},{-40,3},{-40,40},{-10,40}},
+  connect(sou.ports[1], valOpePoi.port_a) annotation (Line(
+      points={{-50,-1.5},{-40,-1.5},{-40,40},{-10,40}},
       color={0,127,255}));
-  connect(valOPPoi.port_b, senM_flowOpPoi.port_a) annotation (Line(
+  connect(valOpePoi.port_b, senMasFloOpPoi.port_a) annotation (Line(
       points={{10,40},{20,40}},
       color={0,127,255}));
-  connect(valKv.port_b, senM_flowKv.port_a) annotation (Line(
+  connect(valKv.port_b, senMasFloKv.port_a) annotation (Line(
       points={{10,6.10623e-16},{12.5,6.10623e-16},{12.5,1.22125e-15},{15,
           1.22125e-15},{15,6.10623e-16},{20,6.10623e-16}},
       color={0,127,255}));
-  connect(valCv.port_b, senM_flowCv.port_a) annotation (Line(
+  connect(valCv.port_b, senMasFloCv.port_a) annotation (Line(
       points={{10,-40},{20,-40}},
       color={0,127,255}));
-  connect(senM_flowCv.port_b, sin.ports[3]) annotation (Line(
-      points={{40,-40},{56,-40},{56,-1},{70,-1}},
+  connect(senMasFloCv.port_b, sin.ports[3]) annotation (Line(
+      points={{40,-40},{56,-40},{56,0.5},{70,0.5}},
       color={0,127,255}));
-  connect(senM_flowKv.port_b, sin.ports[2]) annotation (Line(
-      points={{40,6.10623e-16},{50,6.10623e-16},{50,1},{70,1}},
+  connect(senMasFloKv.port_b, sin.ports[2]) annotation (Line(
+      points={{40,0},{50,0},{50,-0.5},{70,-0.5}},
       color={0,127,255}));
-  connect(senM_flowOpPoi.port_b, sin.ports[1]) annotation (Line(
-      points={{40,40},{60,40},{60,2},{66,2},{66,3},{70,3}},
+  connect(senMasFloOpPoi.port_b, sin.ports[1]) annotation (Line(
+      points={{40,40},{60,40},{60,2},{66,2},{66,-1.5},{70,-1.5}},
       color={0,127,255}));
-  connect(sou.ports[4], valAv.port_a) annotation (Line(points={{-50,-3},{-40,-3},
+  connect(sou.ports[4], valAv.port_a) annotation (Line(points={{-50,1.5},{-40,1.5},
           {-40,-80},{-10,-80}}, color={0,127,255}));
-  connect(valAv.port_b, senM_flowAv.port_a)
+  connect(valAv.port_b, senMasFloAv.port_a)
     annotation (Line(points={{10,-80},{20,-80}}, color={0,127,255}));
-  connect(senM_flowAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{
-          60,-80},{60,-3},{70,-3}}, color={0,127,255}));
+  connect(senMasFloAv.port_b, sin.ports[4]) annotation (Line(points={{40,-80},{60,
+          -80},{60,1.5},{70,1.5}},  color={0,127,255}));
   connect(valAv.y, y.y) annotation (Line(points={{0,-68},{0,-60},{-20,-60},{-20,
           70},{-39,70}}, color={0,0,127}));
     annotation (experiment(Tolerance=1e-6, StopTime=1.0),
diff --git a/IBPSA/Fluid/Actuators/package.mo b/IBPSA/Fluid/Actuators/package.mo
index 947b8eee91..b177479135 100644
--- a/IBPSA/Fluid/Actuators/package.mo
+++ b/IBPSA/Fluid/Actuators/package.mo
@@ -80,48 +80,52 @@ a flow leg becomes decoupled from a reference pressure source.
 <h4>Transients of actuators</h4>
 <p>
 This section describes how valves and dampers can be configured
-to approximate the travel time of an actuator.
-Such an approximation can also lead to faster simulation because
+to model the travel time of an actuator.
+Modeling the travel time of the actuator can lead to faster simulation because
 discrete or fast changes in controllers are damped before they
 influence the flow network.
 </p>
-<h5>Approximation using a 2nd order filter</h5>
+<h5>Change in actuator position that is linear in time</h5>
 <p>
 The valves and dampers in the package
 <a href=\"modelica://IBPSA.Fluid.Actuators\">
 IBPSA.Fluid.Actuators</a>
-all have a parameter <code>use_inputFilter</code>.
+all have a parameter <code>use_strokeTime</code>.
 This parameter is used as follows:
 </p>
 <ul>
 <li>
-If <code>use_inputFilter=false</code>, then the actual valve
+If <code>use_strokeTime=false</code>, then the actual valve
 or damper position is equal to the input signal <code>y</code>.
 </li>
 <li>
-If <code>use_inputFilter=true</code>, then the actual valve or damper position
-is computed in such a way that it approximates a valve motor.
-This approximation is implemented using a 2nd order low-pass filter.
-The filter has a parameter <code>riseTime</code>, which by default is
-set to <i>120</i> seconds.
-The rise time is the time required to reach 99.6% of the opening.
+If <code>use_strokeTime=true</code>, then the actual valve or damper position
+changes linear in time until it reaches the control input.
+The parameter <code>strokeTime</code>, which by default is set to
+<i>120</i> seconds, determines how fast the position changes.
+For example, if <code>strokeTime=120</code> seconds and the current actuator position is <i>0</i>, then
+a step change in the actuator input signal from <i>0</i> to <i>1</i> will
+cause the actuator position to change linearly from <i>0</i> to <i>1</i> within
+<i>120</i> seconds. Similarly, if the actuator position is then reduced by changing
+the input signal from <i>1</i> to <i>0.5</i>, it will take <i>60</i> seconds
+to achieve the new set point.
 </li>
 </ul>
 <p>
-Using a filter often leads to a more robust simulation,
+Using a linear change in actuator position often leads to a more robust simulation,
 because a step change
 in the input signal is \"smoothened\" by the filter, and
 hence the flow network is only exposed to a continuously differentiable change
 in the input signal.
 However, if the filter is part of a closed loop control, then the transient
-response gets changed. Therefore, if the parameter <code>use_inputFilter</code>
+response gets changed. Therefore, if the parameter <code>strokeTime</code>
 is changed, control gains may need to be retuned.
 </p>
 <p>
 For example, suppose there is a closed loop control with a PI-controller
 <a href=\"modelica://IBPSA.Controls.Continuous.LimPID\">
 IBPSA.Controls.Continuous.LimPID</a>
-and a valve, configured with <code>use_inputFilter=true</code> and <code>riseTime=120</code> seconds.
+and a valve, configured with <code>use_strokeTime=true</code> and <code>strokeTime=120</code> seconds.
 Assume that the transient response of the other dynamic elements in the control loop is fast
 compared to the rise time of the filter.
 Then, a proportional gain of <code>k=0.1</code> and an integrator time constant of
@@ -132,13 +136,13 @@ If the control loop shows oscillatory behavior, then reduce <code>k</code> and/o
 If the control loop reacts too slow, do the opposite.
 </p>
 <p>
-We will now show how the parameter <code>riseTime</code> affects the actual position of a
+We will now show how the parameter <code>strokeTime</code> affects the actual position of a
 control valve.
 The figure below shows a model with two control valves.
-The valve <code>val1</code> is configured with <code>use_inputFilter=true</code>
-and a rise time <code>riseTime=120</code> seconds.
+The valve <code>val1</code> is configured with <code>use_strokeTime=true</code>
+and a rise time <code>strokeTime=120</code> seconds.
 The grey motor symbol above the control valve <code>val1</code>
-indicates that <code>use_inputFilter=true</code>.
+indicates that <code>use_strokeTime=true</code>.
 </p>
 <p align=\"center\">
 <img alt=\"image\" src=\"modelica://IBPSA/Resources/Images/Fluid/Actuators/valveSchematic.png\"/>
@@ -148,14 +152,14 @@ If these valves both have a step input signal at <i>10</i> seconds, then the
 actual opening of the valves are as follows:
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png\"/>
+<img alt=\"image\" width=\"506\" height=\"280\" src=\"modelica://IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png\"/>
 </p>
 <p>
 Thus, in the valve <code>val1</code>, the mass flow rate will slowly increase,
 whereas in <code>val2</code>, the mass flow rate changes instantaneously.
 </p>
 <p>
-If <code>use_inputFilter=true</code>, then the parameter
+If <code>use_strokeTime=true</code>, then the parameter
 <code>y_start</code> can be used to set the initial position of the
 actuator, and the parameter
 <code>init</code> can be used to configure how the position
@@ -163,7 +167,7 @@ should be initialized.
 </p>
 <p>
 For most applications, the default values are appropriate.
-Although adding a filter increases the number of equations,
+Although setting <code>use_strokeTime</code> increases the number of equations,
 it can reduce computing time because the equations are
 easier to solve when a controller switches.
 </p>
diff --git a/IBPSA/Fluid/Examples/FlowSystem/Simplified4.mo b/IBPSA/Fluid/Examples/FlowSystem/Simplified4.mo
index 78da4933d1..b53fae61b2 100644
--- a/IBPSA/Fluid/Examples/FlowSystem/Simplified4.mo
+++ b/IBPSA/Fluid/Examples/FlowSystem/Simplified4.mo
@@ -1,22 +1,22 @@
 within IBPSA.Fluid.Examples.FlowSystem;
 model Simplified4 "Removed valve dynamics"
   extends Simplified3(
-    valNorth(use_inputFilter=false),
-    valSouth(use_inputFilter=false),
+    valNorth(use_strokeTime =false),
+    valSouth(use_strokeTime =false),
     pmpNorth(
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-      use_inputFilter=false),
+      use_riseTime=false),
     pmpSouth(
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-      use_inputFilter=false),
-    valSouth1(each use_inputFilter=false),
-    valSouth2(each use_inputFilter=false),
-    valNorth1(each use_inputFilter=false),
-    valNorth2(each use_inputFilter=false),
-    pumpHea(use_inputFilter=false),
-    pumpCoo(use_inputFilter=false),
-    valCoo(use_inputFilter=false),
-    valHea(use_inputFilter=false));
+      use_riseTime=false),
+    valSouth1(each use_strokeTime=false),
+    valSouth2(each use_strokeTime=false),
+    valNorth1(each use_strokeTime=false),
+    valNorth2(each use_strokeTime=false),
+    pumpHea(use_riseTime=false),
+    pumpCoo(use_riseTime=false),
+    valCoo(use_strokeTime=false),
+    valHea(use_strokeTime=false));
   annotation (Documentation(info="<html>
 <p>
 The model is further simplified by removing the valve and pump control dynamics.
diff --git a/IBPSA/Fluid/Examples/Performance/BaseClasses/Example1.mo b/IBPSA/Fluid/Examples/Performance/BaseClasses/Example1.mo
index f7443da8a8..ff953fb429 100644
--- a/IBPSA/Fluid/Examples/Performance/BaseClasses/Example1.mo
+++ b/IBPSA/Fluid/Examples/Performance/BaseClasses/Example1.mo
@@ -13,7 +13,7 @@ partial model Example1 "Example 1 partial model"
   Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     allowFlowReversal=allowFlowReversal.k,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nominalValuesDefineDefaultPressureCurve=true)
@@ -37,7 +37,7 @@ partial model Example1 "Example 1 partial model"
     dpValve_nominal=1000,
     l={0.002,0.002},
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_strokeTime=false,
     portFlowDirection_1=if allowFlowReversal.k then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
          else Modelica.Fluid.Types.PortFlowDirection.Entering,
     portFlowDirection_2=if allowFlowReversal.k then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
diff --git a/IBPSA/Fluid/Examples/Performance/Example2.mo b/IBPSA/Fluid/Examples/Performance/Example2.mo
index 11f21f718a..873d9ff26f 100644
--- a/IBPSA/Fluid/Examples/Performance/Example2.mo
+++ b/IBPSA/Fluid/Examples/Performance/Example2.mo
@@ -10,7 +10,7 @@ model Example2 "Example 2 model with series pressure components"
   Fluid.Movers.FlowControlled_dp pump_dp(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     allowFlowReversal=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nominalValuesDefineDefaultPressureCurve=true)
diff --git a/IBPSA/Fluid/Examples/Performance/Example3.mo b/IBPSA/Fluid/Examples/Performance/Example3.mo
index 54c6a75354..bda30d6396 100644
--- a/IBPSA/Fluid/Examples/Performance/Example3.mo
+++ b/IBPSA/Fluid/Examples/Performance/Example3.mo
@@ -11,7 +11,7 @@ model Example3
   Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     allowFlowReversal=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nominalValuesDefineDefaultPressureCurve=true)
diff --git a/IBPSA/Fluid/Examples/ResistanceVolumeFlowReversal.mo b/IBPSA/Fluid/Examples/ResistanceVolumeFlowReversal.mo
index b9253bd98b..a4874bb8f7 100644
--- a/IBPSA/Fluid/Examples/ResistanceVolumeFlowReversal.mo
+++ b/IBPSA/Fluid/Examples/ResistanceVolumeFlowReversal.mo
@@ -12,7 +12,7 @@ model ResistanceVolumeFlowReversal
   Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     allowFlowReversal=allowFlowReversal.k,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nominalValuesDefineDefaultPressureCurve=true)
diff --git a/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo b/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
index d7151fd6b7..a99abbebdf 100644
--- a/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
+++ b/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo
@@ -42,7 +42,7 @@ model ThermalZoneHVACNoExhaust
     dp_nominal=1200,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false) "Fan or pump"
+    use_riseTime=false) "Fan or pump"
     annotation (Placement(transformation(extent={{-90,0},{-70,20}})));
   HeatExchangers.HeaterCooler_u
     hea(
diff --git a/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mo b/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mo
index 78deb2cabd..c06ddc5b75 100644
--- a/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mo
+++ b/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACWithExhaust.mo
@@ -14,7 +14,7 @@ model ThermalZoneHVACWithExhaust
     dp_nominal=1200,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     m_flow_nominal=0.1*m_flow_nominal) "Constant air exhaust"
     annotation (Placement(transformation(extent={{-70,-70},{-90,-50}})));
 equation
diff --git a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
index 6286308383..3ed12d6101 100644
--- a/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
+++ b/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
@@ -5,9 +5,8 @@ block Fan "Declaration of an FMU that exports a fan"
      redeclare final Movers.FlowControlled_dp com(
       nominalValuesDefineDefaultPressureCurve=true,
       final m_flow_nominal=m_flow_nominal,
-      final use_inputFilter=
-                          false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState));
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+      final use_riseTime=false));
 
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
diff --git a/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo b/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
index 12726097c6..130b3ea362 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
@@ -74,7 +74,7 @@ model RectangularBorefield "Example model of a rectangular borefield"
     redeclare package Medium = Medium,
     addPowerToMedium=false,
     nominalValuesDefineDefaultPressureCurve=true,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     m_flow_nominal=borFieDat.conDat.mBorFie_flow_nominal,
diff --git a/IBPSA/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo b/IBPSA/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo
index 15b0796c4a..116fefeccb 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/Validation/ConstantHeatInjection_100Boreholes.mo
@@ -20,7 +20,7 @@ model ConstantHeatInjection_100Boreholes
     redeclare package Medium = Medium,
     T_start=T_start,
     addPowerToMedium=false,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     m_flow_nominal=borFieDat.conDat.mBorFie_flow_nominal,
     nominalValuesDefineDefaultPressureCurve=true,
diff --git a/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo b/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo
index 25aec72715..84c687b28e 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo
@@ -29,7 +29,7 @@ model Sandbox "Validation of BorefieldOneUTube based on the experiment of Beier
     redeclare package Medium = Medium,
     T_start=T_start,
     addPowerToMedium=false,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     m_flow_nominal=borFieDat.conDat.mBorFie_flow_nominal,
     nominalValuesDefineDefaultPressureCurve=true,
diff --git a/IBPSA/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo b/IBPSA/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo
index f798f806fd..a39acce526 100644
--- a/IBPSA/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo
+++ b/IBPSA/Fluid/HeatExchangers/ActiveBeams/Validation/NumberOfBeams.mo
@@ -33,7 +33,7 @@ model NumberOfBeams
     m_flow_nominal=0.094,
     addPowerToMedium=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     nominalValuesDefineDefaultPressureCurve=true) "Pump for hot water"
     annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
   IBPSA.Fluid.Sources.Boundary_pT sou_2(
@@ -49,7 +49,7 @@ model NumberOfBeams
     m_flow_nominal=0.094,
     addPowerToMedium=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     nominalValuesDefineDefaultPressureCurve=true) "Pump for chilled water"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
   IBPSA.Fluid.HeatExchangers.ActiveBeams.CoolingAndHeating beaCooHea(
@@ -81,7 +81,7 @@ model NumberOfBeams
     addPowerToMedium=false,
     m_flow_nominal=0.094*nBeams,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     nominalValuesDefineDefaultPressureCurve=true) "Pump for hot water"
     annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
 
@@ -90,7 +90,7 @@ model NumberOfBeams
     addPowerToMedium=false,
     m_flow_nominal=0.094*nBeams,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     nominalValuesDefineDefaultPressureCurve=true) "Pump for chilled water"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
 
diff --git a/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo
index 97675168ab..a68b12225f 100644
--- a/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo
@@ -74,9 +74,9 @@ model ScrollWaterToWater_OneRoomRadiator
     m_flow_start=0.85,
     T_start=TRadSup_nominal,
     nominalValuesDefineDefaultPressureCurve=true,
-    use_inputFilter=false,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Pump for radiator side"
-    annotation (Placement(transformation(
+    use_riseTime=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+    "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-70,-110})));
@@ -128,7 +128,7 @@ model ScrollWaterToWater_OneRoomRadiator
     m_flow_start=0.85,
     m_flow_nominal=mHeaPum_flow_nominal,
     nominalValuesDefineDefaultPressureCurve=true,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index a46d8f1b12..61edda76c6 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -76,7 +76,7 @@ partial model PartialOneRoomRadiator
     m_flow_nominal=mCon_flow_nominal,
     m_flow_start=mCon_flow_nominal,
     T_start=TRadSup_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
@@ -112,7 +112,7 @@ partial model PartialOneRoomRadiator
     redeclare package Medium = MediumWat,
     m_flow_start=mEva_flow_nominal,
     m_flow_nominal=mEva_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
diff --git a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
index b318793e33..ca8e7bdcef 100644
--- a/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
+++ b/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo
@@ -45,22 +45,23 @@ partial model PartialFlowMachine
     "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
     annotation (Dialog(
       tab="Dynamics",
-      group="Nominal condition",
+      group="Conservation equations",
       enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
 
   // Classes used to implement the filtered speed
-  parameter Boolean use_inputFilter=true
-    "= true, if speed is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered speed"));
+  parameter Boolean use_riseTime=true
+    "Set to true to continuously change motor speed"
+    annotation(Dialog(tab="Dynamics", group="Motor speed"));
+
   parameter Modelica.Units.SI.Time riseTime=30
-    "Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
+    "Time needed to change motor speed between zero and full speed" annotation (
       Dialog(
       tab="Dynamics",
-      group="Filtered speed",
-      enable=use_inputFilter));
+      group="Motor speed",
+      enable=use_riseTime));
   parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
     "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
+    annotation(Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
 
   // Connectors and ports
   Modelica.Blocks.Interfaces.IntegerInput stage
@@ -195,9 +196,6 @@ protected
   final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start=
       Medium.specificEnthalpy(sta_start) "Start value for outflowing enthalpy";
 
-  final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi*
-      riseTime) "Cut-off frequency of filter";
-
   Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues(
     final k=stageInputs)
    if inputType == IBPSA.Fluid.Types.InputType.Stages "Stage input values"
@@ -234,13 +232,15 @@ protected
     nPorts=2) "Fluid volume for dynamic model"
     annotation (Placement(transformation(extent={{-70,0},{-90,20}})));
 
-  IBPSA.Fluid.BaseClasses.ActuatorFilter filter(
-    final n=2,
-    final f=fCut,
-    final normalized=true,
-    final initType=init) if use_inputFilter
-    "Second order filter to approximate dynamics of the fan or pump's speed, and to improve numerics"
-    annotation (Placement(transformation(extent={{20,61},{40,80}})));
+  Modelica.Blocks.Nonlinear.SlewRateLimiter motSpe(
+    Rising=1/riseTime,
+    Falling=-1/riseTime,
+    Td=0.001*riseTime,
+    initType=init,
+    strict=true)
+    if use_riseTime
+      "Dynamics of motor speed"
+    annotation (Placement(transformation(extent={{20,60},{40,80}})));
 
   IBPSA.Fluid.Movers.BaseClasses.IdealSource preSou(
     redeclare final package Medium = Medium,
@@ -505,9 +505,8 @@ equation
           -54},{-40,-54},{-40,-11}},               color={0,0,127}));
   connect(eff.WFlo, PToMed.u2) annotation (Line(points={{-11,-56},{4,-56},{4,
           -86},{48,-86}}, color={0,0,127}));
-  connect(inputSwitch.y, filter.u) annotation (Line(points={{1,50},{12,50},{12,70.5},
-          {18,70.5}},     color={0,0,127}));
-
+  connect(inputSwitch.y, motSpe.u) annotation (Line(points={{1,50},{12,50},{12,
+          70},{18,70}},   color={0,0,127}));
   connect(senRelPre.p_rel, eff.dp_in) annotation (Line(points={{50.5,-26.35},{50.5,
           -38},{-18,-38},{-18,-46}},               color={0,0,127}));
   connect(eff.y_out, y_actual) annotation (Line(points={{-11,-48},{92,-48},{92,
@@ -536,7 +535,7 @@ equation
           color={0,0,0},
           smooth=Smooth.None),
         Line(
-          visible=not use_inputFilter,
+          visible=not use_riseTime,
           points={{0,100},{0,40}}),
         Rectangle(
           extent={{-100,16},{100,-16}},
@@ -571,19 +570,19 @@ equation
           color={0,0,0},
           smooth=Smooth.None),
         Rectangle(
-          visible=use_inputFilter,
+          visible=use_riseTime,
           extent={{-32,40},{34,100}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
         Ellipse(
-          visible=use_inputFilter,
+          visible=use_riseTime,
           extent={{-32,100},{34,40}},
           lineColor={0,0,0},
           fillColor={135,135,135},
           fillPattern=FillPattern.Solid),
         Text(
-          visible=use_inputFilter,
+          visible=use_riseTime,
           extent={{-20,92},{22,46}},
           textColor={0,0,0},
           fillColor={135,135,135},
@@ -641,6 +640,12 @@ See discussions in
 revisions="<html>
 <ul>
 <li>
+August 26, 2024, by Michael Wetter:<br/>
+Implemented linear dynamics for change in motor speed.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3965\">Buildings, #3965</a> and
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>.
+</li>
+<li>
 June 18, 2024, by Michael Wetter:<br/>
 Added <code>start</code> and <code>nominal</code> attributes
 to avoid warnings in OpenModelica due to conflicting values.<br/>
diff --git a/IBPSA/Fluid/Movers/Examples/MoverParameter.mo b/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
index 21f9ff1783..c62017ba42 100644
--- a/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
+++ b/IBPSA/Fluid/Movers/Examples/MoverParameter.mo
@@ -11,7 +11,7 @@ model MoverParameter
     redeclare package Medium = Medium,
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_riseTime=false,
     massFlowRates={0,0.5,1}*m_flow_nominal,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
@@ -29,8 +29,9 @@ model MoverParameter
   IBPSA.Fluid.Movers.SpeedControlled_y pump_y(
     redeclare package Medium = Medium,
     redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per(
-        speeds={0,0.5,1}, constantSpeed=1),
-    use_inputFilter=false,
+      speeds={0,0.5,1},
+      constantSpeed=1),
+    use_riseTime=false,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump with normalised speed input"
@@ -39,7 +40,7 @@ model MoverParameter
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4 per,
-    use_inputFilter=false,
+    use_riseTime=false,
     heads={0,0.5,1}*dp_nominal,
     inputType=IBPSA.Fluid.Types.InputType.Constant,
     dp_nominal=dp_nominal,
diff --git a/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo b/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
index c40fec4177..39e322e6c0 100644
--- a/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
+++ b/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo
@@ -14,13 +14,12 @@ model SpeedControlled_y_pumpCurves
     "Nominal pressure";
 
    model pumpModel = IBPSA.Fluid.Movers.SpeedControlled_y (
-    redeclare package Medium = Medium,
-    use_inputFilter=
-                  false,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    per(
-      pressure(V_flow=2/1000*m_flow_nominal*{0.2, 0.4, 0.6, 0.8},
-               dp=dp_nominal*{0.9, 0.85, 0.6, 0.2})))
+      redeclare package Medium = Medium,
+      use_riseTime=false,
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+      per(pressure(
+        V_flow=2/1000*m_flow_nominal*{0.2,0.4,0.6,0.8},
+        dp=dp_nominal*{0.9,0.85,0.6,0.2})))
     "Declaration of pump model";
 
   pumpModel pum(
@@ -66,27 +65,27 @@ model SpeedControlled_y_pumpCurves
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=0.01*dp_nominal,
-    use_inputFilter=false) "Pressure drop"
+    use_strokeTime=false) "Pressure drop"
     annotation (Placement(transformation(extent={{-20,80},{0,100}})));
 
   IBPSA.Fluid.Actuators.Valves.TwoWayLinear dp2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=0.01*dp_nominal,
-    use_inputFilter=false) "Pressure drop"
+    use_strokeTime=false) "Pressure drop"
     annotation (Placement(transformation(extent={{-20,38},{0,58}})));
 
   IBPSA.Fluid.Actuators.Valves.TwoWayLinear dp3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=0.01*dp_nominal,
-    use_inputFilter=false) "Pressure drop"
+    use_strokeTime=false) "Pressure drop"
     annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
   IBPSA.Fluid.Actuators.Valves.TwoWayLinear dp4(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=0.01*dp_nominal,
-    use_inputFilter=false) "Pressure drop"
+    use_strokeTime=false) "Pressure drop"
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
 equation
   connect(dp1.port_b, pum.port_a)      annotation (Line(
@@ -94,7 +93,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(dp1.port_a, sou.ports[1]) annotation (Line(
-      points={{-20,90},{-31,90},{-31,91},{-50,91}},
+      points={{-20,90},{-31,90},{-31,86.5},{-50,86.5}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(y.y, dp1.y) annotation (Line(
@@ -110,7 +109,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(sou.ports[2], dp2.port_a) annotation (Line(
-      points={{-50,89},{-32,89},{-32,48},{-20,48}},
+      points={{-50,87.5},{-32,87.5},{-32,48},{-20,48}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(dp3.port_b, pum2.port_a)     annotation (Line(
@@ -123,7 +122,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(dp3.port_a, sou.ports[3]) annotation (Line(
-      points={{-20,6.10623e-16},{-28,0},{-36,0},{-36,86},{-50,86},{-50,87}},
+      points={{-20,0},{-28,0},{-36,0},{-36,86},{-50,86},{-50,88.5}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(dp4.port_b, pum3.port_a)     annotation (Line(
@@ -135,24 +134,24 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(dp4.port_a, sou.ports[4]) annotation (Line(
-      points={{-20,-50},{-38,-50},{-38,85},{-50,85}},
+      points={{-20,-50},{-38,-50},{-38,89.5},{-50,89.5}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(pum3.port_b, sou1.ports[1]) annotation (Line(
-      points={{60,-50},{110,-50},{110,85},{118,85}},
+      points={{60,-50},{110,-50},{110,89.5},{118,89.5}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(pum2.port_b, sou1.ports[2]) annotation (Line(
-      points={{60,6.10623e-16},{80,6.10623e-16},{80,0},{106,0},{106,87},{118,87}},
+      points={{60,0},{80,0},{80,0},{106,0},{106,88.5},{118,88.5}},
       color={0,127,255},
       smooth=Smooth.None));
 
   connect(pum1.port_b, sou1.ports[3]) annotation (Line(
-      points={{60,48},{104,48},{104,89},{118,89}},
+      points={{60,48},{104,48},{104,87.5},{118,87.5}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(pum.port_b, sou1.ports[4]) annotation (Line(
-      points={{60,90},{89,90},{89,91},{118,91}},
+      points={{60,90},{89,90},{89,86.5},{118,86.5}},
       color={0,127,255},
       smooth=Smooth.None));
   annotation (
diff --git a/IBPSA/Fluid/Movers/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/FlowControlled_dp.mo
index a61cec66f5..a28486f188 100644
--- a/IBPSA/Fluid/Movers/FlowControlled_dp.mo
+++ b/IBPSA/Fluid/Movers/FlowControlled_dp.mo
@@ -4,47 +4,40 @@ model FlowControlled_dp
   extends IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
     final preVar=IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.PressureDifference,
     final computePowerUsingSimilarityLaws=per.havePressureCurve,
-    preSou(dp_start=dp_start, control_dp= not prescribeSystemPressure),
+    preSou(dp_start=dp_start, control_dp=not prescribeSystemPressure),
     final stageInputs(each final unit="Pa") = heads,
     final constInput(final unit="Pa") = constantHead,
-    final _m_flow_nominal = m_flow_nominal,
-    filter(
+    final _m_flow_nominal=m_flow_nominal,
+    motSpe(
+      Rising=dp_nominal/riseTime,
+      Falling=-dp_nominal/riseTime,
       final y_start=dp_start,
-      u(final unit="Pa"),
-      y(final unit="Pa"),
-      x(each nominal=dp_nominal),
-      u_nominal=dp_nominal),
-    eff(
-      per(
-        final pressure=
-          if per.havePressureCurve then
-            per.pressure
+      u(final unit="Pa", nominal=dp_nominal),
+      y(final unit="Pa", nominal=dp_nominal)),
+    eff(per(
+        final pressure=if per.havePressureCurve then per.pressure else
+          IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
+            V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri - 1)},
+            dp={i/(nOri - 1)*2.0*dp_nominal for i in (nOri - 1):-1:0}),
+        final etaHydMet=if (per.etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
+          or per.etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
+          and not per.havePressureCurve then
+            IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
           else
-            IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
-              V_flow = {i/(nOri-1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri-1)},
-              dp =     {i/(nOri-1)*2.0*dp_nominal for i in (nOri-1):-1:0}),
-        final etaHydMet=
-          if (per.etaHydMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
-            or per.etaHydMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
-            and not per.havePressureCurve then
-              IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
-          else per.etaHydMet,
-        final etaMotMet=
-          if (per.etaMotMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
-            or per.etaMotMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
-            and (not per.haveWMot_nominal and not per.havePressureCurve) then
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
-          else per.etaMotMet),
-      r_N(start=if abs(dp_nominal) > 1E-8 then dp_start/dp_nominal else 0)));
+            per.etaHydMet,
+        final etaMotMet=if (per.etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
+          or per.etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
+          and (not per.haveWMot_nominal and not per.havePressureCurve) then
+            IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
+          else per.etaMotMet), r_N(start=if abs(dp_nominal) > 1E-8 then
+            dp_start/dp_nominal
+          else
+            0)));
 
   parameter Modelica.Units.SI.PressureDifference dp_start(
     min=0,
     displayUnit="Pa") = 0 "Initial value of pressure raise"
-    annotation (Dialog(tab="Dynamics", group="Filtered speed"));
+    annotation (Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
 
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(
     final min=Modelica.Constants.small)
@@ -53,7 +46,7 @@ model FlowControlled_dp
   // For air, we set dp_nominal = 600 as default, for water we set 10000
   parameter Modelica.Units.SI.PressureDifference dp_nominal(
     final min=Modelica.Constants.small,
-    displayUnit="Pa") = if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used to normalized the filter if use_inputFilter=true,
+    displayUnit="Pa") = if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used to normalized the filter if use_riseTime=true,
         to set default values of constantHead and heads, and
         and for default pressure curve if not specified in record per"
     annotation (Dialog(group="Nominal condition"));
@@ -110,9 +103,9 @@ equation
   assert(inputSwitch.u >= -1E-3,
     "Pressure set point for mover cannot be negative. Obtained dp = " + String(inputSwitch.u));
 
-  if use_inputFilter then
-    connect(filter.y, gain.u) annotation (Line(
-      points={{41,70.5},{44,70.5},{44,42}},
+  if use_riseTime then
+    connect(motSpe.y, gain.u) annotation (Line(
+      points={{41,70},{44,70},{44,42}},
       color={0,0,127},
       smooth=Smooth.None));
   else
@@ -154,7 +147,7 @@ User's Guide</a>.
 </p>
 <h4>Typical use and important parameters</h4>
 <p>
-If <code>use_inputFilter=true</code>, then the parameter <code>dp_nominal</code> is
+If <code>use_riseTime=true</code>, then the parameter <code>dp_nominal</code> is
 used to normalize the filter. This is used to improve the numerics of the transient response.
 The actual pressure raise of the mover at steady-state is independent
 of the value of <code>dp_nominal</code>. It is recommended to set
@@ -180,6 +173,12 @@ IBPSA.Fluid.Movers.Validation.FlowControlled_dpSystem</a>.
       revisions="<html>
 <ul>
 <li>
+August 26, 2024, by Michael Wetter:<br/>
+Implemented linear dynamics for change in motor speed.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3965\">Buildings, #3965</a> and
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>.
+</li>
+<li>
 March 1, 2023, by Hongxiang Fu:<br/>
 Refactored the model with a new declaration for
 <code>m_flow_nominal</code>.<br/>
diff --git a/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo b/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
index 821de47ed3..8ad4242bf3 100644
--- a/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
+++ b/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo
@@ -4,40 +4,34 @@ model FlowControlled_m_flow
   extends IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
     final preVar=IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.FlowRate,
     final computePowerUsingSimilarityLaws=per.havePressureCurve,
-    final stageInputs(each final unit="kg/s")=massFlowRates,
-    final constInput(final unit="kg/s")=constantMassFlowRate,
-    final _m_flow_nominal = m_flow_nominal,
-    filter(
+    final stageInputs(each final unit="kg/s") = massFlowRates,
+    final constInput(final unit="kg/s") = constantMassFlowRate,
+    final _m_flow_nominal=m_flow_nominal,
+    motSpe(
+      Rising=m_flow_nominal/riseTime,
+      Falling=-m_flow_nominal/riseTime,
       final y_start=m_flow_start,
-      u(final unit="kg/s"),
-      y(final unit="kg/s"),
-      x(each nominal=m_flow_nominal),
-      u_nominal=m_flow_nominal),
-    eff(
-      per(
-        final pressure = if per.havePressureCurve then
-          per.pressure
-        else
+      u(final unit="kg/s", nominal=m_flow_nominal),
+      y(final unit="kg/s", nominal=m_flow_nominal)),
+    eff(per(
+        final pressure=if per.havePressureCurve then per.pressure else
           IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
-            V_flow = {i/(nOri-1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri-1)},
-            dp =     {i/(nOri-1)*2.0*dp_nominal for i in (nOri-1):-1:0}),
-        final etaHydMet=
-          if (per.etaHydMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
-            or per.etaHydMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
+            V_flow={i/(nOri - 1)*2.0*m_flow_nominal/rho_default for i in 0:(nOri - 1)},
+            dp={i/(nOri - 1)*2.0*dp_nominal for i in (nOri - 1):-1:0}),
+        final etaHydMet=if (per.etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.Power_VolumeFlowRate
+            or per.etaHydMet == IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber)
             and not per.havePressureCurve then
               IBPSA.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
-          else per.etaHydMet,
-        final etaMotMet=
-          if (per.etaMotMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
-            or per.etaMotMet ==
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
+            else
+              per.etaHydMet,
+        final etaMotMet=if (per.etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_MotorPartLoadRatio
+            or per.etaMotMet == IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve)
             and (not per.haveWMot_nominal and not per.havePressureCurve) then
-               IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
-          else per.etaMotMet),
-      r_N(start=if abs(m_flow_nominal) > 1E-8 then m_flow_start/m_flow_nominal else 0)),
+              IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
+            else per.etaMotMet), r_N(start=if abs(m_flow_nominal) > 1E-8 then
+              m_flow_start/m_flow_nominal
+            else
+              0)),
     preSou(m_flow_start=m_flow_start));
 
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(
@@ -53,7 +47,7 @@ model FlowControlled_m_flow
 
   parameter Modelica.Units.SI.MassFlowRate m_flow_start(min=0) = 0
     "Initial value of mass flow rate"
-    annotation (Dialog(tab="Dynamics", group="Filtered speed"));
+    annotation (Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
 
   parameter Modelica.Units.SI.MassFlowRate constantMassFlowRate=m_flow_nominal
     "Constant pump mass flow rate, used when inputType=Constant" annotation (
@@ -97,16 +91,11 @@ equation
     or if the performance record is unreasonable. Please verify your model, and
     consider using one of the other pump or fan models.");
 
-  if use_inputFilter then
-    connect(filter.y, m_flow_actual) annotation (Line(
-      points={{41,70.5},{44,70.5},{44,50},{110,50}},
-      color={0,0,127},
-      smooth=Smooth.None));
-    connect(filter.y, preSou.m_flow_in)
-      annotation (Line(points={{41,70.5},{44,70.5},{44,8}}, color={0,0,127}));
+  if use_riseTime then
+    connect(motSpe.y, preSou.m_flow_in)
+      annotation (Line(points={{41,70},{44,70},{44,8}},
+                                                     color={0,0,127}));
   else
-  connect(inputSwitch.y, m_flow_actual) annotation (Line(points={{1,50},{110,50}},
-                                             color={0,0,127}));
   connect(inputSwitch.y, preSou.m_flow_in) annotation (Line(
       points={{1,50},{44,50},{44,8}},
       color={0,0,127},
@@ -118,6 +107,10 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
 
+  connect(eff.m_flow, senMasFlo.m_flow)
+    annotation (Line(points={{-34,-54},{-40,-54},{-40,-11}}, color={0,0,127}));
+  connect(senMasFlo.m_flow, m_flow_actual) annotation (Line(points={{-40,-11},{
+          -40,-20},{-20,-20},{-20,20},{80,20},{80,50},{110,50}}, color={0,0,127}));
   annotation (
       Icon(graphics={
         Text(
@@ -147,6 +140,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+August 26, 2024, by Michael Wetter:<br/>
+Implemented linear dynamics for change in motor speed.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3965\">Buildings, #3965</a> and
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>.
+</li>
+<li>
 March 1, 2023, by Hongxiang Fu:<br/>
 Refactored the model with a new declaration for
 <code>m_flow_nominal</code>.<br/>
diff --git a/IBPSA/Fluid/Movers/SpeedControlled_y.mo b/IBPSA/Fluid/Movers/SpeedControlled_y.mo
index 8c8f47003c..d53be12136 100644
--- a/IBPSA/Fluid/Movers/SpeedControlled_y.mo
+++ b/IBPSA/Fluid/Movers/SpeedControlled_y.mo
@@ -6,19 +6,19 @@ model SpeedControlled_y
     final nominalValuesDefineDefaultPressureCurve=false,
     final computePowerUsingSimilarityLaws=true,
     final stageInputs(each final unit="1") = per.speeds,
-    final constInput(final unit="1") =       per.constantSpeed,
-    filter(
+    final constInput(final unit="1") = per.constantSpeed,
+    motSpe(
       final y_start=y_start,
       u(final unit="1"),
       y(final unit="1")),
-    eff(
-      per(final pressure = per.pressure,
-          final etaHydMet = per.etaHydMet,
-          final etaMotMet = per.etaMotMet),
-      r_N(start=y_start)));
+    eff(per(
+        final pressure=per.pressure,
+        final etaHydMet=per.etaHydMet,
+        final etaMotMet=per.etaMotMet),
+        r_N(start=y_start)));
 
   parameter Real y_start(min=0, max=1, unit="1")=0 "Initial value of speed"
-    annotation(Dialog(tab="Dynamics", group="Filtered speed", enable=use_inputFilter));
+    annotation(Dialog(tab="Dynamics", group="Motor speed", enable=use_riseTime));
 
   Modelica.Blocks.Interfaces.RealInput y(
     unit="1")
@@ -51,13 +51,12 @@ equation
     annotation (Line(points={{-10,-9},{-10,14},{56,14},{56,8}},
                                                      color={0,0,127}));
 
-  if use_inputFilter then
-    connect(filter.y, eff.y_in) annotation (Line(points={{41,70.5},{44,70.5},{44,
-            26},{-26,26},{-26,-46}},  color={0,0,127}));
+  if use_riseTime then
+    connect(motSpe.y, eff.y_in) annotation (Line(points={{41,70},{44,70},{44,26},
+            {-26,26},{-26,-46}},      color={0,0,127}));
   else
     connect(inputSwitch.y, eff.y_in) annotation (Line(points={{1,50},{44,50},{44,
-            26},{-26,26},{-26,-46}},
-                                   color={0,0,127}));
+            26}},                  color={0,0,127}));
   end if;
 
     annotation (defaultComponentName="mov",
@@ -86,6 +85,12 @@ User's Guide</a> for more information.
       revisions="<html>
 <ul>
 <li>
+August 26, 2024, by Michael Wetter:<br/>
+Implemented linear dynamics for change in motor speed.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3965\">Buildings, #3965</a> and
+for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1926\">IBPSA, #1926</a>.
+</li>
+<li>
 March 29, 2023, by Hongxiang Fu:<br/>
 Removed the modification that normalised the speed input
 because it is no longer needed. This is for
diff --git a/IBPSA/Fluid/Movers/UsersGuide.mo b/IBPSA/Fluid/Movers/UsersGuide.mo
index 20d17b5914..eb3575e3f3 100644
--- a/IBPSA/Fluid/Movers/UsersGuide.mo
+++ b/IBPSA/Fluid/Movers/UsersGuide.mo
@@ -723,64 +723,64 @@ amount of heat dissipates into the ambient, the separation of
 
 <h5>Start-up and shut-down transients</h5>
 <p>
-All models have a parameter <code>use_inputFilter</code>. This
+All models have a parameter <code>use_riseTime</code>. This
 parameter affects the fan output as follows:
 </p>
 <ol>
 <li>
-If <code>use_inputFilter=false</code>, then the input signal <code>y</code>
+If <code>use_riseTime=false</code>, then the input signal <code>y</code>
 (or <code>m_flow_in</code>, or <code>dp_in</code>)
 is equal to the fan speed (or the mass flow rate or pressure rise).
 Thus, a step change in the input signal causes a step change in the fan speed (or mass flow rate or pressure rise).
 </li>
 <li>
-If <code>use_inputFilter=true</code>, which is the default,
+If <code>use_riseTime=true</code>, which is the default,
 then the fan speed (or the mass flow rate or the pressure rise)
-is equal to the output of a filter. This filter is implemented
-as a 2nd order differential equation and can be thought of as
-approximating the inertia of the rotor and the fluid.
-Thus, a step change in the fan input signal will cause a gradual change
-in the fan speed.
-The filter has a parameter <code>riseTime</code>, which by default is set to
-<i>30</i> seconds.
-The rise time is the time required to reach <i>99.6%</i> of the full speed, or,
-if the fan is switched off, to reach a fan speed of <i>0.4%</i>.
+changes linear in time until it reaches the control input.
+The parameter <code>riseTime</code>, which by default is set to
+<i>30</i> seconds, determines how fast the speed changes.
+For example, if <code>riseTime=30</code> seconds and the current speed is <i>0</i>, then
+a step change in the fan input signal from <i>0</i> to <i>1</i> will
+cause the fan speed to increase its speed linearly to the full speed within
+<i>30</i> seconds. Similarly, if the fan speed is then reduced by changing
+the input signal from <i>1</i> to <i>0.5</i>, it will take <i>15</i> seconds
+to achieve the new set point.
 </li>
 </ol>
 <p>
-The figure below shows for a fan with <code>use_inputFilter=true</code>
+The figure below shows for a fan with <code>use_riseTime=true</code>
 and <code>riseTime=30</code> seconds the
 speed input signal and the actual speed.</p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png\"/>
+<img alt=\"image\" width=\"506\" height=\"280\" src=\"modelica://IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png\"/>
 </p>
 
 <p>
 Although many simulations do not require such a detailed model
 that approximates the transients of fans or pumps, it turns
-out that using this filter can reduce computing time and
-can lead to fewer convergence problems in large system models.
-With a filter, any sudden change in control signal, such as when
+out that using such a continuous change in speed can reduce computing time and
+can lead to fewer convergence problems in large system models, because
+a sudden change in control signal, such as when
 a fan switches on, is damped before it affects the air flow rate.
 This continuous change in flow rate turns out to be easier, and in
 some cases faster, to simulate compared to a step change.
 For most simulations, we therefore recommend to use the default settings
-of <code>use_inputFilter=true</code> and <code>riseTime=30</code> seconds.
+of <code>use_riseTime=true</code> and <code>riseTime=30</code> seconds.
 An exception are situations in which the fan or pump is operated at a fixed speed during
-the whole simulation. In this case, set <code>use_inputFilter=false</code>.
+the whole simulation. In this case, set <code>use_riseTime=false</code>.
 </p>
 <p>
-Note that if the fan is part of a closed loop control, then the filter affects
+Note that if the fan is part of a closed loop control, then the value of <code>riseTime</code> affects
 the transient response of the control.
-When changing the value of <code>use_inputFilter</code>, the control gains
+When changing the value of <code>riseTime</code>, the control gains
 may need to be retuned.
 We now present values control parameters that seem to work in most cases.
 Suppose there is a closed loop control with a PI-controller
 <a href=\"modelica://IBPSA.Controls.Continuous.LimPID\">
 IBPSA.Controls.Continuous.LimPID</a>
-and a fan or pump, configured with <code>use_inputFilter=true</code> and <code>riseTime=30</code> seconds.
+and a fan or pump, configured with <code>use_riseTime=true</code> and <code>riseTime=30</code> seconds.
 Assume that the transient response of the other dynamic elements in the control loop is fast
-compared to the rise time of the filter.
+compared to the value of <code>riseTime</code>.
 Then, a proportional gain of <code>k=0.5</code> and an integrator time constant of
 <code>Ti=15</code> seconds often yields satisfactory closed loop control performance.
 These values may need to be changed for different applications as they are also a function
diff --git a/IBPSA/Fluid/Movers/Validation/BaseClasses/ComparePower.mo b/IBPSA/Fluid/Movers/Validation/BaseClasses/ComparePower.mo
index 4da7bc243e..0c46c91d04 100644
--- a/IBPSA/Fluid/Movers/Validation/BaseClasses/ComparePower.mo
+++ b/IBPSA/Fluid/Movers/Validation/BaseClasses/ComparePower.mo
@@ -37,7 +37,7 @@ model ComparePower
   IBPSA.Fluid.Actuators.Dampers.Exponential damExp1(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     final dpDamper_nominal=dp_nominal/2,
     y_start=1,
     final dpFixed_nominal=dp_nominal/2) "Damper"
@@ -45,7 +45,7 @@ model ComparePower
   IBPSA.Fluid.Actuators.Dampers.Exponential damExp2(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     final dpDamper_nominal=dp_nominal/2,
     y_start=1,
     final dpFixed_nominal=dp_nominal/2) "Damper"
@@ -53,7 +53,7 @@ model ComparePower
   IBPSA.Fluid.Actuators.Dampers.Exponential damExp3(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     final dpDamper_nominal=dp_nominal/2,
     y_start=1,
     final dpFixed_nominal=dp_nominal/2) "Damper"
diff --git a/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo b/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
index 097394940f..6f50025b51 100644
--- a/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
+++ b/IBPSA/Fluid/Movers/Validation/ComparePowerHydraulic.mo
@@ -12,7 +12,7 @@ model ComparePowerHydraulic
       per=per,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       addPowerToMedium=false,
-      use_inputFilter=false),
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.SpeedControlled_y mov2(
       redeclare final package Medium = Medium,
       per(
@@ -23,7 +23,7 @@ model ComparePowerHydraulic
         etaMotMet=per.etaMotMet),
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       addPowerToMedium=false,
-      use_inputFilter=false),
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.SpeedControlled_y mov3(
       redeclare final package Medium = Medium,
       per(
@@ -34,7 +34,7 @@ model ComparePowerHydraulic
         etaMotMet=per.etaMotMet),
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       addPowerToMedium=false,
-      use_inputFilter=false));
+      use_riseTime=false));
 
   final parameter IBPSA.Fluid.Movers.BaseClasses.Euler.peak peak =
     IBPSA.Fluid.Movers.BaseClasses.Euler.getPeak(
diff --git a/IBPSA/Fluid/Movers/Validation/ComparePowerInput.mo b/IBPSA/Fluid/Movers/Validation/ComparePowerInput.mo
index a6833c962f..c92378093b 100644
--- a/IBPSA/Fluid/Movers/Validation/ComparePowerInput.mo
+++ b/IBPSA/Fluid/Movers/Validation/ComparePowerInput.mo
@@ -11,23 +11,23 @@ model ComparePowerInput
       per=per,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       addPowerToMedium=false,
-      use_inputFilter=false),
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.FlowControlled_dp mov2(
       redeclare final package Medium = Medium,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       per=per,
       addPowerToMedium=false,
-      use_inputFilter=false,
       m_flow_nominal=m_flow_nominal,
-      dp_nominal=dp_nominal),
+      dp_nominal=dp_nominal,
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow mov3(
       redeclare final package Medium = Medium,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       per=per,
       addPowerToMedium=false,
-      use_inputFilter=false,
       m_flow_nominal=m_flow_nominal,
-      dp_nominal=dp_nominal),
+      dp_nominal=dp_nominal,
+      use_riseTime=false),
     ramDam(height=-0.5));
   Modelica.Blocks.Sources.RealExpression exp_dp(y=mov1.dpMachine)
     "Expression to impose the same pressure rise"
diff --git a/IBPSA/Fluid/Movers/Validation/ControlledFlowMachine.mo b/IBPSA/Fluid/Movers/Validation/ControlledFlowMachine.mo
index d895f217ef..302064fdf4 100644
--- a/IBPSA/Fluid/Movers/Validation/ControlledFlowMachine.mo
+++ b/IBPSA/Fluid/Movers/Validation/ControlledFlowMachine.mo
@@ -5,12 +5,12 @@ model ControlledFlowMachine "Fans with different control signals as input"
     fan1(addPowerToMedium=false, energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
     fan2(
       addPowerToMedium=false,
-      use_inputFilter=false,
+      use_riseTime=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
     fan3(
       addPowerToMedium=false,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
+      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      use_riseTime=false));
 
   annotation (
 experiment(Tolerance=1e-6, StopTime=600),
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
index 8a91f35c56..d9bd6391fb 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_dp.mo
@@ -7,14 +7,14 @@ model FlowControlled_dp "Fan with zero mass flow rate and head as input"
       nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.FlowControlled_dp floMacDyn(
       nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
+      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      use_riseTime=false));
 
 equation
   connect(gain.y, floMacSta.dp_in) annotation (Line(
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
index 90561b2271..9d84974905 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
@@ -25,7 +25,7 @@ model FlowControlled_dpSystem
     allowFlowReversal=false,
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
-    use_inputFilter=false) "Regular dp controlled fan"
+    use_riseTime=false) "Regular dp controlled fan"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
   IBPSA.Fluid.Movers.FlowControlled_dp floConDpSystem(
     redeclare package Medium = Medium,
@@ -33,7 +33,7 @@ model FlowControlled_dpSystem
     allowFlowReversal=false,
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
-    use_inputFilter=false,
+    use_riseTime=false,
     prescribeSystemPressure=true)
     "Dp controlled fan that sets pressure difference at remote point in the system"
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
@@ -66,10 +66,9 @@ model FlowControlled_dpSystem
   Actuators.Dampers.Exponential dam2(
     redeclare package Medium = Medium,
     from_dp=true,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpDamper_nominal=10,
-    m_flow_nominal=m_flow_nominal/2)
-    "Damper"
+    m_flow_nominal=m_flow_nominal/2) "Damper"
     annotation (Placement(transformation(extent={{40,70},{60,90}})));
   MixingVolumes.MixingVolume zone1(
     redeclare package Medium = Medium,
@@ -82,26 +81,23 @@ model FlowControlled_dpSystem
   Actuators.Dampers.Exponential dam1(
     redeclare package Medium = Medium,
     from_dp=true,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpDamper_nominal=10,
-    m_flow_nominal=m_flow_nominal/2)
-             "Damper"
+    m_flow_nominal=m_flow_nominal/2) "Damper"
     annotation (Placement(transformation(extent={{40,30},{60,50}})));
   Actuators.Dampers.Exponential dam3(
     redeclare package Medium = Medium,
     from_dp=true,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpDamper_nominal=10,
-    m_flow_nominal=m_flow_nominal/2)
-             "Damper"
+    m_flow_nominal=m_flow_nominal/2) "Damper"
     annotation (Placement(transformation(extent={{40,-70},{60,-50}})));
   Actuators.Dampers.Exponential dam4(
     redeclare package Medium = Medium,
     from_dp=true,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpDamper_nominal=10,
-    m_flow_nominal=m_flow_nominal/2)
-             "Damper"
+    m_flow_nominal=m_flow_nominal/2) "Damper"
     annotation (Placement(transformation(extent={{40,-110},{60,-90}})));
   MixingVolumes.MixingVolume zone3(
     redeclare package Medium = Medium,
diff --git a/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo b/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
index 8358088f9b..6ca19c98c1 100644
--- a/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
+++ b/IBPSA/Fluid/Movers/Validation/FlowControlled_m_flow.mo
@@ -8,14 +8,14 @@ model FlowControlled_m_flow
       nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow floMacDyn(
       nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
+      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      use_riseTime=false));
 
 equation
   connect(gain.y, floMacSta.m_flow_in) annotation (Line(
diff --git a/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo b/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo
index dae0b58764..f25d565e34 100644
--- a/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo
+++ b/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo
@@ -13,13 +13,6 @@ model PumpCurveConstruction
   parameter Modelica.Units.SI.PressureDifference dp_nominal=10000
     "Nominal pump head at zero mass flow rate";
 
-  Actuators.Valves.TwoWayLinear val1(
-    redeclare package Medium = Medium,
-    m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
-    dpValve_nominal=dp_nominal/1000,
-    from_dp=false) "Valve with very small pressure drop if fully open"
-    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
   Sources.Boundary_pT sou(
     redeclare package Medium = Medium,
     use_p_in=false,
@@ -31,7 +24,7 @@ model PumpCurveConstruction
   IBPSA.Fluid.Movers.SpeedControlled_y pum(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     per(pressure(V_flow={0,0.5*V_flow_nominal,V_flow_nominal}, dp={dp_nominal,
             0.5*dp_nominal,0})),
     inputType=IBPSA.Fluid.Types.InputType.Constant)
@@ -41,7 +34,7 @@ model PumpCurveConstruction
   IBPSA.Fluid.Movers.SpeedControlled_y pum_dp(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     per(pressure(V_flow={0.5*V_flow_nominal,0.75*V_flow_nominal,V_flow_nominal},
           dp={0.5*dp_nominal,0.25*dp_nominal,0})),
     inputType=IBPSA.Fluid.Types.InputType.Constant)
@@ -51,7 +44,7 @@ model PumpCurveConstruction
   IBPSA.Fluid.Movers.SpeedControlled_y pum_m_flow(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     per(pressure(V_flow={0,0.25*V_flow_nominal,0.5*V_flow_nominal}, dp={
             dp_nominal,0.75*dp_nominal,0.5*dp_nominal})),
     inputType=IBPSA.Fluid.Types.InputType.Constant)
@@ -61,7 +54,7 @@ model PumpCurveConstruction
   IBPSA.Fluid.Movers.SpeedControlled_y pum_no(
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
+    use_riseTime=false,
     per(pressure(V_flow={0.25*V_flow_nominal,0.5*V_flow_nominal,0.75*
             V_flow_nominal}, dp={0.75*dp_nominal,0.5*dp_nominal,0.25*dp_nominal})),
     inputType=IBPSA.Fluid.Types.InputType.Constant)
@@ -74,10 +67,18 @@ model PumpCurveConstruction
     height=-0.99) "Input signal for valve"
     annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
 
+  Actuators.Valves.TwoWayLinear val1(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal,
+    use_strokeTime=false,
+    dpValve_nominal=dp_nominal/1000,
+    from_dp=false) "Valve with very small pressure drop if fully open"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+
   Actuators.Valves.TwoWayLinear val2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=dp_nominal/1000,
     from_dp=false) "Valve with very small pressure drop if fully open"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
@@ -85,7 +86,7 @@ model PumpCurveConstruction
   Actuators.Valves.TwoWayLinear val3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=dp_nominal/1000,
     from_dp=false) "Valve with very small pressure drop if fully open"
     annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));
@@ -93,7 +94,7 @@ model PumpCurveConstruction
   Actuators.Valves.TwoWayLinear val4(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
-    use_inputFilter=false,
+    use_strokeTime=false,
     dpValve_nominal=dp_nominal/1000,
     from_dp=false) "Valve with very small pressure drop if fully open"
     annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
@@ -103,7 +104,7 @@ equation
       points={{40,80},{0,80}},
       color={0,127,255}));
   connect(val1.port_a, sou.ports[1]) annotation (Line(
-      points={{-20,80},{-40,80},{-40,17.5},{-62,17.5}},
+      points={{-20,80},{-40,80},{-40,12.25},{-62,12.25}},
       color={0,127,255}));
   connect(yVal.y, val1.y) annotation (Line(
       points={{-39,100},{-10,100},{-10,92}},
@@ -115,10 +116,10 @@ equation
       points={{40,-20},{0,-20}},
       color={0,127,255}));
   connect(sou.ports[2], val2.port_a) annotation (Line(
-      points={{-62,16.5},{-38,16.5},{-38,30},{-20,30}},
+      points={{-62,12.75},{-38,12.75},{-38,30},{-20,30}},
       color={0,127,255}));
   connect(val3.port_a, sou.ports[3]) annotation (Line(
-      points={{-20,-20},{-38,-20},{-38,15.5},{-62,15.5}},
+      points={{-20,-20},{-38,-20},{-38,13.25},{-62,13.25}},
       color={0,127,255}));
   connect(yVal.y, val2.y) annotation (Line(
       points={{-39,100},{-32,100},{-32,56},{-10,56},{-10,42}},
@@ -128,7 +129,7 @@ equation
       color={0,0,127}));
 
   connect(val4.port_a, sou.ports[4]) annotation (Line(
-      points={{-20,-60},{-40,-60},{-40,14.5},{-62,14.5}},
+      points={{-20,-60},{-40,-60},{-40,13.75},{-62,13.75}},
       color={0,127,255}));
   connect(val4.port_b, pum_no.port_a) annotation (Line(
       points={{0,-60},{40,-60}},
@@ -137,17 +138,16 @@ equation
       points={{-39,100},{-32,100},{-32,-40},{-10,-40},{-10,-48}},
       color={0,0,127}));
   connect(pum_no.port_b, sou.ports[5]) annotation (Line(
-      points={{60,-60},{68,-60},{68,-80},{-42,-80},{-42,13.5},{-62,13.5}},
+      points={{60,-60},{68,-60},{68,-80},{-42,-80},{-42,14.25},{-62,14.25}},
       color={0,127,255}));
   connect(pum_m_flow.port_b, sou.ports[6]) annotation (Line(
-      points={{60,-20},{68,-20},{72,-20},{72,-84},{-44,-84},{-44,12.5},{-62,
-          12.5}},
+      points={{60,-20},{68,-20},{72,-20},{72,-84},{-44,-84},{-44,14.75},{-62,14.75}},
       color={0,127,255}));
   connect(pum_dp.port_b, sou.ports[7]) annotation (Line(
-      points={{60,30},{76,30},{76,-88},{-46,-88},{-46,11.5},{-62,11.5}},
+      points={{60,30},{76,30},{76,-88},{-46,-88},{-46,15.25},{-62,15.25}},
       color={0,127,255}));
   connect(pum.port_b, sou.ports[8]) annotation (Line(
-      points={{60,80},{80,80},{80,-92},{-48,-92},{-48,10.5},{-62,10.5}},
+      points={{60,80},{80,80},{80,-92},{-48,-92},{-48,15.75},{-62,15.75}},
       color={0,127,255}));
   annotation (
 experiment(Tolerance=1e-6, StopTime=1.0),
diff --git a/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo b/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
index 36b4d1fc34..145798d85f 100644
--- a/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
+++ b/IBPSA/Fluid/Movers/Validation/PumpCurveDerivatives.mo
@@ -29,14 +29,14 @@ model PumpCurveDerivatives
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     per=per,
-    use_inputFilter=false) "Wilo Stratos pump"
+    use_riseTime=false) "Wilo Stratos pump"
     annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
   IBPSA.Fluid.Movers.SpeedControlled_y pump2(
     y_start=1,
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     per=per,
-    use_inputFilter=false) "Wilo Stratos pump"
+    use_riseTime=false) "Wilo Stratos pump"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
 
   IBPSA.Fluid.Movers.FlowControlled_m_flow forcedPump1(
@@ -44,7 +44,7 @@ model PumpCurveDerivatives
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false) "Pump for forcing a certain mass flow rate"
+    use_riseTime=false) "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,30},{58,50}})));
 
   Modelica.Blocks.Sources.Constant y1(k=1000/2610) "Pump speed control signal"
diff --git a/IBPSA/Fluid/Movers/Validation/Pump_stratos.mo b/IBPSA/Fluid/Movers/Validation/Pump_stratos.mo
index 37fa378950..a928a8b9c4 100644
--- a/IBPSA/Fluid/Movers/Validation/Pump_stratos.mo
+++ b/IBPSA/Fluid/Movers/Validation/Pump_stratos.mo
@@ -8,12 +8,12 @@ model Pump_stratos "Stratos pumps with speed as input"
     dp_nominal=floMacSta.per.pressure.dp[3]/2,
     redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacSta(
       redeclare package Medium = Medium,
-      use_inputFilter=false,
-      per=per),
+      per=per,
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacDyn(
       redeclare package Medium = Medium,
-      use_inputFilter=false,
-      per=per));
+      per=per,
+      use_riseTime=false));
   parameter Data.Pumps.Wilo.Stratos25slash1to6 per
     annotation (Placement(transformation(extent={{100,100},{120,120}})));
 equation
diff --git a/IBPSA/Fluid/Movers/Validation/SpeedControlled_y.mo b/IBPSA/Fluid/Movers/Validation/SpeedControlled_y.mo
index 6a0ba8b00a..70430eeae8 100644
--- a/IBPSA/Fluid/Movers/Validation/SpeedControlled_y.mo
+++ b/IBPSA/Fluid/Movers/Validation/SpeedControlled_y.mo
@@ -8,14 +8,14 @@ model SpeedControlled_y
       redeclare package Medium = Medium,
       per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
                     dp={2*dp_nominal,dp_nominal,0})),
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+      use_riseTime=false),
     redeclare IBPSA.Fluid.Movers.SpeedControlled_y floMacDyn(
       redeclare package Medium = Medium,
       per(pressure(V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,
                     dp={2*dp_nominal,dp_nominal,0})),
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
+      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+      use_riseTime=false));
 
 equation
   connect(gain.y, floMacDyn.y) annotation (Line(
diff --git a/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo b/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo
index b7f14b392d..d63eb5af48 100644
--- a/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo
+++ b/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo
@@ -25,7 +25,7 @@ model SpeedControlled_y_linear
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     per(pressure(V_flow=2/1000*{0,m_flow_nominal}, dp={2*dp_nominal,0})),
-    use_inputFilter=false) "Pump with fixed pressure raise"
+    use_riseTime=false) "Pump with fixed pressure raise"
     annotation (Placement(transformation(extent={{40,80},{60,100}})));
 
   IBPSA.Fluid.Sources.Boundary_pT sou1(
@@ -50,7 +50,7 @@ model SpeedControlled_y_linear
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     per(pressure(V_flow=2/1000*{0,m_flow_nominal}, dp={2*dp_nominal,0})),
-    use_inputFilter=false) "Pump with fixed mass flow rate"
+    use_riseTime=false) "Pump with fixed mass flow rate"
     annotation (Placement(transformation(extent={{40,40},{60,60}})));
   IBPSA.Fluid.Sources.Boundary_pT sou3(
     redeclare package Medium = Medium,
diff --git a/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
index 7ab3ff00d5..589560ad41 100644
--- a/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
+++ b/IBPSA/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
@@ -33,7 +33,7 @@ model EnthalpyFlowRate "Test model for the enthalpy flow rate sensors"
     m_flow_nominal=2,
     tau=0)            "Specific enthalpy sensor"
                 annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,-20},{48,0}})));
   Modelica.Blocks.Math.Add cheEqu(k2=-1)
@@ -51,10 +51,10 @@ equation
   connect(senH_flow.port_b, senH.port_a) annotation (Line(
       points={{-10,-10},{-5.55112e-16,-10}},
       color={0,127,255}));
-  connect(senH.port_b, senM_flow.port_a) annotation (Line(
+  connect(senH.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,-10},{28,-10}},
       color={0,127,255}));
-  connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+  connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
       points={{48,-10},{60,-10}},
       color={0,127,255}));
   connect(senH_flow.H_flow,cheEqu. u1) annotation (Line(
@@ -63,7 +63,7 @@ equation
   connect(senH.h_out, pro.u1) annotation (Line(
       points={{10,1},{10,28},{-14,28},{-14,70},{-2,70}},
       color={0,0,127}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(
       points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
       color={0,0,127}));
   connect(pro.y,cheEqu. u2) annotation (Line(
diff --git a/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo
index c9e923f304..0cc9dd8add 100644
--- a/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo
+++ b/IBPSA/Fluid/Sensors/Examples/EntropyFlowRate.mo
@@ -33,7 +33,7 @@ model EntropyFlowRate "Test model for the entropy flow rate sensors"
     m_flow_nominal=2,
     tau=0)            "Specific entropy sensor"
                 annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,-20},{48,0}})));
   IBPSA.Utilities.Diagnostics.AssertEquality assEqu
@@ -51,13 +51,13 @@ equation
   connect(senS_flow.port_b,senS. port_a) annotation (Line(
       points={{-10,-10},{-5.55112e-16,-10}},
       color={0,127,255}));
-  connect(senS.port_b, senM_flow.port_a) annotation (Line(
+  connect(senS.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,-10},{28,-10}},
       color={0,127,255}));
-  connect(senM_flow.port_b, sin.ports[1]) annotation (Line(
+  connect(senMasFlo.port_b, sin.ports[1]) annotation (Line(
       points={{48,-10},{60,-10}},
       color={0,127,255}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(
       points={{38,1},{38,36},{-10,36},{-10,58},{-2,58}},
       color={0,0,127}));
   connect(pro.y, assEqu.u2) annotation (Line(
diff --git a/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo b/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
index 97725b0331..34c5807902 100644
--- a/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
+++ b/IBPSA/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
@@ -34,7 +34,7 @@ model MoistAirEnthalpyFlowRate
     redeclare package Medium = Medium,
     m_flow_nominal=1) "Specific enthalpy sensor"
                 annotation (Placement(transformation(extent={{0,10},{20,30}})));
-  IBPSA.Fluid.Sensors.MassFlowRate senM_flow(
+  IBPSA.Fluid.Sensors.MassFlowRate senMasFlo(
     redeclare package Medium = Medium) "Mass flow rate sensor"
                 annotation (Placement(transformation(extent={{28,10},{48,30}})));
   Modelica.Blocks.Math.Product pro "Product to compute enthalpy flow rate"
@@ -60,12 +60,12 @@ equation
   connect(senH_flow.port_b, senH.port_a) annotation (Line(
       points={{-10,20},{-5.55112e-16,20}},
       color={0,127,255}));
-  connect(senH.port_b, senM_flow.port_a) annotation (Line(
+  connect(senH.port_b, senMasFlo.port_a) annotation (Line(
       points={{20,20},{28,20}},
       color={0,127,255}));
   connect(senH.h_out, pro.u1) annotation (Line(points={{10,31},{10,38},{10,76},
           {58,76}},          color={0,0,127}));
-  connect(senM_flow.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
+  connect(senMasFlo.m_flow, pro.u2) annotation (Line(points={{38,31},{38,48},{
           38,64},{58,64}},       color={0,0,127}));
   connect(senHLat_flow.H_flow, add.u1) annotation (Line(
       points={{-50,-59},{-50,-30},{18,-30}},
@@ -73,7 +73,7 @@ equation
   connect(senHSen_flow.H_flow, add.u2) annotation (Line(
       points={{-10,-59},{-10,-42},{18,-42}},
       color={0,0,127}));
-  connect(senM_flow.port_b, senHLat_flow.port_a) annotation (Line(
+  connect(senMasFlo.port_b, senHLat_flow.port_a) annotation (Line(
       points={{48,20},{60,20},{60,0},{-70,0},{-70,-70},{-60,-70}},
       color={0,127,255}));
   connect(senHLat_flow.port_b, senHSen_flow.port_a)
diff --git a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
index ca8107a058..d55c018397 100644
--- a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
+++ b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
@@ -35,21 +35,21 @@ model StratifiedUnloadAtMinimumTemperature
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=3000,
-    use_inputFilter=false) "Control valve at top"
+    use_strokeTime=false) "Control valve at top"
     annotation (Placement(transformation(extent={{112,-30},{132,-10}})));
 
   IBPSA.Fluid.Actuators.Valves.TwoWayLinear valMid(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=3000,
-    use_inputFilter=false) "Control valve at middle"
+    use_strokeTime=false) "Control valve at middle"
     annotation (Placement(transformation(extent={{132,-70},{152,-50}})));
 
   IBPSA.Fluid.Actuators.Valves.TwoWayLinear valBot(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
     dpValve_nominal=3000,
-    use_inputFilter=false) "Control valve at bottom"
+    use_strokeTime=false) "Control valve at bottom"
     annotation (Placement(transformation(extent={{150,-110},{170,-90}})));
 
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TMid
@@ -124,14 +124,14 @@ equation
   connect(senTem.port_b,loa. ports[1])
     annotation (Line(points={{210,-60},{222,-60}},
                                                  color={0,127,255}));
-  connect(valTop.port_a, tan.fluPorVol[1]) annotation (Line(points={{112,-20},{
-          -116,-20},{-116,-118},{-112.6,-118},{-112.6,-118.4}},
+  connect(valTop.port_a, tan.fluPorVol[1]) annotation (Line(points={{112,-20},{-116,
+          -20},{-116,-118},{-115,-118},{-115,-119.6}},
                                color={0,127,255}));
-  connect(valMid.port_a, tan.fluPorVol[3]) annotation (Line(points={{132,-60},{
-          -116,-60},{-116,-118},{-112.6,-118}},
+  connect(valMid.port_a, tan.fluPorVol[3]) annotation (Line(points={{132,-60},{-116,
+          -60},{-116,-118},{-115,-118}},
                               color={0,127,255}));
-  connect(valBot.port_a, tan.fluPorVol[5]) annotation (Line(points={{150,-100},
-          {-116,-100},{-116,-118},{-112.6,-118},{-112.6,-117.6}},
+  connect(valBot.port_a, tan.fluPorVol[5]) annotation (Line(points={{150,-100},{
+          -116,-100},{-116,-118},{-115,-118},{-115,-116.4}},
                               color={0,127,255}));
   connect(onOffMid.y, and2.u1)
     annotation (Line(points={{-29,80},{8,80}},     color={255,0,255}));
diff --git a/IBPSA/Obsolete/Fluid/Movers/Validation/PowerSimplified.mo b/IBPSA/Obsolete/Fluid/Movers/Validation/PowerSimplified.mo
index 68c14d1256..bf1e43fcbf 100644
--- a/IBPSA/Obsolete/Fluid/Movers/Validation/PowerSimplified.mo
+++ b/IBPSA/Obsolete/Fluid/Movers/Validation/PowerSimplified.mo
@@ -15,7 +15,7 @@ model PowerSimplified
   IBPSA.Fluid.Movers.SpeedControlled_y pump_y(
     redeclare package Medium = Medium,
     per=per,
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
     "Pump with normalised speed y as control signal"
     annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
@@ -27,7 +27,7 @@ model PowerSimplified
       etaMotMet=IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate,
       efficiency(V_flow={0}, eta={0.3577}),
       motorEfficiency(V_flow={0}, eta={1})),
-    use_inputFilter=false,
+    use_riseTime=false,
     m_flow_nominal=m_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
     "Pump with pressure rise as control signal"
@@ -42,7 +42,7 @@ model PowerSimplified
       etaMotMet=IBPSA.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.Efficiency_VolumeFlowRate,
       efficiency(V_flow={0}, eta={0.3577}),
       motorEfficiency(V_flow={0}, eta={1})),
-    use_inputFilter=false,
+    use_riseTime=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial)
     "Pump with mass flow rate as control signal"
     annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
diff --git a/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png b/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png
index d30883d337..6e793a7cce 100644
Binary files a/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png and b/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png differ
diff --git a/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.svg b/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.svg
new file mode 100644
index 0000000000..295080698b
--- /dev/null
+++ b/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.svg
@@ -0,0 +1,583 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 659 412"
+   version="1.1"
+   id="svg145"
+   sodipodi:docname="valveResponse.svg"
+   inkscape:export-filename="/home/mwetter/proj/ldrd/bie/modeling/github/ibpsa/modelica-ibpsa/IBPSA/Resources/Images/Fluid/Actuators/valveResponse.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata151">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs149" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2051"
+     inkscape:window-height="1209"
+     id="namedview147"
+     showgrid="false"
+     inkscape:zoom="0.57281553"
+     inkscape:cx="332.99153"
+     inkscape:cy="206"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg145" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 104,333"
+     id="polyline2" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="155.5,26 155.5,333"
+     id="polyline4" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,26 207,333"
+     id="polyline6" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="258.5,26 258.5,333"
+     id="polyline8" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,26 310,333"
+     id="polyline10" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="361.5,26 361.5,333"
+     id="polyline12" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,26 413,333"
+     id="polyline14" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="464.5,26 464.5,333"
+     id="polyline16" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,26 516,333"
+     id="polyline18" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="567.5,26 567.5,333"
+     id="polyline20" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,26 619,333"
+     id="polyline22" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 619,333"
+     id="polyline24" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,289.143 619,289.143"
+     id="polyline26" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,245.286 619,245.286"
+     id="polyline28" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,201.429 619,201.429"
+     id="polyline30" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,157.571 619,157.571"
+     id="polyline32" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,113.714 619,113.714"
+     id="polyline34" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,69.8571 619,69.8571"
+     id="polyline36" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 619,26"
+     id="polyline38" />
+  <polyline
+     fill="none"
+     stroke="rgb(192,192,192)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,289.143 619,289.143"
+     id="polyline40" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 619,333"
+     id="polyline42" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,26"
+     id="polyline44" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,26 104,26"
+     id="polyline46" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 104,333"
+     id="polyline48" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 104,339"
+     id="polyline50" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="155.5,333 155.5,339"
+     id="polyline52" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,333 207,339"
+     id="polyline54" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="258.5,333 258.5,339"
+     id="polyline56" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,333 310,339"
+     id="polyline58" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="361.5,333 361.5,339"
+     id="polyline60" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,333 413,339"
+     id="polyline62" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="464.5,333 464.5,339"
+     id="polyline64" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,333 516,339"
+     id="polyline66" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="567.5,333 567.5,339"
+     id="polyline68" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,339"
+     id="polyline70" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 104,342.6"
+     id="polyline72" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="104"
+     y="356.5"
+     id="text74">0</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,333 207,342.6"
+     id="polyline76" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="207"
+     y="356.5"
+     id="text78">40</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,333 310,342.6"
+     id="polyline80" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="310"
+     y="356.5"
+     id="text82">80</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,333 413,342.6"
+     id="polyline84" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="413"
+     y="356.5"
+     id="text86">120</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,333 516,342.6"
+     id="polyline88" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516"
+     y="356.5"
+     id="text90">160</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,342.6"
+     id="polyline92" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="619"
+     y="356.5"
+     id="text94">200</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,333 104,333"
+     id="polyline96" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,289.143 104,289.143"
+     id="polyline98" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,245.286 104,245.286"
+     id="polyline100" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,201.429 104,201.429"
+     id="polyline102" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,157.571 104,157.571"
+     id="polyline104" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,113.714 104,113.714"
+     id="polyline106" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,69.8571 104,69.8571"
+     id="polyline108" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,26 104,26"
+     id="polyline110" />
+  <rect
+     fill="none"
+     stroke="none"
+     stroke-dasharray="none"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     x="14"
+     y="278.143"
+     width="78"
+     height="22"
+     id="rect112" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,289.143 104,289.143"
+     id="polyline114" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="289.143"
+     id="text116">0.0</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,201.429 104,201.429"
+     id="polyline118" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="201.429"
+     id="text120">0.4</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,113.714 104,113.714"
+     id="polyline122" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="113.714"
+     id="text124">0.8</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,26 104,26"
+     id="polyline126" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="26"
+     id="text128">1.2</text>
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     transform="translate(39, 179.5) rotate(-90)"
+     id="text130">[1]</text>
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="361.5"
+     y="385"
+     id="text132">time [s]</text>
+  <clipPath
+     id="clipArea1">
+    <rect
+       x="104"
+       y="26"
+       width="516"
+       height="307"
+       id="rect134" />
+  </clipPath>
+  <polyline
+     fill="none"
+     stroke="rgb(28,108,200)"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1)"
+     points="104,289.143 105.03,289.143 106.06,289.143 107.09,289.143 108.12,289.143 109.15,289.143 110.18,289.143 111.21,289.143 112.24,289.143 113.27,289.143 114.3,289.143 115.33,289.143 116.36,289.143 117.39,289.143 118.42,289.143 119.45,289.143 120.48,289.143 121.51,289.143 122.54,289.143 123.57,289.143 124.6,289.143 125.63,289.143 126.66,289.143 127.69,289.143 128.72,289.143 129.75,289.143 129.75,289.143 130.78,288.412 131.81,287.681 132.84,286.95 133.87,286.219 134.9,285.488 135.93,284.757 136.96,284.026 137.99,283.295 139.02,282.564 140.05,281.833 141.08,281.102 142.11,280.371 143.14,279.64 144.17,278.91 145.2,278.179 146.23,277.448 147.26,276.717 148.29,275.986 149.32,275.255 150.35,274.524 151.38,273.793 152.41,273.062 153.44,272.331 154.47,271.6 155.5,270.869 156.53,270.138 157.56,269.407 158.59,268.676 159.62,267.945 160.65,267.214 161.68,266.483 162.71,265.752 163.74,265.021 164.77,264.29 165.8,263.56 166.83,262.829 167.86,262.098 168.89,261.367 169.92,260.636 170.95,259.905 171.98,259.174 173.01,258.443 174.04,257.712 175.07,256.981 176.1,256.25 177.13,255.519 178.16,254.788 179.19,254.057 180.22,253.326 181.25,252.595 182.28,251.864 183.31,251.133 184.34,250.402 185.37,249.671 186.4,248.94 187.43,248.21 188.46,247.479 189.49,246.748 190.52,246.017 191.55,245.286 192.58,244.555 193.61,243.824 194.64,243.093 195.67,242.362 196.7,241.631 197.73,240.9 198.76,240.169 199.79,239.438 200.82,238.707 201.85,237.976 202.88,237.245 203.91,236.514 204.94,235.783 205.97,235.052 207,234.321 208.03,233.59 209.06,232.86 210.09,232.129 211.12,231.398 212.15,230.667 213.18,229.936 214.21,229.205 215.24,228.474 216.27,227.743 217.3,227.012 218.33,226.281 219.36,225.55 220.39,224.819 221.42,224.088 222.45,223.357 223.48,222.626 224.51,221.895 225.54,221.164 226.57,220.433 227.6,219.702 228.63,218.971 229.66,218.24 230.69,217.51 231.72,216.779 232.75,216.048 233.78,215.317 234.81,214.586 235.84,213.855 236.87,213.124 237.9,212.393 238.93,211.662 239.96,210.931 240.99,210.2 242.02,209.469 243.05,208.738 244.08,208.007 245.11,207.276 246.14,206.545 247.17,205.814 248.2,205.083 249.23,204.352 250.26,203.621 251.29,202.89 252.32,202.16 253.35,201.429 254.38,200.698 255.41,199.967 256.44,199.236 257.47,198.505 258.5,197.774 259.53,197.043 260.56,196.312 261.59,195.581 262.62,194.85 263.65,194.119 264.68,193.388 265.71,192.657 266.74,191.926 267.77,191.195 268.8,190.464 269.83,189.733 270.86,189.002 271.89,188.271 272.92,187.54 273.95,186.81 274.98,186.079 276.01,185.348 277.04,184.617 278.07,183.886 279.1,183.155 280.13,182.424 281.16,181.693 282.19,180.962 283.22,180.231 284.25,179.5 285.28,178.769 286.31,178.038 287.34,177.307 288.37,176.576 289.4,175.845 290.43,175.114 291.46,174.383 292.49,173.652 293.52,172.921 294.55,172.19 295.58,171.46 296.61,170.729 297.64,169.998 298.67,169.267 299.7,168.536 300.73,167.805 301.76,167.074 302.79,166.343 303.82,165.612 304.85,164.881 305.88,164.15 306.91,163.419 307.94,162.688 308.97,161.957 310,161.226 311.03,160.495 312.06,159.764 313.09,159.033 314.12,158.302 315.15,157.571 316.18,156.84 317.21,156.11 318.24,155.379 319.27,154.648 320.3,153.917 321.33,153.186 322.36,152.455 323.39,151.724 324.42,150.993 325.45,150.262 326.48,149.531 327.51,148.8 328.54,148.069 329.57,147.338 330.6,146.607 331.63,145.876 332.66,145.145 333.69,144.414 334.72,143.683 335.75,142.952 336.78,142.221 337.81,141.49 338.84,140.76 339.87,140.029 340.9,139.298 341.93,138.567 342.96,137.836 343.99,137.105 345.02,136.374 346.05,135.643 347.08,134.912 348.11,134.181 349.14,133.45 350.17,132.719 351.2,131.988 352.23,131.257 353.26,130.526 354.29,129.795 355.32,129.064 356.35,128.333 357.38,127.602 358.41,126.871 359.44,126.14 360.47,125.41 361.5,124.679 362.53,123.948 363.56,123.217 364.59,122.486 365.62,121.755 366.65,121.024 367.68,120.293 368.71,119.562 369.74,118.831 370.77,118.1 371.8,117.369 372.83,116.638 373.86,115.907 374.89,115.176 375.92,114.445 376.95,113.714 377.98,112.983 379.01,112.252 380.04,111.521 381.07,110.79 382.1,110.06 383.13,109.329 384.16,108.598 385.19,107.867 386.22,107.136 387.25,106.405 388.28,105.674 389.31,104.943 390.34,104.212 391.37,103.481 392.4,102.75 393.43,102.019 394.46,101.288 395.49,100.557 396.52,99.8262 397.55,99.0952 398.58,98.3643 399.61,97.6333 400.64,96.9024 401.67,96.1714 402.7,95.4405 403.73,94.7095 404.76,93.9786 405.79,93.2476 406.82,92.5167 407.85,91.7857 408.88,91.0548 409.91,90.3238 410.94,89.5929 411.97,88.8619 413,88.1309 414.03,87.4 415.06,86.669 416.09,85.9381 417.12,85.2071 418.15,84.4762 419.18,83.7452 420.21,83.0143 421.24,82.2833 422.27,81.5524 423.3,80.8214 424.33,80.0905 425.36,79.3595 426.39,78.6286 427.42,77.8976 428.45,77.1667 429.48,76.4357 430.51,75.7048 431.54,74.9738 432.57,74.2429 433.6,73.5119 434.63,72.7809 435.66,72.05 436.69,71.319 437.72,70.5881 438.75,69.9131 439.78,69.8576 440.81,69.8572 441.84,69.8571 442.87,69.8571 443.9,69.8571 444.93,69.8571 445.96,69.8571 446.99,69.8571 448.02,69.8571 449.05,69.8571 450.08,69.8571 451.11,69.8571 452.14,69.8571 453.17,69.8571 454.2,69.8571 455.23,69.8571 456.26,69.8571 457.29,69.8571 458.32,69.8571 459.35,69.8571 460.38,69.8571 461.41,69.8571 462.44,69.8571 463.47,69.8571 464.5,69.8571 465.53,69.8571 466.56,69.8571 467.59,69.8571 468.62,69.8571 469.65,69.8571 470.68,69.8571 471.71,69.8571 472.74,69.8571 473.77,69.8571 474.8,69.8571 475.83,69.8571 476.86,69.8571 477.89,69.8571 478.92,69.8571 479.95,69.8571 480.98,69.8571 482.01,69.8571 483.04,69.8571 484.07,69.8571 485.1,69.8571 486.13,69.8571 487.16,69.8571 488.19,69.8571 489.22,69.8571 490.25,69.8571 491.28,69.8571 492.31,69.8571 493.34,69.8571 494.37,69.8571 495.4,69.8571 496.43,69.8571 497.46,69.8571 498.49,69.8571 499.52,69.8571 500.55,69.8571 501.58,69.8571 502.61,69.8571 503.64,69.8571 504.67,69.8571 505.7,69.8571 506.73,69.8571 507.76,69.8571 508.79,69.8571 509.82,69.8571 510.85,69.8571 511.88,69.8571 512.91,69.8571 513.94,69.8571 514.97,69.8571 516,69.8571 517.03,69.8571 518.06,69.8571 519.09,69.8571 520.12,69.8571 521.15,69.8571 522.18,69.8571 523.21,69.8571 524.24,69.8571 525.27,69.8571 526.3,69.8571 527.33,69.8571 528.36,69.8571 529.39,69.8571 530.42,69.8571 531.45,69.8571 532.48,69.8571 533.51,69.8571 534.54,69.8571 535.57,69.8571 536.6,69.8571 537.63,69.8571 538.66,69.8571 539.69,69.8571 540.72,69.8571 541.75,69.8571 542.78,69.8571 543.81,69.8571 544.84,69.8571 545.87,69.8571 546.9,69.8571 547.93,69.8571 548.96,69.8571 549.99,69.8571 551.02,69.8571 552.05,69.8571 553.08,69.8571 554.11,69.8571 555.14,69.8571 556.17,69.8571 557.2,69.8571 558.23,69.8571 559.26,69.8571 560.29,69.8571 561.32,69.8571 562.35,69.8571 563.38,69.8571 564.41,69.8571 565.44,69.8571 566.47,69.8571 567.5,69.8571 568.53,69.8571 569.56,69.8571 570.59,69.8571 571.62,69.8571 572.65,69.8571 573.68,69.8571 574.71,69.8571 575.74,69.8571 576.77,69.8571 577.8,69.8571 578.83,69.8571 579.86,69.8571 580.89,69.8571 581.92,69.8571 582.95,69.8571 583.98,69.8571 585.01,69.8571 586.04,69.8571 587.07,69.8571 588.1,69.8571 589.13,69.8571 590.16,69.8571 591.19,69.8571 592.22,69.8571 593.25,69.8571 594.28,69.8571 595.31,69.8571 596.34,69.8571 597.37,69.8571 598.4,69.8571 599.43,69.8571 600.46,69.8571 601.49,69.8571 602.52,69.8571 603.55,69.8571 604.58,69.8571 605.61,69.8571 606.64,69.8571 607.67,69.8571 608.7,69.8571 609.73,69.8571 610.76,69.8571 611.79,69.8571 612.82,69.8571 613.85,69.8571 614.88,69.8571 615.91,69.8571 616.94,69.8571 617.97,69.8571 619,69.8571 619,69.8571"
+     id="polyline137" />
+  <polyline
+     fill="none"
+     stroke="rgb(238,46,47)"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1)"
+     points="104,289.143 105.03,289.143 106.06,289.143 107.09,289.143 108.12,289.143 109.15,289.143 110.18,289.143 111.21,289.143 112.24,289.143 113.27,289.143 114.3,289.143 115.33,289.143 116.36,289.143 117.39,289.143 118.42,289.143 119.45,289.143 120.48,289.143 121.51,289.143 122.54,289.143 123.57,289.143 124.6,289.143 125.63,289.143 126.66,289.143 127.69,289.143 128.72,289.143 129.75,289.143 129.75,69.8571 130.78,69.8571 131.81,69.8571 132.84,69.8571 133.87,69.8571 134.9,69.8571 135.93,69.8571 136.96,69.8571 137.99,69.8571 139.02,69.8571 140.05,69.8571 141.08,69.8571 142.11,69.8571 143.14,69.8571 144.17,69.8571 145.2,69.8571 146.23,69.8571 147.26,69.8571 148.29,69.8571 149.32,69.8571 150.35,69.8571 151.38,69.8571 152.41,69.8571 153.44,69.8571 154.47,69.8571 155.5,69.8571 156.53,69.8571 157.56,69.8571 158.59,69.8571 159.62,69.8571 160.65,69.8571 161.68,69.8571 162.71,69.8571 163.74,69.8571 164.77,69.8571 165.8,69.8571 166.83,69.8571 167.86,69.8571 168.89,69.8571 169.92,69.8571 170.95,69.8571 171.98,69.8571 173.01,69.8571 174.04,69.8571 175.07,69.8571 176.1,69.8571 177.13,69.8571 178.16,69.8571 179.19,69.8571 180.22,69.8571 181.25,69.8571 182.28,69.8571 183.31,69.8571 184.34,69.8571 185.37,69.8571 186.4,69.8571 187.43,69.8571 188.46,69.8571 189.49,69.8571 190.52,69.8571 191.55,69.8571 192.58,69.8571 193.61,69.8571 194.64,69.8571 195.67,69.8571 196.7,69.8571 197.73,69.8571 198.76,69.8571 199.79,69.8571 200.82,69.8571 201.85,69.8571 202.88,69.8571 203.91,69.8571 204.94,69.8571 205.97,69.8571 207,69.8571 208.03,69.8571 209.06,69.8571 210.09,69.8571 211.12,69.8571 212.15,69.8571 213.18,69.8571 214.21,69.8571 215.24,69.8571 216.27,69.8571 217.3,69.8571 218.33,69.8571 219.36,69.8571 220.39,69.8571 221.42,69.8571 222.45,69.8571 223.48,69.8571 224.51,69.8571 225.54,69.8571 226.57,69.8571 227.6,69.8571 228.63,69.8571 229.66,69.8571 230.69,69.8571 231.72,69.8571 232.75,69.8571 233.78,69.8571 234.81,69.8571 235.84,69.8571 236.87,69.8571 237.9,69.8571 238.93,69.8571 239.96,69.8571 240.99,69.8571 242.02,69.8571 243.05,69.8571 244.08,69.8571 245.11,69.8571 246.14,69.8571 247.17,69.8571 248.2,69.8571 249.23,69.8571 250.26,69.8571 251.29,69.8571 252.32,69.8571 253.35,69.8571 254.38,69.8571 255.41,69.8571 256.44,69.8571 257.47,69.8571 258.5,69.8571 259.53,69.8571 260.56,69.8571 261.59,69.8571 262.62,69.8571 263.65,69.8571 264.68,69.8571 265.71,69.8571 266.74,69.8571 267.77,69.8571 268.8,69.8571 269.83,69.8571 270.86,69.8571 271.89,69.8571 272.92,69.8571 273.95,69.8571 274.98,69.8571 276.01,69.8571 277.04,69.8571 278.07,69.8571 279.1,69.8571 280.13,69.8571 281.16,69.8571 282.19,69.8571 283.22,69.8571 284.25,69.8571 285.28,69.8571 286.31,69.8571 287.34,69.8571 288.37,69.8571 289.4,69.8571 290.43,69.8571 291.46,69.8571 292.49,69.8571 293.52,69.8571 294.55,69.8571 295.58,69.8571 296.61,69.8571 297.64,69.8571 298.67,69.8571 299.7,69.8571 300.73,69.8571 301.76,69.8571 302.79,69.8571 303.82,69.8571 304.85,69.8571 305.88,69.8571 306.91,69.8571 307.94,69.8571 308.97,69.8571 310,69.8571 311.03,69.8571 312.06,69.8571 313.09,69.8571 314.12,69.8571 315.15,69.8571 316.18,69.8571 317.21,69.8571 318.24,69.8571 319.27,69.8571 320.3,69.8571 321.33,69.8571 322.36,69.8571 323.39,69.8571 324.42,69.8571 325.45,69.8571 326.48,69.8571 327.51,69.8571 328.54,69.8571 329.57,69.8571 330.6,69.8571 331.63,69.8571 332.66,69.8571 333.69,69.8571 334.72,69.8571 335.75,69.8571 336.78,69.8571 337.81,69.8571 338.84,69.8571 339.87,69.8571 340.9,69.8571 341.93,69.8571 342.96,69.8571 343.99,69.8571 345.02,69.8571 346.05,69.8571 347.08,69.8571 348.11,69.8571 349.14,69.8571 350.17,69.8571 351.2,69.8571 352.23,69.8571 353.26,69.8571 354.29,69.8571 355.32,69.8571 356.35,69.8571 357.38,69.8571 358.41,69.8571 359.44,69.8571 360.47,69.8571 361.5,69.8571 362.53,69.8571 363.56,69.8571 364.59,69.8571 365.62,69.8571 366.65,69.8571 367.68,69.8571 368.71,69.8571 369.74,69.8571 370.77,69.8571 371.8,69.8571 372.83,69.8571 373.86,69.8571 374.89,69.8571 375.92,69.8571 376.95,69.8571 377.98,69.8571 379.01,69.8571 380.04,69.8571 381.07,69.8571 382.1,69.8571 383.13,69.8571 384.16,69.8571 385.19,69.8571 386.22,69.8571 387.25,69.8571 388.28,69.8571 389.31,69.8571 390.34,69.8571 391.37,69.8571 392.4,69.8571 393.43,69.8571 394.46,69.8571 395.49,69.8571 396.52,69.8571 397.55,69.8571 398.58,69.8571 399.61,69.8571 400.64,69.8571 401.67,69.8571 402.7,69.8571 403.73,69.8571 404.76,69.8571 405.79,69.8571 406.82,69.8571 407.85,69.8571 408.88,69.8571 409.91,69.8571 410.94,69.8571 411.97,69.8571 413,69.8571 414.03,69.8571 415.06,69.8571 416.09,69.8571 417.12,69.8571 418.15,69.8571 419.18,69.8571 420.21,69.8571 421.24,69.8571 422.27,69.8571 423.3,69.8571 424.33,69.8571 425.36,69.8571 426.39,69.8571 427.42,69.8571 428.45,69.8571 429.48,69.8571 430.51,69.8571 431.54,69.8571 432.57,69.8571 433.6,69.8571 434.63,69.8571 435.66,69.8571 436.69,69.8571 437.72,69.8571 438.75,69.8571 439.78,69.8571 440.81,69.8571 441.84,69.8571 442.87,69.8571 443.9,69.8571 444.93,69.8571 445.96,69.8571 446.99,69.8571 448.02,69.8571 449.05,69.8571 450.08,69.8571 451.11,69.8571 452.14,69.8571 453.17,69.8571 454.2,69.8571 455.23,69.8571 456.26,69.8571 457.29,69.8571 458.32,69.8571 459.35,69.8571 460.38,69.8571 461.41,69.8571 462.44,69.8571 463.47,69.8571 464.5,69.8571 465.53,69.8571 466.56,69.8571 467.59,69.8571 468.62,69.8571 469.65,69.8571 470.68,69.8571 471.71,69.8571 472.74,69.8571 473.77,69.8571 474.8,69.8571 475.83,69.8571 476.86,69.8571 477.89,69.8571 478.92,69.8571 479.95,69.8571 480.98,69.8571 482.01,69.8571 483.04,69.8571 484.07,69.8571 485.1,69.8571 486.13,69.8571 487.16,69.8571 488.19,69.8571 489.22,69.8571 490.25,69.8571 491.28,69.8571 492.31,69.8571 493.34,69.8571 494.37,69.8571 495.4,69.8571 496.43,69.8571 497.46,69.8571 498.49,69.8571 499.52,69.8571 500.55,69.8571 501.58,69.8571 502.61,69.8571 503.64,69.8571 504.67,69.8571 505.7,69.8571 506.73,69.8571 507.76,69.8571 508.79,69.8571 509.82,69.8571 510.85,69.8571 511.88,69.8571 512.91,69.8571 513.94,69.8571 514.97,69.8571 516,69.8571 517.03,69.8571 518.06,69.8571 519.09,69.8571 520.12,69.8571 521.15,69.8571 522.18,69.8571 523.21,69.8571 524.24,69.8571 525.27,69.8571 526.3,69.8571 527.33,69.8571 528.36,69.8571 529.39,69.8571 530.42,69.8571 531.45,69.8571 532.48,69.8571 533.51,69.8571 534.54,69.8571 535.57,69.8571 536.6,69.8571 537.63,69.8571 538.66,69.8571 539.69,69.8571 540.72,69.8571 541.75,69.8571 542.78,69.8571 543.81,69.8571 544.84,69.8571 545.87,69.8571 546.9,69.8571 547.93,69.8571 548.96,69.8571 549.99,69.8571 551.02,69.8571 552.05,69.8571 553.08,69.8571 554.11,69.8571 555.14,69.8571 556.17,69.8571 557.2,69.8571 558.23,69.8571 559.26,69.8571 560.29,69.8571 561.32,69.8571 562.35,69.8571 563.38,69.8571 564.41,69.8571 565.44,69.8571 566.47,69.8571 567.5,69.8571 568.53,69.8571 569.56,69.8571 570.59,69.8571 571.62,69.8571 572.65,69.8571 573.68,69.8571 574.71,69.8571 575.74,69.8571 576.77,69.8571 577.8,69.8571 578.83,69.8571 579.86,69.8571 580.89,69.8571 581.92,69.8571 582.95,69.8571 583.98,69.8571 585.01,69.8571 586.04,69.8571 587.07,69.8571 588.1,69.8571 589.13,69.8571 590.16,69.8571 591.19,69.8571 592.22,69.8571 593.25,69.8571 594.28,69.8571 595.31,69.8571 596.34,69.8571 597.37,69.8571 598.4,69.8571 599.43,69.8571 600.46,69.8571 601.49,69.8571 602.52,69.8571 603.55,69.8571 604.58,69.8571 605.61,69.8571 606.64,69.8571 607.67,69.8571 608.7,69.8571 609.73,69.8571 610.76,69.8571 611.79,69.8571 612.82,69.8571 613.85,69.8571 614.88,69.8571 615.91,69.8571 616.94,69.8571 617.97,69.8571 619,69.8571 619,69.8571"
+     id="polyline139" />
+  <text
+     fill="rgb(238,46,47)"
+     font-size="22"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="391.112"
+     y="45.7355"
+     id="text141">val2.y_actual</text>
+  <text
+     fill="rgb(28,108,200)"
+     font-size="22"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="387.25"
+     y="177.308"
+     id="text143">val1.y_actual</text>
+</svg>
diff --git a/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png b/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png
index 5a899508b7..1969a0eb5b 100644
Binary files a/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png and b/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png differ
diff --git a/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.svg b/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.svg
new file mode 100644
index 0000000000..cdfbe3ccdd
--- /dev/null
+++ b/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.svg
@@ -0,0 +1,592 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 659 412"
+   version="1.1"
+   id="svg147"
+   sodipodi:docname="fanSpeedFiltered.svg"
+   inkscape:export-filename="/home/mwetter/proj/ldrd/bie/modeling/github/ibpsa/modelica-ibpsa/IBPSA/Resources/Images/Fluid/Movers/UsersGuide/fanSpeedFiltered.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata153">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs151" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1877"
+     inkscape:window-height="1222"
+     id="namedview149"
+     showgrid="false"
+     inkscape:zoom="0.57281553"
+     inkscape:cx="332.99153"
+     inkscape:cy="206"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg147" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 104,333"
+     id="polyline2" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="155.5,26 155.5,333"
+     id="polyline4" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,26 207,333"
+     id="polyline6" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="258.5,26 258.5,333"
+     id="polyline8" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,26 310,333"
+     id="polyline10" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="361.5,26 361.5,333"
+     id="polyline12" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,26 413,333"
+     id="polyline14" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="464.5,26 464.5,333"
+     id="polyline16" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,26 516,333"
+     id="polyline18" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="567.5,26 567.5,333"
+     id="polyline20" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,26 619,333"
+     id="polyline22" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 619,333"
+     id="polyline24" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,289.143 619,289.143"
+     id="polyline26" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,245.286 619,245.286"
+     id="polyline28" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,201.429 619,201.429"
+     id="polyline30" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,157.571 619,157.571"
+     id="polyline32" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,113.714 619,113.714"
+     id="polyline34" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,69.8571 619,69.8571"
+     id="polyline36" />
+  <polyline
+     fill="none"
+     stroke="rgb(229,229,229)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 619,26"
+     id="polyline38" />
+  <polyline
+     fill="none"
+     stroke="rgb(192,192,192)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,289.143 619,289.143"
+     id="polyline40" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 619,333"
+     id="polyline42" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,26"
+     id="polyline44" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,26 104,26"
+     id="polyline46" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,26 104,333"
+     id="polyline48" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 104,339"
+     id="polyline50" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="155.5,333 155.5,339"
+     id="polyline52" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,333 207,339"
+     id="polyline54" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="258.5,333 258.5,339"
+     id="polyline56" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,333 310,339"
+     id="polyline58" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="361.5,333 361.5,339"
+     id="polyline60" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,333 413,339"
+     id="polyline62" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="464.5,333 464.5,339"
+     id="polyline64" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,333 516,339"
+     id="polyline66" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="567.5,333 567.5,339"
+     id="polyline68" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,339"
+     id="polyline70" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="104,333 104,342.6"
+     id="polyline72" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="104"
+     y="356.5"
+     id="text74">0</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="207,333 207,342.6"
+     id="polyline76" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="207"
+     y="356.5"
+     id="text78">20</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="310,333 310,342.6"
+     id="polyline80" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="310"
+     y="356.5"
+     id="text82">40</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="413,333 413,342.6"
+     id="polyline84" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="413"
+     y="356.5"
+     id="text86">60</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="516,333 516,342.6"
+     id="polyline88" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="516"
+     y="356.5"
+     id="text90">80</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="619,333 619,342.6"
+     id="polyline92" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="619"
+     y="356.5"
+     id="text94">100</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,333 104,333"
+     id="polyline96" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,289.143 104,289.143"
+     id="polyline98" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,245.286 104,245.286"
+     id="polyline100" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,201.429 104,201.429"
+     id="polyline102" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,157.571 104,157.571"
+     id="polyline104" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,113.714 104,113.714"
+     id="polyline106" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,69.8571 104,69.8571"
+     id="polyline108" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="98,26 104,26"
+     id="polyline110" />
+  <rect
+     fill="none"
+     stroke="none"
+     stroke-dasharray="none"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     x="14"
+     y="278.143"
+     width="78"
+     height="22"
+     id="rect112" />
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,289.143 104,289.143"
+     id="polyline114" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="289.143"
+     id="text116">0.0</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,201.429 104,201.429"
+     id="polyline118" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="201.429"
+     id="text120">0.4</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,113.714 104,113.714"
+     id="polyline122" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="113.714"
+     id="text124">0.8</text>
+  <polyline
+     fill="none"
+     stroke="rgb(0,0,0)"
+     stroke-width="0.5"
+     stroke-opacity="1"
+     points="94.4,26 104,26"
+     id="polyline126" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="end"
+     dominant-baseline="central"
+     x="92"
+     y="26"
+     id="text128">1.2</text>
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     transform="translate(39, 179.5) rotate(-90)"
+     id="text130">[1]</text>
+  <text
+     fill="rgb(0,0,0)"
+     font-size="17"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="361.5"
+     y="385"
+     id="text132">time [s]</text>
+  <clipPath
+     id="clipArea1">
+    <rect
+       x="104"
+       y="26"
+       width="516"
+       height="307"
+       id="rect134" />
+  </clipPath>
+  <polyline
+     fill="none"
+     stroke="rgb(28,108,200)"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1)"
+     points="104,289.143 105.03,287.681 106.06,286.219 107.09,284.757 108.12,283.295 109.15,281.833 110.18,280.371 111.21,278.91 112.24,277.448 113.27,275.986 114.3,274.524 115.33,273.062 116.36,271.6 117.39,270.138 118.42,268.676 119.45,267.214 120.48,265.752 121.51,264.29 122.54,262.829 123.57,261.367 124.6,259.905 125.63,258.443 126.66,256.981 127.69,255.519 128.72,254.057 129.75,252.595 130.78,251.133 131.81,249.671 132.84,248.21 133.87,246.748 134.9,245.286 135.93,243.824 136.96,242.362 137.99,240.9 139.02,239.438 140.05,237.976 141.08,236.514 142.11,235.052 143.14,233.59 144.17,232.129 145.2,230.667 146.23,229.205 147.26,227.743 148.29,226.281 149.32,224.819 150.35,223.357 151.38,221.895 152.41,220.433 153.44,218.971 154.47,217.51 155.5,216.048 156.53,214.586 157.56,213.124 158.59,211.662 159.62,210.2 160.65,208.738 161.68,207.276 162.71,205.814 163.74,204.352 164.77,202.89 165.8,201.429 166.83,199.967 167.86,198.505 168.89,197.043 169.92,195.581 170.95,194.119 171.98,192.657 173.01,191.195 174.04,189.733 175.07,188.271 176.1,186.81 177.13,185.348 178.16,183.886 179.19,182.424 180.22,180.962 181.25,179.5 182.28,178.038 183.31,176.576 184.34,175.114 185.37,173.652 186.4,172.19 187.43,170.729 188.46,169.267 189.49,167.805 190.52,166.343 191.55,164.881 192.58,163.419 193.61,161.957 194.64,160.495 195.67,159.033 196.7,157.571 197.73,156.11 198.76,154.648 199.79,153.186 200.82,151.724 201.85,150.262 202.88,148.8 203.91,147.338 204.94,145.876 205.97,144.414 207,142.952 208.03,141.49 209.06,140.029 210.09,138.567 211.12,137.105 212.15,135.643 213.18,134.181 214.21,132.719 215.24,131.257 216.27,129.795 217.3,128.333 218.33,126.871 219.36,125.41 220.39,123.948 221.42,122.486 222.45,121.024 223.48,119.562 224.51,118.1 225.54,116.638 226.57,115.176 227.6,113.714 228.63,112.252 229.66,110.79 230.69,109.329 231.72,107.867 232.75,106.405 233.78,104.943 234.81,103.481 235.84,102.019 236.87,100.557 237.9,99.0952 238.93,97.6333 239.96,96.1714 240.99,94.7095 242.02,93.2476 243.05,91.7857 244.08,90.3238 245.11,88.8619 246.14,87.4 247.17,85.9381 248.2,84.4762 249.23,83.0143 250.26,81.5524 251.29,80.0905 252.32,78.6286 253.35,77.1667 254.38,75.7048 255.41,74.2429 256.44,72.7809 257.47,71.492 258.5,70.7542 259.53,70.3496 260.56,70.1271 261.59,70.0051 262.62,69.9382 263.65,69.9016 264.68,69.8817 265.71,69.8708 266.74,69.8647 267.77,69.8613 268.8,69.8594 269.83,69.8584 270.86,69.8578 271.89,69.8575 272.92,69.8573 273.95,69.8572 274.98,69.8572 276.01,69.8571 277.04,69.8571 278.07,69.8571 279.1,69.8571 280.13,69.8571 281.16,69.8571 282.19,69.8571 283.22,69.8571 284.25,69.8571 285.28,69.8571 286.31,69.8571 287.34,69.8571 288.37,69.8571 289.4,69.8571 290.43,69.8571 291.46,69.8571 292.49,69.8571 293.52,69.8571 294.55,69.8571 295.58,69.8571 296.61,69.8571 297.64,69.8571 298.67,69.8571 299.7,69.8571 300.73,69.8571 301.76,69.8571 302.79,69.8571 303.82,69.8571 304.85,69.8571 305.88,69.8571 306.91,69.8571 307.94,69.8571 308.97,69.8571 310,69.8571 311.03,69.8571 312.06,69.8571 313.09,69.8571 314.12,69.8571 315.15,69.8571 316.18,69.8571 317.21,69.8571 318.24,69.8571 319.27,69.8571 320.3,69.8571 321.33,69.8571 322.36,69.8571 323.39,69.8571 324.42,69.8571 325.45,69.8571 326.48,69.8571 327.51,69.8571 328.54,69.8571 329.57,69.8571 330.6,69.8571 331.63,69.8571 332.66,69.8571 333.69,69.8571 334.72,69.8571 335.75,69.8571 336.78,69.8571 337.81,69.8571 338.84,69.8571 339.87,69.8571 340.9,69.8571 341.93,69.8571 342.96,69.8571 343.99,69.8571 345.02,69.8571 346.05,69.8571 347.08,69.8571 348.11,69.8571 349.14,69.8571 350.17,69.8571 351.2,69.8571 352.23,69.8571 353.26,69.8571 354.29,69.8571 355.32,69.8571 356.35,69.8571 357.38,69.8571 358.41,69.8571 359.44,69.8571 360.47,69.8571 361.5,69.8571 362.53,69.8571 363.56,69.8571 364.59,69.8571 365.62,69.8571 366.65,69.8571 367.68,69.8571 368.71,69.8571 369.74,69.8571 370.77,69.8571 371.8,69.8571 372.83,69.8571 373.86,69.8571 374.89,69.8571 375.92,69.8571 376.95,69.8571 377.98,69.8571 379.01,69.8571 380.04,69.8571 381.07,69.8571 382.1,69.8571 383.13,69.8571 384.16,69.8571 385.19,69.8571 386.22,69.8571 387.25,69.8571 388.28,69.8571 389.31,69.8571 390.34,69.8571 391.37,69.8571 392.4,69.8571 393.43,69.8571 394.46,69.8571 395.49,69.8571 396.52,69.8571 397.55,69.8571 398.58,69.8571 399.61,69.8571 400.64,69.8571 401.67,69.8571 402.7,69.8571 403.73,69.8571 404.76,69.8571 405.79,69.8571 406.82,69.8571 407.85,69.8571 408.88,69.8571 409.91,69.8571 410.94,69.8571 411.97,69.8571 413,69.8571 413,69.8571 414.03,71.319 415.06,72.7809 416.09,74.2429 417.12,75.7048 418.15,77.1667 419.18,78.6286 420.21,80.0905 421.24,81.5524 422.27,83.0143 423.3,84.4762 424.33,85.9381 425.36,87.4 426.39,88.8619 427.42,90.3238 428.45,91.7857 429.48,93.2476 430.51,94.7095 431.54,96.1714 432.57,97.6333 433.6,99.0952 434.63,100.557 435.66,102.019 436.69,103.481 437.72,104.943 438.75,106.405 439.78,107.867 440.81,109.329 441.84,110.79 442.87,112.252 443.9,113.714 444.93,115.176 445.96,116.638 446.99,118.1 448.02,119.562 449.05,121.024 450.08,122.486 451.11,123.948 452.14,125.41 453.17,126.871 454.2,128.333 455.23,129.795 456.26,131.257 457.29,132.719 458.32,134.181 459.35,135.643 460.38,137.105 461.41,138.567 462.44,140.029 463.47,141.49 464.5,142.952 465.53,144.414 466.56,145.876 467.59,147.338 468.62,148.8 469.65,150.262 470.68,151.724 471.71,153.186 472.74,154.648 473.77,156.11 474.8,157.571 475.83,159.033 476.86,160.495 477.89,161.957 478.92,163.419 479.95,164.881 480.98,166.343 482.01,167.805 483.04,169.267 484.07,170.729 485.1,172.19 486.13,173.652 487.16,175.114 488.19,176.576 489.22,177.867 490.25,178.603 491.28,179.008 492.31,179.23 493.34,179.352 494.37,179.419 495.4,179.455 496.43,179.475 497.46,179.486 498.49,179.493 499.52,179.496 500.55,179.498 501.58,179.499 502.61,179.499 503.64,179.5 504.67,179.5 505.7,179.5 506.73,179.5 507.76,179.5 508.79,179.5 509.82,179.5 510.85,179.5 511.88,179.5 512.91,179.5 513.94,179.5 514.97,179.5 516,179.5 517.03,179.5 518.06,179.5 519.09,179.5 520.12,179.5 521.15,179.5 522.18,179.5 523.21,179.5 524.24,179.5 525.27,179.5 526.3,179.5 527.33,179.5 528.36,179.5 529.39,179.5 530.42,179.5 531.45,179.5 532.48,179.5 533.51,179.5 534.54,179.5 535.57,179.5 536.6,179.5 537.63,179.5 538.66,179.5 539.69,179.5 540.72,179.5 541.75,179.5 542.78,179.5 543.81,179.5 544.84,179.5 545.87,179.5 546.9,179.5 547.93,179.5 548.96,179.5 549.99,179.5 551.02,179.5 552.05,179.5 553.08,179.5 554.11,179.5 555.14,179.5 556.17,179.5 557.2,179.5 558.23,179.5 559.26,179.5 560.29,179.5 561.32,179.5 562.35,179.5 563.38,179.5 564.41,179.5 565.44,179.5 566.47,179.5 567.5,179.5 568.53,179.5 569.56,179.5 570.59,179.5 571.62,179.5 572.65,179.5 573.68,179.5 574.71,179.5 575.74,179.5 576.77,179.5 577.8,179.5 578.83,179.5 579.86,179.5 580.89,179.5 581.92,179.5 582.95,179.5 583.98,179.5 585.01,179.5 586.04,179.5 587.07,179.5 588.1,179.5 589.13,179.5 590.16,179.5 591.19,179.5 592.22,179.5 593.25,179.5 594.28,179.5 595.31,179.5 596.34,179.5 597.37,179.5 598.4,179.5 599.43,179.5 600.46,179.5 601.49,179.5 602.52,179.5 603.55,179.5 604.58,179.5 605.61,179.5 606.64,179.5 607.67,179.5 608.7,179.5 609.73,179.5 610.76,179.5 611.79,179.5 612.82,179.5 613.85,179.5 614.88,179.5 615.91,179.5 616.94,179.5 617.97,179.5 619,179.5 619,179.5"
+     id="polyline137" />
+  <polyline
+     fill="none"
+     stroke="rgb(238,46,47)"
+     stroke-width="1"
+     stroke-opacity="1"
+     clip-path="url(#clipArea1)"
+     points="104,69.8571 105.03,69.8571 106.06,69.8571 107.09,69.8571 108.12,69.8571 109.15,69.8571 110.18,69.8571 111.21,69.8571 112.24,69.8571 113.27,69.8571 114.3,69.8571 115.33,69.8571 116.36,69.8571 117.39,69.8571 118.42,69.8571 119.45,69.8571 120.48,69.8571 121.51,69.8571 122.54,69.8571 123.57,69.8571 124.6,69.8571 125.63,69.8571 126.66,69.8571 127.69,69.8571 128.72,69.8571 129.75,69.8571 130.78,69.8571 131.81,69.8571 132.84,69.8571 133.87,69.8571 134.9,69.8571 135.93,69.8571 136.96,69.8571 137.99,69.8571 139.02,69.8571 140.05,69.8571 141.08,69.8571 142.11,69.8571 143.14,69.8571 144.17,69.8571 145.2,69.8571 146.23,69.8571 147.26,69.8571 148.29,69.8571 149.32,69.8571 150.35,69.8571 151.38,69.8571 152.41,69.8571 153.44,69.8571 154.47,69.8571 155.5,69.8571 156.53,69.8571 157.56,69.8571 158.59,69.8571 159.62,69.8571 160.65,69.8571 161.68,69.8571 162.71,69.8571 163.74,69.8571 164.77,69.8571 165.8,69.8571 166.83,69.8571 167.86,69.8571 168.89,69.8571 169.92,69.8571 170.95,69.8571 171.98,69.8571 173.01,69.8571 174.04,69.8571 175.07,69.8571 176.1,69.8571 177.13,69.8571 178.16,69.8571 179.19,69.8571 180.22,69.8571 181.25,69.8571 182.28,69.8571 183.31,69.8571 184.34,69.8571 185.37,69.8571 186.4,69.8571 187.43,69.8571 188.46,69.8571 189.49,69.8571 190.52,69.8571 191.55,69.8571 192.58,69.8571 193.61,69.8571 194.64,69.8571 195.67,69.8571 196.7,69.8571 197.73,69.8571 198.76,69.8571 199.79,69.8571 200.82,69.8571 201.85,69.8571 202.88,69.8571 203.91,69.8571 204.94,69.8571 205.97,69.8571 207,69.8571 208.03,69.8571 209.06,69.8571 210.09,69.8571 211.12,69.8571 212.15,69.8571 213.18,69.8571 214.21,69.8571 215.24,69.8571 216.27,69.8571 217.3,69.8571 218.33,69.8571 219.36,69.8571 220.39,69.8571 221.42,69.8571 222.45,69.8571 223.48,69.8571 224.51,69.8571 225.54,69.8571 226.57,69.8571 227.6,69.8571 228.63,69.8571 229.66,69.8571 230.69,69.8571 231.72,69.8571 232.75,69.8571 233.78,69.8571 234.81,69.8571 235.84,69.8571 236.87,69.8571 237.9,69.8571 238.93,69.8571 239.96,69.8571 240.99,69.8571 242.02,69.8571 243.05,69.8571 244.08,69.8571 245.11,69.8571 246.14,69.8571 247.17,69.8571 248.2,69.8571 249.23,69.8571 250.26,69.8571 251.29,69.8571 252.32,69.8571 253.35,69.8571 254.38,69.8571 255.41,69.8571 256.44,69.8571 257.47,69.8571 258.5,69.8571 259.53,69.8571 260.56,69.8571 261.59,69.8571 262.62,69.8571 263.65,69.8571 264.68,69.8571 265.71,69.8571 266.74,69.8571 267.77,69.8571 268.8,69.8571 269.83,69.8571 270.86,69.8571 271.89,69.8571 272.92,69.8571 273.95,69.8571 274.98,69.8571 276.01,69.8571 277.04,69.8571 278.07,69.8571 279.1,69.8571 280.13,69.8571 281.16,69.8571 282.19,69.8571 283.22,69.8571 284.25,69.8571 285.28,69.8571 286.31,69.8571 287.34,69.8571 288.37,69.8571 289.4,69.8571 290.43,69.8571 291.46,69.8571 292.49,69.8571 293.52,69.8571 294.55,69.8571 295.58,69.8571 296.61,69.8571 297.64,69.8571 298.67,69.8571 299.7,69.8571 300.73,69.8571 301.76,69.8571 302.79,69.8571 303.82,69.8571 304.85,69.8571 305.88,69.8571 306.91,69.8571 307.94,69.8571 308.97,69.8571 310,69.8571 311.03,69.8571 312.06,69.8571 313.09,69.8571 314.12,69.8571 315.15,69.8571 316.18,69.8571 317.21,69.8571 318.24,69.8571 319.27,69.8571 320.3,69.8571 321.33,69.8571 322.36,69.8571 323.39,69.8571 324.42,69.8571 325.45,69.8571 326.48,69.8571 327.51,69.8571 328.54,69.8571 329.57,69.8571 330.6,69.8571 331.63,69.8571 332.66,69.8571 333.69,69.8571 334.72,69.8571 335.75,69.8571 336.78,69.8571 337.81,69.8571 338.84,69.8571 339.87,69.8571 340.9,69.8571 341.93,69.8571 342.96,69.8571 343.99,69.8571 345.02,69.8571 346.05,69.8571 347.08,69.8571 348.11,69.8571 349.14,69.8571 350.17,69.8571 351.2,69.8571 352.23,69.8571 353.26,69.8571 354.29,69.8571 355.32,69.8571 356.35,69.8571 357.38,69.8571 358.41,69.8571 359.44,69.8571 360.47,69.8571 361.5,69.8571 362.53,69.8571 363.56,69.8571 364.59,69.8571 365.62,69.8571 366.65,69.8571 367.68,69.8571 368.71,69.8571 369.74,69.8571 370.77,69.8571 371.8,69.8571 372.83,69.8571 373.86,69.8571 374.89,69.8571 375.92,69.8571 376.95,69.8571 377.98,69.8571 379.01,69.8571 380.04,69.8571 381.07,69.8571 382.1,69.8571 383.13,69.8571 384.16,69.8571 385.19,69.8571 386.22,69.8571 387.25,69.8571 388.28,69.8571 389.31,69.8571 390.34,69.8571 391.37,69.8571 392.4,69.8571 393.43,69.8571 394.46,69.8571 395.49,69.8571 396.52,69.8571 397.55,69.8571 398.58,69.8571 399.61,69.8571 400.64,69.8571 401.67,69.8571 402.7,69.8571 403.73,69.8571 404.76,69.8571 405.79,69.8571 406.82,69.8571 407.85,69.8571 408.88,69.8571 409.91,69.8571 410.94,69.8571 411.97,69.8571 413,69.8571 413,179.5 414.03,179.5 415.06,179.5 416.09,179.5 417.12,179.5 418.15,179.5 419.18,179.5 420.21,179.5 421.24,179.5 422.27,179.5 423.3,179.5 424.33,179.5 425.36,179.5 426.39,179.5 427.42,179.5 428.45,179.5 429.48,179.5 430.51,179.5 431.54,179.5 432.57,179.5 433.6,179.5 434.63,179.5 435.66,179.5 436.69,179.5 437.72,179.5 438.75,179.5 439.78,179.5 440.81,179.5 441.84,179.5 442.87,179.5 443.9,179.5 444.93,179.5 445.96,179.5 446.99,179.5 448.02,179.5 449.05,179.5 450.08,179.5 451.11,179.5 452.14,179.5 453.17,179.5 454.2,179.5 455.23,179.5 456.26,179.5 457.29,179.5 458.32,179.5 459.35,179.5 460.38,179.5 461.41,179.5 462.44,179.5 463.47,179.5 464.5,179.5 465.53,179.5 466.56,179.5 467.59,179.5 468.62,179.5 469.65,179.5 470.68,179.5 471.71,179.5 472.74,179.5 473.77,179.5 474.8,179.5 475.83,179.5 476.86,179.5 477.89,179.5 478.92,179.5 479.95,179.5 480.98,179.5 482.01,179.5 483.04,179.5 484.07,179.5 485.1,179.5 486.13,179.5 487.16,179.5 488.19,179.5 489.22,179.5 490.25,179.5 491.28,179.5 492.31,179.5 493.34,179.5 494.37,179.5 495.4,179.5 496.43,179.5 497.46,179.5 498.49,179.5 499.52,179.5 500.55,179.5 501.58,179.5 502.61,179.5 503.64,179.5 504.67,179.5 505.7,179.5 506.73,179.5 507.76,179.5 508.79,179.5 509.82,179.5 510.85,179.5 511.88,179.5 512.91,179.5 513.94,179.5 514.97,179.5 516,179.5 517.03,179.5 518.06,179.5 519.09,179.5 520.12,179.5 521.15,179.5 522.18,179.5 523.21,179.5 524.24,179.5 525.27,179.5 526.3,179.5 527.33,179.5 528.36,179.5 529.39,179.5 530.42,179.5 531.45,179.5 532.48,179.5 533.51,179.5 534.54,179.5 535.57,179.5 536.6,179.5 537.63,179.5 538.66,179.5 539.69,179.5 540.72,179.5 541.75,179.5 542.78,179.5 543.81,179.5 544.84,179.5 545.87,179.5 546.9,179.5 547.93,179.5 548.96,179.5 549.99,179.5 551.02,179.5 552.05,179.5 553.08,179.5 554.11,179.5 555.14,179.5 556.17,179.5 557.2,179.5 558.23,179.5 559.26,179.5 560.29,179.5 561.32,179.5 562.35,179.5 563.38,179.5 564.41,179.5 565.44,179.5 566.47,179.5 567.5,179.5 568.53,179.5 569.56,179.5 570.59,179.5 571.62,179.5 572.65,179.5 573.68,179.5 574.71,179.5 575.74,179.5 576.77,179.5 577.8,179.5 578.83,179.5 579.86,179.5 580.89,179.5 581.92,179.5 582.95,179.5 583.98,179.5 585.01,179.5 586.04,179.5 587.07,179.5 588.1,179.5 589.13,179.5 590.16,179.5 591.19,179.5 592.22,179.5 593.25,179.5 594.28,179.5 595.31,179.5 596.34,179.5 597.37,179.5 598.4,179.5 599.43,179.5 600.46,179.5 601.49,179.5 602.52,179.5 603.55,179.5 604.58,179.5 605.61,179.5 606.64,179.5 607.67,179.5 608.7,179.5 609.73,179.5 610.76,179.5 611.79,179.5 612.82,179.5 613.85,179.5 614.88,179.5 615.91,179.5 616.94,179.5 617.97,179.5 619,179.5 619,179.5"
+     id="polyline139" />
+  <text
+     fill="rgb(0,0,0)"
+     font-size="21"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="181.25"
+     y="265.021"
+     id="text141">y_start=0</text>
+  <text
+     fill="rgb(28,108,200)"
+     font-size="31"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="263.65"
+     y="168.536"
+     id="text143">y_actual</text>
+  <text
+     fill="rgb(238,46,47)"
+     font-size="37"
+     font-family="helvetica"
+     text-anchor="middle"
+     dominant-baseline="central"
+     x="214.725"
+     y="45.7355"
+     id="text145">y</text>
+</svg>
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
index d6ebf24d7d..3b160226f5 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_SimpleHouse.txt
@@ -1,4 +1,4 @@
-last-generated=2024-08-16
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "5",
@@ -8,12 +8,12 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "10",
+  "number of continuous time states": "9",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.1536e+07]
-zon.T=[2.931499938964844e+02, 2.938165893554688e+02, 2.948394775390625e+02, 2.951160888671875e+02, 2.933800964355469e+02, 2.949007263183594e+02, 2.937331848144531e+02, 2.949746704101562e+02, 2.94963623046875e+02, 2.944449768066406e+02, 2.949704284667969e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951320190429688e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.94181396484375e+02, 2.951331481933594e+02, 2.93716552734375e+02, 2.932184143066406e+02, 2.950964050292969e+02, 2.934932556152344e+02, 2.940997009277344e+02, 2.96098876953125e+02, 2.970375061035156e+02, 2.962566223144531e+02, 2.963293762207031e+02, 2.957511291503906e+02, 2.968561096191406e+02, 2.973106079101562e+02, 2.972330017089844e+02, 2.974053955078125e+02, 2.972986145019531e+02, 2.974791564941406e+02, 2.975252075195312e+02, 2.975371398925781e+02, 2.97523681640625e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974816284179688e+02, 2.975858459472656e+02, 2.975862426757812e+02, 2.97521728515625e+02, 2.975988159179688e+02, 2.974871520996094e+02, 2.975801086425781e+02, 2.97568115234375e+02, 2.975059204101562e+02, 2.975872802734375e+02, 2.97644775390625e+02, 2.975877075195312e+02, 2.975962524414062e+02, 2.976087341308594e+02, 2.975819396972656e+02, 2.975243835449219e+02, 2.975371398925781e+02, 2.974706420898438e+02, 2.975225830078125e+02, 2.975242614746094e+02, 2.97474609375e+02, 2.974830017089844e+02, 2.974789428710938e+02, 2.974937438964844e+02, 2.974887390136719e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668029785156e+02, 2.966719360351562e+02, 2.971568603515625e+02, 2.972576599121094e+02, 2.966737670898438e+02, 2.959289245605469e+02, 2.957213745117188e+02, 2.9481201171875e+02, 2.944169616699219e+02, 2.947103271484375e+02, 2.939195556640625e+02, 2.940602722167969e+02, 2.940169677734375e+02, 2.937295227050781e+02, 2.931671142578125e+02, 2.933880310058594e+02, 2.950133056640625e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122131347656e+02, 2.931902465820312e+02, 2.951495361328125e+02, 2.950298767089844e+02, 2.942200012207031e+02, 2.936318054199219e+02, 2.943542785644531e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932530822753906e+02]
+zon.T=[2.931499938964844e+02, 2.9383740234375e+02, 2.948395385742188e+02, 2.951160888671875e+02, 2.933800354003906e+02, 2.948947448730469e+02, 2.937331237792969e+02, 2.949746704101562e+02, 2.949635620117188e+02, 2.944471130371094e+02, 2.949724426269531e+02, 2.932081604003906e+02, 2.945489196777344e+02, 2.949959106445312e+02, 2.950682983398438e+02, 2.951318969726562e+02, 2.94079345703125e+02, 2.940500793457031e+02, 2.93251708984375e+02, 2.933990783691406e+02, 2.932026672363281e+02, 2.936112365722656e+02, 2.941801452636719e+02, 2.951361694335938e+02, 2.93716552734375e+02, 2.932197570800781e+02, 2.950960388183594e+02, 2.934937744140625e+02, 2.94099609375e+02, 2.960980529785156e+02, 2.970367736816406e+02, 2.962557373046875e+02, 2.963287963867188e+02, 2.957503662109375e+02, 2.968569030761719e+02, 2.973105163574219e+02, 2.972327575683594e+02, 2.974053955078125e+02, 2.9729833984375e+02, 2.974791259765625e+02, 2.975252685546875e+02, 2.97537109375e+02, 2.975236511230469e+02, 2.975829772949219e+02, 2.975098876953125e+02, 2.974815979003906e+02, 2.975858764648438e+02, 2.97586181640625e+02, 2.975217590332031e+02, 2.97598876953125e+02, 2.974871215820312e+02, 2.975801391601562e+02, 2.975681762695312e+02, 2.975058288574219e+02, 2.975873107910156e+02, 2.976448059082031e+02, 2.975876770019531e+02, 2.975962524414062e+02, 2.976087036132812e+02, 2.975819396972656e+02, 2.975244140625e+02, 2.97537109375e+02, 2.974706420898438e+02, 2.975226135253906e+02, 2.975242004394531e+02, 2.974746398925781e+02, 2.974830322265625e+02, 2.974789123535156e+02, 2.974937744140625e+02, 2.974888000488281e+02, 2.974450988769531e+02, 2.974119873046875e+02, 2.970668334960938e+02, 2.966714172363281e+02, 2.971568908691406e+02, 2.972569580078125e+02, 2.96673095703125e+02, 2.959283447265625e+02, 2.957220764160156e+02, 2.948124389648438e+02, 2.944173583984375e+02, 2.947107238769531e+02, 2.939200744628906e+02, 2.940605773925781e+02, 2.940164184570312e+02, 2.937287902832031e+02, 2.931647033691406e+02, 2.933880004882812e+02, 2.950128784179688e+02, 2.940987243652344e+02, 2.951145935058594e+02, 2.951122436523438e+02, 2.931898193359375e+02, 2.951496887207031e+02, 2.950305480957031e+02, 2.942147827148438e+02, 2.936344299316406e+02, 2.943554077148438e+02, 2.931622009277344e+02, 2.951441650390625e+02, 2.932518920898438e+02]
 heaWat.u=[1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00]
-vavDam.y=[2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.554025948047638e-01, 2.5e-01, 3.29160213470459e-01, 3.752192556858063e-01, 3.871423006057739e-01, 3.736800849437714e-01, 4.329911172389984e-01, 3.599009811878204e-01, 3.316185176372528e-01, 4.358335733413696e-01, 4.362431168556213e-01, 3.717152774333954e-01, 4.48826789855957e-01, 3.371655642986298e-01, 4.301155805587769e-01, 4.181102514266968e-01, 3.559122383594513e-01, 4.37283456325531e-01, 4.947710633277893e-01, 4.377006590366364e-01, 4.462576806545258e-01, 4.58719402551651e-01, 4.31939035654068e-01, 3.743763864040375e-01, 3.871388733386993e-01, 3.206299543380737e-01, 3.725927770137787e-01, 3.742593824863434e-01, 3.246186673641205e-01, 3.33006888628006e-01, 3.289314806461334e-01, 3.437333405017853e-01, 3.387492895126343e-01, 2.950859367847443e-01, 2.619776129722595e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
-TFanIn.T=[2.883200073242188e+02, 2.90562744140625e+02, 2.883319396972656e+02, 2.920919799804688e+02, 2.906665649414062e+02, 2.918930969238281e+02, 2.898759155273438e+02, 2.901109619140625e+02, 2.89111572265625e+02, 2.908656616210938e+02, 2.898673706054688e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996948242188e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764465332031e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910815734863281e+02, 2.919293212890625e+02, 2.92504638671875e+02, 2.907031555175781e+02, 2.918236694335938e+02, 2.916273803710938e+02, 2.919345703125e+02, 2.964934997558594e+02, 2.946243896484375e+02, 2.942006225585938e+02, 2.941107788085938e+02, 2.946829528808594e+02, 2.956533813476562e+02, 2.953515014648438e+02, 2.958345642089844e+02, 2.946706848144531e+02, 2.963741760253906e+02, 2.969334106445312e+02, 2.952789306640625e+02, 2.982248229980469e+02, 2.966036376953125e+02, 2.979476318359375e+02, 2.962223205566406e+02, 2.965768737792969e+02, 2.962604675292969e+02, 2.985108032226562e+02, 2.948568725585938e+02, 2.9739111328125e+02, 2.97256591796875e+02, 2.973014831542969e+02, 2.968691101074219e+02, 2.978995361328125e+02, 2.976356811523438e+02, 2.979755554199219e+02, 2.981031188964844e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788024902344e+02, 2.957882080078125e+02, 2.974443054199219e+02, 2.967668151855469e+02, 2.963309020996094e+02, 2.979713745117188e+02, 2.966609191894531e+02, 2.968990478515625e+02, 2.969129638671875e+02, 2.965253295898438e+02, 2.967495727539062e+02, 2.962158203125e+02, 2.966826782226562e+02, 2.9535986328125e+02, 2.960602416992188e+02, 2.956841430664062e+02, 2.958915100097656e+02, 2.955003356933594e+02, 2.934600830078125e+02, 2.941224365234375e+02, 2.925818786621094e+02, 2.921419067382812e+02, 2.928599243164062e+02, 2.915148315429688e+02, 2.920691223144531e+02, 2.939436645507812e+02, 2.926375732421875e+02, 2.904195556640625e+02, 2.91980224609375e+02, 2.920718688964844e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900093688964844e+02, 2.924759521484375e+02, 2.906303100585938e+02, 2.909695129394531e+02, 2.895492553710938e+02, 2.903458862304688e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893901062011719e+02]
-TFanOut.T=[2.886552734375e+02, 2.908980102539062e+02, 2.886672058105469e+02, 2.924272155761719e+02, 2.910018310546875e+02, 2.922283630371094e+02, 2.90211181640625e+02, 2.904462280273438e+02, 2.894468383789062e+02, 2.91200927734375e+02, 2.9020263671875e+02, 2.902548522949219e+02, 2.91540283203125e+02, 2.918876342773438e+02, 2.90739013671875e+02, 2.923349609375e+02, 2.910082092285156e+02, 2.91268310546875e+02, 2.914117126464844e+02, 2.917941284179688e+02, 2.904400329589844e+02, 2.919727783203125e+02, 2.914168395996094e+02, 2.922645874023438e+02, 2.928399047851562e+02, 2.910384216308594e+02, 2.92158935546875e+02, 2.91962646484375e+02, 2.922698364257812e+02, 2.968287353515625e+02, 2.949596252441406e+02, 2.94535888671875e+02, 2.944460144042969e+02, 2.950182189941406e+02, 2.959886474609375e+02, 2.95686767578125e+02, 2.961697998046875e+02, 2.950059509277344e+02, 2.967094421386719e+02, 2.972686767578125e+02, 2.956141967773438e+02, 2.9856005859375e+02, 2.969389038085938e+02, 2.982828979492188e+02, 2.965575866699219e+02, 2.969121398925781e+02, 2.965957336425781e+02, 2.988460693359375e+02, 2.95192138671875e+02, 2.977263793945312e+02, 2.975918579101562e+02, 2.976367492675781e+02, 2.972043762207031e+02, 2.982347717285156e+02, 2.97970947265625e+02, 2.983108215332031e+02, 2.984383850097656e+02, 2.970995788574219e+02, 2.983284301757812e+02, 2.980140686035156e+02, 2.961234741210938e+02, 2.977795715332031e+02, 2.971020812988281e+02, 2.966661682128906e+02, 2.98306640625e+02, 2.969961853027344e+02, 2.972343139648438e+02, 2.972482299804688e+02, 2.968605651855469e+02, 2.970848388671875e+02, 2.965510864257812e+02, 2.970179443359375e+02, 2.956951293945312e+02, 2.963955078125e+02, 2.960194091796875e+02, 2.962267761230469e+02, 2.958355712890625e+02, 2.937953491210938e+02, 2.944577026367188e+02, 2.929171447753906e+02, 2.924771728515625e+02, 2.931951904296875e+02, 2.918500671386719e+02, 2.924043884277344e+02, 2.942789306640625e+02, 2.929728393554688e+02, 2.907548217773438e+02, 2.923154907226562e+02, 2.924071350097656e+02, 2.908653869628906e+02, 2.910751647949219e+02, 2.904555358886719e+02, 2.903446350097656e+02, 2.928112182617188e+02, 2.90965576171875e+02, 2.913047790527344e+02, 2.89884521484375e+02, 2.906811218261719e+02, 2.900224914550781e+02, 2.9145458984375e+02, 2.897253723144531e+02]
+vavDam.y=[2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.553925514221191e-01, 2.5e-01, 3.291155099868774e-01, 3.752652704715729e-01, 3.871184885501862e-01, 3.736608326435089e-01, 4.329791069030762e-01, 3.59874039888382e-01, 3.31609845161438e-01, 4.358777403831482e-01, 4.361938238143921e-01, 3.717730045318604e-01, 4.48868453502655e-01, 3.371348083019257e-01, 4.301444888114929e-01, 4.181613922119141e-01, 3.558394908905029e-01, 4.373158812522888e-01, 4.947918057441711e-01, 4.376653432846069e-01, 4.46266770362854e-01, 4.587029218673706e-01, 4.31944727897644e-01, 3.744049966335297e-01, 3.871162235736847e-01, 3.206354081630707e-01, 3.726148009300232e-01, 3.741947710514069e-01, 3.246372044086456e-01, 3.330214023590088e-01, 3.289011120796204e-01, 3.43769371509552e-01, 3.387857675552368e-01, 2.951039671897888e-01, 2.619933485984802e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
+TFanIn.T=[2.883200073242188e+02, 2.905804138183594e+02, 2.883320007324219e+02, 2.920919799804688e+02, 2.906665344238281e+02, 2.918880310058594e+02, 2.898758544921875e+02, 2.901109924316406e+02, 2.891115417480469e+02, 2.908674926757812e+02, 2.898690795898438e+02, 2.899195861816406e+02, 2.912050170898438e+02, 2.915523681640625e+02, 2.904037475585938e+02, 2.919996032714844e+02, 2.906729431152344e+02, 2.909330749511719e+02, 2.910764770507812e+02, 2.914588623046875e+02, 2.901047668457031e+02, 2.916375122070312e+02, 2.910805053710938e+02, 2.91931884765625e+02, 2.92504638671875e+02, 2.907042846679688e+02, 2.918233642578125e+02, 2.916278381347656e+02, 2.919345092773438e+02, 2.964927978515625e+02, 2.946237487792969e+02, 2.941998901367188e+02, 2.941102600097656e+02, 2.946823120117188e+02, 2.95654052734375e+02, 2.953514404296875e+02, 2.958343505859375e+02, 2.946706848144531e+02, 2.963739624023438e+02, 2.969333801269531e+02, 2.952789611816406e+02, 2.982247924804688e+02, 2.966036071777344e+02, 2.979476318359375e+02, 2.962222900390625e+02, 2.965768737792969e+02, 2.96260498046875e+02, 2.985107727050781e+02, 2.9485693359375e+02, 2.973911437988281e+02, 2.972565612792969e+02, 2.97301513671875e+02, 2.96869140625e+02, 2.978994750976562e+02, 2.976357116699219e+02, 2.979755859375e+02, 2.981030883789062e+02, 2.967643127441406e+02, 2.979931640625e+02, 2.976788330078125e+02, 2.957882385253906e+02, 2.974442749023438e+02, 2.967668151855469e+02, 2.963309326171875e+02, 2.979713134765625e+02, 2.966609497070312e+02, 2.968990783691406e+02, 2.969129333496094e+02, 2.965253601074219e+02, 2.967496032714844e+02, 2.962158508300781e+02, 2.966827087402344e+02, 2.9535986328125e+02, 2.96059814453125e+02, 2.956841735839844e+02, 2.958908996582031e+02, 2.95499755859375e+02, 2.934595947265625e+02, 2.94123046875e+02, 2.925822143554688e+02, 2.921422424316406e+02, 2.928602600097656e+02, 2.915152587890625e+02, 2.920693969726562e+02, 2.939432067871094e+02, 2.92636962890625e+02, 2.904175109863281e+02, 2.919801940917969e+02, 2.920715026855469e+02, 2.905301208496094e+02, 2.907398986816406e+02, 2.901202697753906e+02, 2.900090026855469e+02, 2.9247607421875e+02, 2.906308898925781e+02, 2.90965087890625e+02, 2.895514831542969e+02, 2.903468322753906e+02, 2.896872253417969e+02, 2.911193237304688e+02, 2.893890991210938e+02]
+TFanOut.T=[2.886552734375e+02, 2.909156799316406e+02, 2.886672668457031e+02, 2.924272155761719e+02, 2.910017700195312e+02, 2.922232971191406e+02, 2.902111206054688e+02, 2.904462280273438e+02, 2.894468078613281e+02, 2.912027587890625e+02, 2.90204345703125e+02, 2.902548522949219e+02, 2.91540283203125e+02, 2.918876342773438e+02, 2.90739013671875e+02, 2.923348693847656e+02, 2.910082092285156e+02, 2.912683410644531e+02, 2.914117126464844e+02, 2.917941284179688e+02, 2.904400329589844e+02, 2.919727783203125e+02, 2.91415771484375e+02, 2.922671508789062e+02, 2.928399047851562e+02, 2.9103955078125e+02, 2.921586303710938e+02, 2.919631042480469e+02, 2.922697448730469e+02, 2.968280334472656e+02, 2.949590148925781e+02, 2.9453515625e+02, 2.944455261230469e+02, 2.95017578125e+02, 2.959893188476562e+02, 2.956867065429688e+02, 2.961695861816406e+02, 2.950059509277344e+02, 2.96709228515625e+02, 2.972686462402344e+02, 2.956142272949219e+02, 2.9856005859375e+02, 2.969388732910156e+02, 2.982828979492188e+02, 2.965575561523438e+02, 2.969121398925781e+02, 2.965957641601562e+02, 2.988460388183594e+02, 2.951921691894531e+02, 2.977264099121094e+02, 2.975918273925781e+02, 2.976367797851562e+02, 2.972044067382812e+02, 2.982347106933594e+02, 2.979709777832031e+02, 2.983108215332031e+02, 2.984383544921875e+02, 2.970995788574219e+02, 2.983284301757812e+02, 2.980140686035156e+02, 2.961235046386719e+02, 2.97779541015625e+02, 2.971020812988281e+02, 2.966661987304688e+02, 2.983065795898438e+02, 2.969962158203125e+02, 2.972343444824219e+02, 2.972481994628906e+02, 2.96860595703125e+02, 2.970848693847656e+02, 2.965510864257812e+02, 2.970179443359375e+02, 2.956951293945312e+02, 2.963950805664062e+02, 2.960194396972656e+02, 2.962261657714844e+02, 2.958350219726562e+02, 2.937948608398438e+02, 2.944583129882812e+02, 2.9291748046875e+02, 2.924775085449219e+02, 2.931955261230469e+02, 2.918505249023438e+02, 2.924046630859375e+02, 2.942784729003906e+02, 2.929722290039062e+02, 2.907527770996094e+02, 2.923154602050781e+02, 2.9240673828125e+02, 2.908653869628906e+02, 2.910751647949219e+02, 2.904555358886719e+02, 2.903442687988281e+02, 2.928113098144531e+02, 2.909661560058594e+02, 2.913003234863281e+02, 2.898867492675781e+02, 2.906820983886719e+02, 2.900224914550781e+02, 2.9145458984375e+02, 2.89724365234375e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
index 9e24bb0edd..f8535954b9 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Examples_Tutorial_SimpleHouse_SimpleHouse6.txt
@@ -1,4 +1,4 @@
-last-generated=2024-08-16
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "5, 1, 1, 1",
@@ -8,12 +8,12 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0",
   "nonlinear": "1, 0, 1, 1, 1",
-  "number of continuous time states": "11",
+  "number of continuous time states": "10",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+06]
-zon.T=[2.931499938964844e+02, 2.945089721679688e+02, 2.9591064453125e+02, 2.966475830078125e+02, 2.943829650878906e+02, 2.942815856933594e+02, 2.942722473144531e+02, 2.942023620605469e+02, 2.961566772460938e+02, 2.945024719238281e+02, 2.941602478027344e+02, 2.941692504882812e+02, 2.941706237792969e+02, 2.941706237792969e+02, 2.941705322265625e+02, 2.941653137207031e+02, 2.941563415527344e+02, 2.941509399414062e+02, 2.944056091308594e+02, 2.951830139160156e+02, 2.965977478027344e+02, 2.966069641113281e+02, 2.957481384277344e+02, 2.950252685546875e+02, 2.945764465332031e+02, 2.943215942382812e+02, 2.94180419921875e+02, 2.960561218261719e+02, 2.962270202636719e+02, 2.950879821777344e+02, 2.945108642578125e+02, 2.942588195800781e+02, 2.941806640625e+02, 2.967988891601562e+02, 2.956056823730469e+02, 2.946774291992188e+02, 2.942577514648438e+02, 2.965518188476562e+02, 2.942180786132812e+02, 2.950231323242188e+02, 2.957951049804688e+02, 2.958897399902344e+02, 2.958036499023438e+02, 2.957058715820312e+02, 2.956015014648438e+02, 2.954901733398438e+02, 2.953814697265625e+02, 2.957745666503906e+02, 2.95923095703125e+02, 2.958970642089844e+02, 2.958109741210938e+02, 2.956842041015625e+02, 2.955548400878906e+02, 2.954227905273438e+02, 2.952863159179688e+02, 2.953405151367188e+02, 2.961509399414062e+02, 2.970860900878906e+02, 2.97620849609375e+02, 2.975162048339844e+02, 2.973799743652344e+02, 2.972396850585938e+02, 2.970963439941406e+02, 2.969541625976562e+02, 2.972663269042969e+02, 2.979443969726562e+02, 2.965866088867188e+02, 2.96625244140625e+02, 2.964942932128906e+02, 2.963471069335938e+02, 2.961507568359375e+02, 2.980345153808594e+02, 2.979453735351562e+02, 2.980507507324219e+02, 2.969282836914062e+02, 2.971327209472656e+02, 2.969210510253906e+02, 2.968065490722656e+02, 2.96587646484375e+02, 2.964854736328125e+02, 2.962903747558594e+02, 2.978039855957031e+02, 2.971773071289062e+02, 2.978541259765625e+02, 2.979232788085938e+02, 2.975360717773438e+02, 2.973730163574219e+02, 2.972575073242188e+02, 2.971753234863281e+02, 2.969627380371094e+02, 2.969119262695312e+02, 2.973591003417969e+02, 2.980840148925781e+02, 2.980621337890625e+02, 2.980009155273438e+02, 2.977578735351562e+02, 2.976857604980469e+02, 2.976209411621094e+02, 2.974058227539062e+02, 2.974420471191406e+02, 2.973437805175781e+02]
+zon.T=[2.931499938964844e+02, 2.945090026855469e+02, 2.959108581542969e+02, 2.966476135253906e+02, 2.943829650878906e+02, 2.942815246582031e+02, 2.942724914550781e+02, 2.942021789550781e+02, 2.961366882324219e+02, 2.945393371582031e+02, 2.941596374511719e+02, 2.941684265136719e+02, 2.941696472167969e+02, 2.941696166992188e+02, 2.9416943359375e+02, 2.941641845703125e+02, 2.941553039550781e+02, 2.941555786132812e+02, 2.944465942382812e+02, 2.952511901855469e+02, 2.966298522949219e+02, 2.965905151367188e+02, 2.957311096191406e+02, 2.950147705078125e+02, 2.9457080078125e+02, 2.943186950683594e+02, 2.941789245605469e+02, 2.961163330078125e+02, 2.962093200683594e+02, 2.950775451660156e+02, 2.945061950683594e+02, 2.942567138671875e+02, 2.941923828125e+02, 2.967965698242188e+02, 2.955920104980469e+02, 2.946714172363281e+02, 2.942554626464844e+02, 2.965770263671875e+02, 2.942177734375e+02, 2.950230407714844e+02, 2.957950134277344e+02, 2.958896789550781e+02, 2.958044128417969e+02, 2.957069091796875e+02, 2.956026000976562e+02, 2.954913330078125e+02, 2.953826293945312e+02, 2.9577490234375e+02, 2.959232482910156e+02, 2.958971252441406e+02, 2.958112182617188e+02, 2.956844482421875e+02, 2.955550537109375e+02, 2.954230346679688e+02, 2.952865600585938e+02, 2.95341064453125e+02, 2.96151611328125e+02, 2.970870361328125e+02, 2.976220397949219e+02, 2.975180358886719e+02, 2.973818359375e+02, 2.972415771484375e+02, 2.970982666015625e+02, 2.969556579589844e+02, 2.972679443359375e+02, 2.979459228515625e+02, 2.965885620117188e+02, 2.966267700195312e+02, 2.964958190917969e+02, 2.963484802246094e+02, 2.961521301269531e+02, 2.980340881347656e+02, 2.979454650878906e+02, 2.980510559082031e+02, 2.969294738769531e+02, 2.971329956054688e+02, 2.969214172363281e+02, 2.968072204589844e+02, 2.965882568359375e+02, 2.96486083984375e+02, 2.96291015625e+02, 2.978044738769531e+02, 2.971791687011719e+02, 2.978549194335938e+02, 2.979240417480469e+02, 2.975370178222656e+02, 2.973739013671875e+02, 2.972583312988281e+02, 2.971762084960938e+02, 2.969635620117188e+02, 2.969129638671875e+02, 2.9735986328125e+02, 2.980846252441406e+02, 2.980627746582031e+02, 2.9800146484375e+02, 2.977584533691406e+02, 2.976864318847656e+02, 2.9762158203125e+02, 2.974065856933594e+02, 2.974427795410156e+02, 2.973444519042969e+02]
 heaWat.u=[1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 vavDam.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-TFanIn.T=[2.770499877929688e+02, 2.782184753417969e+02, 2.792303161621094e+02, 2.800377807617188e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831611022949219e+02, 2.827702941894531e+02, 2.840594787597656e+02, 2.818762512207031e+02, 2.821614685058594e+02, 2.832578735351562e+02, 2.837603149414062e+02, 2.845103149414062e+02, 2.833526916503906e+02, 2.834750061035156e+02, 2.843358459472656e+02, 2.836504821777344e+02, 2.837778015136719e+02, 2.837387390136719e+02, 2.832012329101562e+02, 2.827556457519531e+02, 2.83049072265625e+02, 2.826876220703125e+02, 2.824632263183594e+02, 2.823358154296875e+02, 2.822652282714844e+02, 2.832030639648438e+02, 2.830385131835938e+02, 2.828839111328125e+02, 2.830750427246094e+02, 2.833869934082031e+02, 2.823385314941406e+02, 2.824124450683594e+02, 2.816333923339844e+02, 2.803589172363281e+02, 2.792538757324219e+02, 2.773312072753906e+02, 2.773298950195312e+02, 2.803699035644531e+02, 2.825979919433594e+02, 2.820531921386719e+02, 2.807601623535156e+02, 2.797334899902344e+02, 2.787341613769531e+02, 2.773700866699219e+02, 2.767789916992188e+02, 2.781178283691406e+02, 2.787908020019531e+02, 2.783647155761719e+02, 2.759573669433594e+02, 2.75166748046875e+02, 2.749096069335938e+02, 2.742197265625e+02, 2.731181640625e+02, 2.747654418945312e+02, 2.774588317871094e+02, 2.78646728515625e+02, 2.772778015136719e+02, 2.762153015136719e+02, 2.754963684082031e+02, 2.746448364257812e+02, 2.745353088378906e+02, 2.742020874023438e+02, 2.777449340820312e+02, 2.799328002929688e+02, 2.916777954101562e+02, 2.916039428710938e+02, 2.916503295898438e+02, 2.915558776855469e+02, 2.914031677246094e+02, 2.814422607421875e+02, 2.816476745605469e+02, 2.84058349609375e+02, 2.935667114257812e+02, 2.937242126464844e+02, 2.933616638183594e+02, 2.9326806640625e+02, 2.92906982421875e+02, 2.929345703125e+02, 2.92521240234375e+02, 2.84927001953125e+02, 2.93811767578125e+02, 2.944094848632812e+02, 2.93957275390625e+02, 2.931138610839844e+02, 2.929995727539062e+02, 2.930938720703125e+02, 2.931195983886719e+02, 2.927978820800781e+02, 2.930176391601562e+02, 2.939828796386719e+02, 2.949122619628906e+02, 2.946842346191406e+02, 2.94760498046875e+02, 2.942406311035156e+02, 2.944235534667969e+02, 2.943671875e+02, 2.939551086425781e+02, 2.942182312011719e+02, 2.94204833984375e+02]
-TFanOut.T=[2.770499877929688e+02, 2.782184753417969e+02, 2.792303161621094e+02, 2.800377807617188e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831611022949219e+02, 2.827702941894531e+02, 2.840594787597656e+02, 2.818762512207031e+02, 2.821614685058594e+02, 2.832578735351562e+02, 2.837603149414062e+02, 2.845103149414062e+02, 2.833526916503906e+02, 2.834750061035156e+02, 2.843358459472656e+02, 2.836504821777344e+02, 2.837778015136719e+02, 2.837387390136719e+02, 2.832012329101562e+02, 2.827556457519531e+02, 2.83049072265625e+02, 2.826876220703125e+02, 2.824632263183594e+02, 2.823358154296875e+02, 2.822652282714844e+02, 2.832030639648438e+02, 2.830385131835938e+02, 2.828839111328125e+02, 2.830750427246094e+02, 2.833869934082031e+02, 2.823385314941406e+02, 2.824124450683594e+02, 2.816333923339844e+02, 2.803589172363281e+02, 2.792538757324219e+02, 2.773312072753906e+02, 2.773298950195312e+02, 2.803699035644531e+02, 2.825979919433594e+02, 2.820531921386719e+02, 2.807601623535156e+02, 2.797334899902344e+02, 2.787341613769531e+02, 2.773700866699219e+02, 2.767789916992188e+02, 2.781178283691406e+02, 2.787908020019531e+02, 2.783647155761719e+02, 2.759573669433594e+02, 2.75166748046875e+02, 2.749096069335938e+02, 2.742197265625e+02, 2.731181640625e+02, 2.747654418945312e+02, 2.774588317871094e+02, 2.78646728515625e+02, 2.772778015136719e+02, 2.762153015136719e+02, 2.754963684082031e+02, 2.746448364257812e+02, 2.745353088378906e+02, 2.742020874023438e+02, 2.777449340820312e+02, 2.799328002929688e+02, 2.920173645019531e+02, 2.919435424804688e+02, 2.919898986816406e+02, 2.918954772949219e+02, 2.917427368164062e+02, 2.814422607421875e+02, 2.816476745605469e+02, 2.84058349609375e+02, 2.939062805175781e+02, 2.940637817382812e+02, 2.937012329101562e+02, 2.936076354980469e+02, 2.9324658203125e+02, 2.93274169921875e+02, 2.9286083984375e+02, 2.84927001953125e+02, 2.941513366699219e+02, 2.947490539550781e+02, 2.942968444824219e+02, 2.934534301757812e+02, 2.933391418457031e+02, 2.934334411621094e+02, 2.934591674804688e+02, 2.93137451171875e+02, 2.933572082519531e+02, 2.943224792480469e+02, 2.952518310546875e+02, 2.950238037109375e+02, 2.9510009765625e+02, 2.945802001953125e+02, 2.947631530761719e+02, 2.947067565917969e+02, 2.94294677734375e+02, 2.945578308105469e+02, 2.945444030761719e+02]
+TFanIn.T=[2.770499877929688e+02, 2.78218505859375e+02, 2.792304077148438e+02, 2.800378112792969e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831612548828125e+02, 2.827702026367188e+02, 2.840494995117188e+02, 2.818946533203125e+02, 2.821611633300781e+02, 2.832574462890625e+02, 2.837598266601562e+02, 2.845097961425781e+02, 2.833521423339844e+02, 2.834744567871094e+02, 2.843353271484375e+02, 2.836528015136719e+02, 2.837983093261719e+02, 2.837727966308594e+02, 2.8321728515625e+02, 2.827474365234375e+02, 2.830405578613281e+02, 2.82682373046875e+02, 2.824603881835938e+02, 2.823343505859375e+02, 2.822644653320312e+02, 2.83233154296875e+02, 2.830296630859375e+02, 2.828786926269531e+02, 2.830727233886719e+02, 2.833859252929688e+02, 2.823443908691406e+02, 2.824112854003906e+02, 2.816265563964844e+02, 2.803559265136719e+02, 2.792527160644531e+02, 2.773438110351562e+02, 2.773297424316406e+02, 2.803698425292969e+02, 2.825979309082031e+02, 2.820531616210938e+02, 2.807605285644531e+02, 2.797340087890625e+02, 2.787347106933594e+02, 2.773706665039062e+02, 2.76779541015625e+02, 2.781180114746094e+02, 2.787908630371094e+02, 2.7836474609375e+02, 2.759574584960938e+02, 2.751668701171875e+02, 2.749096984863281e+02, 2.742198486328125e+02, 2.731182861328125e+02, 2.747657470703125e+02, 2.774591674804688e+02, 2.786471862792969e+02, 2.772784118652344e+02, 2.762162170410156e+02, 2.754972839355469e+02, 2.746457824707031e+02, 2.745362854003906e+02, 2.742028198242188e+02, 2.777457580566406e+02, 2.799335632324219e+02, 2.91679443359375e+02, 2.916052551269531e+02, 2.91651611328125e+02, 2.915570373535156e+02, 2.914043273925781e+02, 2.814420471191406e+02, 2.816477355957031e+02, 2.840585021972656e+02, 2.935677185058594e+02, 2.937244567871094e+02, 2.933619689941406e+02, 2.932686462402344e+02, 2.929075317382812e+02, 2.929350891113281e+02, 2.925217895507812e+02, 2.8492724609375e+02, 2.938133239746094e+02, 2.9441015625e+02, 2.939579467773438e+02, 2.931146545410156e+02, 2.930003051757812e+02, 2.930945739746094e+02, 2.931203308105469e+02, 2.927986145019531e+02, 2.930185241699219e+02, 2.939835510253906e+02, 2.949127807617188e+02, 2.946847839355469e+02, 2.94760986328125e+02, 2.942411193847656e+02, 2.944241333007812e+02, 2.943677062988281e+02, 2.939557495117188e+02, 2.942188415527344e+02, 2.942054138183594e+02]
+TFanOut.T=[2.770499877929688e+02, 2.78218505859375e+02, 2.792304077148438e+02, 2.800378112792969e+02, 2.813609313964844e+02, 2.831529541015625e+02, 2.831612548828125e+02, 2.827702026367188e+02, 2.840494995117188e+02, 2.818946533203125e+02, 2.821611633300781e+02, 2.832574462890625e+02, 2.837598266601562e+02, 2.845097961425781e+02, 2.833521423339844e+02, 2.834744567871094e+02, 2.843353271484375e+02, 2.836528015136719e+02, 2.837983093261719e+02, 2.837727966308594e+02, 2.8321728515625e+02, 2.827474365234375e+02, 2.830405578613281e+02, 2.82682373046875e+02, 2.824603881835938e+02, 2.823343505859375e+02, 2.822644653320312e+02, 2.83233154296875e+02, 2.830296630859375e+02, 2.828786926269531e+02, 2.830727233886719e+02, 2.833859252929688e+02, 2.823443908691406e+02, 2.824112854003906e+02, 2.816265563964844e+02, 2.803559265136719e+02, 2.792527160644531e+02, 2.773438110351562e+02, 2.773297424316406e+02, 2.803698425292969e+02, 2.825979309082031e+02, 2.820531616210938e+02, 2.807605285644531e+02, 2.797340087890625e+02, 2.787347106933594e+02, 2.773706665039062e+02, 2.76779541015625e+02, 2.781180114746094e+02, 2.787908630371094e+02, 2.7836474609375e+02, 2.759574584960938e+02, 2.751668701171875e+02, 2.749096984863281e+02, 2.742198486328125e+02, 2.731182861328125e+02, 2.747657470703125e+02, 2.774591674804688e+02, 2.786471862792969e+02, 2.772784118652344e+02, 2.762162170410156e+02, 2.754972839355469e+02, 2.746457824707031e+02, 2.745362854003906e+02, 2.742028198242188e+02, 2.777457580566406e+02, 2.799335632324219e+02, 2.920190124511719e+02, 2.919448547363281e+02, 2.919912109375e+02, 2.918966369628906e+02, 2.91743896484375e+02, 2.814420471191406e+02, 2.816477355957031e+02, 2.840585021972656e+02, 2.939072875976562e+02, 2.940640258789062e+02, 2.937015380859375e+02, 2.936082153320312e+02, 2.932471008300781e+02, 2.93274658203125e+02, 2.928613586425781e+02, 2.8492724609375e+02, 2.941529235839844e+02, 2.947497253417969e+02, 2.942975158691406e+02, 2.934542236328125e+02, 2.933398742675781e+02, 2.934341430664062e+02, 2.934599304199219e+02, 2.9313818359375e+02, 2.933580932617188e+02, 2.943231201171875e+02, 2.952523498535156e+02, 2.950243835449219e+02, 2.951005554199219e+02, 2.945806884765625e+02, 2.947637023925781e+02, 2.94707275390625e+02, 2.942953491210938e+02, 2.945584411621094e+02, 2.945449829101562e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
index 4709ef1878..de76cb6586 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_MixingBox.txt
@@ -1,12 +1,12 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "2",
+  "number of continuous time states": "1",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 2.4e+02]
-mixBox.damOA.m_flow=[4.082483053207397e-01, 3.696834170139743e-01, 2.938377922707618e-01, 1.953646459062304e-01, 1.09041023765295e-01, 6.167414039373398e-02, 3.722175694656505e-02, 2.410912037127299e-02, 1.666897724455199e-02, 1.158944401249707e-02, 8.291748352348804e-03, 6.223875311835456e-03, 4.641559263420082e-03, 2.637361072073257e-03, 1.234091452458272e-03, 5.26286952663213e-04, 2.187833037761185e-04, 9.259343557175558e-05, 4.094635761945294e-05, 1.921394234569782e-05, 9.63495494943345e-06, 5.171852794499868e-06, 2.967318769641812e-06, 1.813348318288214e-06, 1.174917254889492e-06, 8.030286267057818e-07, 1.898798647302421e-06, 2.333787689786465e-05, 4.095623919024506e-04, 3.306325216842226e-03, 6.927305366843939e-03, 1.163727608212196e-02, 1.968681682638102e-02, 3.305764883300711e-02, 5.443867557601653e-02, 8.690176159143448e-02, 1.32635635434681e-01, 1.900493924774843e-01, 2.502414399256135e-01, 3.008954817603772e-01, 3.464572727680206e-01, 3.90022459447379e-01, 4.304826061385316e-01, 4.671707887191192e-01, 4.99818493266804e-01, 5.284626483917236e-01, 5.533405393283887e-01, 5.747996908068648e-01, 5.932310437047689e-01, 6.090249510606446e-01, 6.225466728210449e-01, 6.341242721101055e-01, 6.44044804643355e-01, 6.525557735897936e-01, 6.598678056339913e-01, 6.661596894264221e-01, 6.715819365707369e-01, 6.762617174340707e-01, 6.803066181565065e-01, 6.838071262308203e-01, 6.868403553962708e-01, 6.894713701625237e-01, 6.917557688932962e-01, 6.937407874407708e-01, 6.954668122773646e-01, 6.969685554504395e-01, 6.982756883677118e-01, 6.994139538432167e-01, 7.00405479637473e-01, 7.012693861207047e-01, 7.020221948623657e-01, 7.026782647229035e-01, 7.032500498569273e-01, 7.037484055625455e-01, 7.041825641678706e-01, 7.045609354972839e-01, 7.048906691629605e-01, 7.051778432254772e-01, 7.054282429759674e-01, 7.056462163456488e-01, 7.05836296081543e-01, 7.060017589627238e-01, 7.061458824333219e-01, 7.062714101350607e-01, 7.063806650392871e-01, 7.064757347106934e-01, 7.065584661509048e-01, 7.066304086774827e-01, 7.066929937136599e-01, 7.067473529465769e-01, 7.067946791648865e-01, 7.068358064660342e-01, 7.068715691138243e-01, 7.069026232129548e-01, 7.069296836201238e-01, 7.069531083106995e-01, 7.0697349314696e-01, 7.069911360532234e-01, 7.070064544855845e-01, 7.07019686667082e-01, 7.0703125e-01]
-mixBox.damExh.m_flow=[4.082483053207397e-01, 3.31985506871662e-01, 2.328850717785657e-01, 1.215030706163871e-01, 5.679997037782256e-02, 2.82274316996336e-02, 1.529461202529541e-02, 9.006084486153611e-03, 5.711705303975978e-03, 4.482403044711292e-03, 3.8699503056705e-03, 3.402593017416759e-03, 2.908796242514134e-03, 1.86374969193e-03, 9.708199546649307e-04, 4.561154346447438e-04, 2.071148447385069e-04, 9.259343557175558e-05, 4.094635761945294e-05, 1.921394234569782e-05, 9.63495494943345e-06, 5.171852794499868e-06, 2.967318769641812e-06, 1.813348318288214e-06, 1.174917254889492e-06, 8.030286267057818e-07, 1.898798647302421e-06, 2.333787689786465e-05, 4.095623919024506e-04, 3.306325216842226e-03, 6.927305366843939e-03, 1.163727608212196e-02, 1.968681682638102e-02, 3.305764883300711e-02, 5.443867557601653e-02, 8.690176159143448e-02, 1.32635635434681e-01, 1.900493924774843e-01, 2.502414399256135e-01, 3.008954817603772e-01, 3.464572727680206e-01, 3.90022459447379e-01, 4.304826061385316e-01, 4.671707887191192e-01, 4.99818493266804e-01, 5.284626483917236e-01, 5.533405393283887e-01, 5.747996908068648e-01, 5.932310437047689e-01, 6.090249510606446e-01, 6.225466728210449e-01, 6.341242721101055e-01, 6.44044804643355e-01, 6.525557735897936e-01, 6.598678056339913e-01, 6.661596894264221e-01, 6.715819365707369e-01, 6.762617174340707e-01, 6.803066181565065e-01, 6.838071262308203e-01, 6.868403553962708e-01, 6.894713701625237e-01, 6.917557688932962e-01, 6.937407874407708e-01, 6.954668122773646e-01, 6.969685554504395e-01, 6.982756883677118e-01, 6.994139538432167e-01, 7.00405479637473e-01, 7.012693861207047e-01, 7.020221948623657e-01, 7.026782647229035e-01, 7.032500498569273e-01, 7.037484055625455e-01, 7.041825641678706e-01, 7.045609354972839e-01, 7.048906691629605e-01, 7.051778432254772e-01, 7.054282429759674e-01, 7.056462163456488e-01, 7.05836296081543e-01, 7.060017589627238e-01, 7.061458824333219e-01, 7.062714101350607e-01, 7.063806650392871e-01, 7.064757347106934e-01, 7.065584661509048e-01, 7.066304086774827e-01, 7.066929937136599e-01, 7.067473529465769e-01, 7.067946791648865e-01, 7.068358064660342e-01, 7.068715691138243e-01, 7.069026232129548e-01, 7.069296836201238e-01, 7.069531083106995e-01, 7.0697349314696e-01, 7.069911360532234e-01, 7.070064544855845e-01, 7.07019686667082e-01, 7.0703125e-01]
-mixBox.damRec.m_flow=[4.687499810529516e-08, 2.734546447273023e-03, 1.15784583209468e-02, 3.409176984885041e-02, 8.465033474082763e-02, 1.739961206912994e-01, 2.772684533506339e-01, 3.623661965712153e-01, 4.457449950738265e-01, 5.241986988556731e-01, 5.957407355308533e-01, 6.598634814900867e-01, 7.169646789922562e-01, 7.678287470875388e-01, 8.133456978416685e-01, 8.543623685836792e-01, 8.916171560878264e-01, 9.196159884379204e-01, 9.326601586164014e-01, 9.434248270013038e-01, 9.523463249206543e-01, 9.597715691590568e-01, 9.659740942540052e-01, 9.711723908292796e-01, 9.755413557283168e-01, 9.792221784591675e-01, 9.706975332843493e-01, 9.407647140789871e-01, 8.903066312884957e-01, 8.194043707696016e-01, 7.302325367927551e-01, 6.287198730582965e-01, 5.238320956836111e-01, 4.246803537107068e-01, 3.380604497868919e-01, 2.670271992683411e-01, 1.958259188825242e-01, 1.359322145688537e-01, 9.358972570356705e-02, 6.533053616218858e-02, 4.664341732859612e-02, 3.416386175278092e-02, 2.568431562958946e-02, 1.980650567551547e-02, 1.564792514080053e-02, 1.264639478176832e-02, 1.037198543503879e-02, 7.358728801532737e-03, 4.439111054030983e-03, 2.410544308140341e-03, 1.231509493663907e-03, 6.120880746241475e-04, 3.034120871316695e-04, 1.527122893474363e-04, 7.902283709514948e-05, 4.238670953782275e-05, 2.368513482148216e-05, 1.382251012681051e-05, 8.430711871214007e-06, 5.37094620578205e-06, 3.568425654520979e-06, 2.467266033425282e-06, 1.770829441021609e-06, 1.315773377868861e-06, 1.00930445354638e-06, 7.970735964590858e-07, 6.463168615233643e-07, 5.367283598207263e-07, 4.553858997415889e-07, 3.938709178622601e-07, 3.465648319433967e-07, 3.096402605792577e-07, 2.804381492345346e-07, 2.570671450388978e-07, 2.381765413422629e-07, 2.227606188398568e-07, 2.100799602365542e-07, 1.995773554876465e-07, 1.908178617318188e-07, 1.834787784667319e-07, 1.772944386857489e-07, 1.720656421367116e-07, 1.676270126710793e-07, 1.638478251631363e-07, 1.606225416363272e-07, 1.578627291110024e-07, 1.554981084588849e-07, 1.534669020628838e-07, 1.517211935800901e-07, 1.502177618329823e-07, 1.489213588001803e-07, 1.478030329856191e-07, 1.468366702036012e-07, 1.460018372027485e-07, 1.452796869030167e-07, 1.446551891604031e-07, 1.441147917285147e-07, 1.43647569066275e-07, 1.432443208241401e-07, 1.428957582850501e-07, 1.42593208352082e-07]
+mixBox.damOA.m_flow=[4.082483053207397e-01, 4.454278336281534e-01, 4.756961740834717e-01, 5.000264661357031e-01, 5.190282437039598e-01, 5.331141352653503e-01, 5.425906192184005e-01, 5.477123864853083e-01, 5.4871743936034e-01, 5.318516532111573e-01, 5.066548585891724e-01, 4.807801205013039e-01, 4.544356381004651e-01, 4.278430129328996e-01, 4.01229185881831e-01, 3.748179376125336e-01, 3.488219544292207e-01, 3.23436162887657e-01, 2.988324540470423e-01, 2.741837336838382e-01, 2.473476380109787e-01, 2.191182108574089e-01, 1.910427572774497e-01, 1.644436500936291e-01, 1.401583706104329e-01, 1.185758486390114e-01, 1.401583706104329e-01, 1.644436097285294e-01, 1.910428011509759e-01, 2.191182108574088e-01, 2.473476380109787e-01, 2.741837336838384e-01, 2.988324156278723e-01, 3.234362027307464e-01, 3.488219544292208e-01, 3.748179376125336e-01, 4.01229185881831e-01, 4.278429705887467e-01, 4.544356802045508e-01, 4.80780141256311e-01, 5.066548585891724e-01, 5.318516334668446e-01, 5.561833077178873e-01, 5.794898559330359e-01, 6.016417877922128e-01, 6.225432157516479e-01, 6.421308992371919e-01, 6.60373128794017e-01, 6.77266260580011e-01, 6.928306912000253e-01, 7.069335579872131e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01]
+mixBox.damExh.m_flow=[4.082483053207397e-01, 4.000059965664241e-01, 3.910198517076158e-01, 3.812665931209078e-01, 3.707344549249504e-01, 3.594254851341248e-01, 3.473580459740685e-01, 3.345685857296449e-01, 3.211126073061774e-01, 3.307187824197673e-01, 3.461111485958099e-01, 3.554739663881283e-01, 3.597416286626076e-01, 3.596596723120421e-01, 3.558671437820513e-01, 3.489364981651306e-01, 3.393925792980694e-01, 3.23436162887657e-01, 2.988324540470423e-01, 2.741837336838382e-01, 2.473476380109787e-01, 2.191182108574089e-01, 1.910427572774497e-01, 1.644436500936291e-01, 1.401583706104329e-01, 1.185758486390114e-01, 1.401583706104329e-01, 1.644436097285294e-01, 1.910428011509759e-01, 2.191182108574088e-01, 2.473476380109787e-01, 2.741837336838384e-01, 2.988324156278723e-01, 3.234362027307464e-01, 3.488219544292208e-01, 3.748179376125336e-01, 4.01229185881831e-01, 4.278429705887467e-01, 4.544356802045508e-01, 4.80780141256311e-01, 5.066548585891724e-01, 5.318516334668446e-01, 5.561833077178873e-01, 5.794898559330359e-01, 6.016417877922128e-01, 6.225432157516479e-01, 6.421308992371919e-01, 6.60373128794017e-01, 6.77266260580011e-01, 6.928306912000253e-01, 7.069335579872131e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01, 7.071067690849304e-01]
+mixBox.damRec.m_flow=[4.687499810529516e-08, 5.634683052747534e-07, 5.066187665337511e-06, 3.414302608787851e-05, 1.727481364672174e-04, 6.569329998455942e-04, 1.879329033053117e-03, 4.047394149208643e-03, 6.567098850952482e-03, 8.547129713904868e-03, 1.091585773974657e-02, 1.389764676103522e-02, 1.764323698506353e-02, 2.233815589023022e-02, 2.820954338620854e-02, 3.553326055407524e-02, 4.464048634731105e-02, 5.519597190103515e-02, 6.636046237930879e-02, 7.964365373217776e-02, 9.535260498523712e-02, 1.137716794818306e-01, 1.351056172431625e-01, 1.593863585243695e-01, 1.863368780356393e-01, 2.152060866355896e-01, 1.863368780356393e-01, 1.593863996197116e-01, 1.351055812522109e-01, 1.137716794818306e-01, 9.535260498523712e-02, 7.964365373217772e-02, 6.636048193239101e-02, 5.519595584906663e-02, 4.585202623440833e-02, 3.805530071258545e-02, 3.156351680991942e-02, 2.616655904092419e-02, 2.168472533678317e-02, 1.796584551592471e-02, 1.488183345645666e-02, 1.232540571743726e-02, 1.005037833865237e-02, 6.598603447664888e-03, 3.27784425449561e-03, 1.231746398843825e-03, 3.501655024512492e-04, 7.531566878993883e-05, 1.225688169980255e-05, 1.5092885682611e-06, 1.451763154136643e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406253460348107e-07, 1.406250333975429e-07, 1.406252891911208e-07, 1.406252465578339e-07, 1.406250333956456e-07, 1.406250902392452e-07, 1.406251044500095e-07, 1.406250760283001e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406250049740265e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07, 1.406249907631718e-07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
index e34c9369e7..f0bee09571 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Dampers_Examples_VAVBoxExponential.txt
@@ -1,4 +1,4 @@
-last-generated=2021-06-17
+last-generated=2024-08-26
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,12 +8,12 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 0",
-  "number of continuous time states": "4",
+  "number of continuous time states": "2",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 2.4e+02]
-dam.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.737259431473062e-01, -3.737259431473062e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.967951452690591e+00, -1.879301210315676e+00, -1.741086750071444e+00, -1.560992232939402e+00, -1.352083683013916e+00, -1.132674237158968e+00, -9.217709507203622e-01, -7.336880183134643e-01, -5.759789668563472e-01, -4.507051706314087e-01, -3.501051357126311e-01, -2.685334441965567e-01, -2.029281281226012e-01, -1.515931657944556e-01, -1.129078343510628e-01, -8.469105587398409e-02, -6.44747912941786e-02, -5.003519721276513e-02, -3.964932465437468e-02, -3.208564221858978e-02, -2.63832265185107e-02, -1.888687819861831e-02, -1.145439737800964e-02, -6.235633881712747e-03, -3.187894588336349e-03, -1.583801529179733e-03, -7.842448458710465e-04, -3.941492222769715e-04, -2.036216695984447e-04, -1.090337391360663e-04, -6.082295497557724e-05, -3.543746360225672e-05, -2.158061076995955e-05, -1.372834181335048e-05, -9.108892299991567e-06, -6.290471991311104e-06, -4.510040592178743e-06, -3.347932972948661e-06, -2.566017081802397e-06, -2.02498472390289e-06, -1.640948990076237e-06, -1.36195464511856e-06, -1.15499574968678e-06, -9.985552802635825e-07, -8.783056841821235e-07, -7.844776842655621e-07, -7.102904937829821e-07, -6.509369447523564e-07, -6.029545132231364e-07, -5.638096922666591e-07, -5.316128247586956e-07, -5.049456350080632e-07, -4.827181529522442e-07, -4.640926236121292e-07, -4.484101339130575e-07, -4.351517170202344e-07, -4.239028746473909e-07, -4.143284857914339e-07, -4.061583833235476e-07, -3.9916915284266e-07, -3.931789226328227e-07, -3.880353806487708e-07, -3.836126671585641e-07, -3.798060197518953e-07, -3.765266853861249e-07, -3.736966439407281e-07, -3.712584402464297e-07, -3.69152727264254e-07, -3.673300498504466e-07, -3.65758239695424e-07, -3.643966092586944e-07, -3.632155212967545e-07, -3.621942698283209e-07, -3.613076863461255e-07, -3.605385643368209e-07]
-vav.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.469959246805281e-01, -3.469959246805281e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.967951452690591e+00, -1.879301210315676e+00, -1.741086750071444e+00, -1.560992232939402e+00, -1.352083683013916e+00, -1.132674237158968e+00, -9.217709507203622e-01, -7.336880183134643e-01, -5.757455495883079e-01, -4.24614280462265e-01, -2.891636361350493e-01, -1.930794851346795e-01, -1.302965718998985e-01, -8.99325264254093e-02, -6.375726312398911e-02, -4.647427236782556e-02, -3.481578602942794e-02, -2.677487504892722e-02, -2.110695172786041e-02, -1.702781952917576e-02, -1.397454367154608e-02, -9.983797434503965e-03, -6.046428367772958e-03, -3.289529938860811e-03, -1.681343652307987e-03, -8.35252512541094e-04, -4.135761574238545e-04, -2.078543702676739e-04, -1.073791858786195e-04, -5.749842239310965e-05, -3.207465548338754e-05, -1.868774269587203e-05, -1.138040703902593e-05, -7.239558002944322e-06, -4.803518550033914e-06, -3.317241760628682e-06, -2.378342144857107e-06, -1.765511757852976e-06, -1.353173147753041e-06, -1.067863081516407e-06, -8.653442237396849e-07, -7.182182969760326e-07, -6.090798449406845e-07, -5.265818745303372e-07, -4.631690160294966e-07, -4.136894111394996e-07, -3.745672528028576e-07, -3.43267537674987e-07, -3.179642954146285e-07, -2.973215202928259e-07, -2.803427220947124e-07, -2.662799426967354e-07, -2.545584018589812e-07, -2.447363504780445e-07, -2.364662776699333e-07, -2.294745352749692e-07, -2.235425355491069e-07, -2.18493533876384e-07, -2.141850888415957e-07, -2.104993512830333e-07, -2.073404414870245e-07, -2.046280404245229e-07, -2.022957489971542e-07, -2.002883311725261e-07, -1.985589932473886e-07, -1.970665942409732e-07, -1.957808295339276e-07, -1.946703905126231e-07, -1.937092003137687e-07, -1.928803214923391e-07, -1.921622737477056e-07, -1.915394428303175e-07, -1.910008926953888e-07, -1.905333573269478e-07, -1.901277641991328e-07]
-dam.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 1.813970218697891e-01, -1.813970218697891e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -5.158958735649039e+00, -5.585283575533193e+00, -6.210771511398931e+00, -6.954129232157869e+00, -7.714837074279785e+00, -8.396311358321713e+00, -8.937922821724007e+00, -9.32712689170604e+00, -9.58495628430299e+00, -9.721491813659668e+00, -9.797881085646605e+00, -9.85036748752262e+00, -9.889124911585e+00, -9.918073669469367e+00, -9.939343452453613e+00, -9.954648009425059e+00, -9.965532290845136e+00, -9.973277099995604e+00, -9.978835108797265e+00, -9.982877731323242e+00, -9.985923765216297e+00, -9.989925379028175e+00, -9.993890766530937e+00, -9.996674538950165e+00, -9.998299598693848e+00, -9.999155044149425e+00, -9.999581336580986e+00, -9.999790191814098e+00, -9.999891280933909e+00, -9.999941825866699e+00, -9.999967575121747e+00, -9.999980926501545e+00, -9.999988555914266e+00, -9.999992370605469e+00, -9.999995231628418e+00, -9.999996185314862e+00, -9.999997138977051e+00, -9.999998092651367e+00, -9.999999046313556e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -9.999999046325684e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
+dam.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.737259431473062e-01, -3.737259431473062e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.940327802385007e+00, -1.877216301851485e+00, -1.810849937488456e+00, -1.741487696316894e+00, -1.669460654258728e+00, -1.59516899591484e+00, -1.519072868599096e+00, -1.441680570688212e+00, -1.363534996762882e+00, -1.285195112228394e+00, -1.20721965007635e+00, -1.13015017710609e+00, -1.054495478188737e+00, -9.807194010648457e-01, -9.092302918434143e-01, -8.403752876781353e-01, -7.74436794554004e-01, -7.116323531794735e-01, -6.521177522387518e-01, -5.961551666259766e-01, -5.442848525899567e-01, -4.959328176771942e-01, -4.507053537392651e-01, -4.082805850557367e-01, -3.68388831615448e-01, -3.308238620263711e-01, -2.954461417514227e-01, -2.62182850674568e-01, -2.310259814885074e-01, -2.020234912633896e-01, -1.752643983177587e-01, -1.508514136262613e-01, -1.288671530789572e-01, -1.093432033775919e-01, -9.223896265029907e-02, -7.744024244070019e-02, -6.477236766348606e-02, -5.402203533415594e-02, -4.496047184770324e-02, -3.73610258102417e-02, -3.101159117633216e-02, -2.532884379115844e-02, -1.666065250499786e-02, -8.284950544406948e-03, -3.114212537184358e-03, -8.853516794102495e-04, -1.904278395313183e-04, -3.099024349954586e-05, -3.816108880567362e-06, -3.671110846426018e-07, -3.555555565526447e-07, -3.555555849754383e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07, -3.555555565526447e-07]
+vav.m_flow=[2e+00, 1.918332580051682e+00, 1.833030230750684e+00, 1.743559591591018e+00, 1.649242297244033e+00, 1.549193382263184e+00, 1.442220550885698e+00, 1.326649865557142e+00, 1.200000089608263e+00, 1.058300518844233e+00, 8.944271802902222e-01, 6.928202725730367e-01, 3.469959246805281e-01, -3.469959246805281e-01, -6.928204528265858e-01, -8.944271802902222e-01, -1.058300397613417e+00, -1.20000008960843e+00, -1.326649865556988e+00, -1.442220638655692e+00, -1.549193382263184e+00, -1.649242219866947e+00, -1.743559627942459e+00, -1.833030195965281e+00, -1.918332629550918e+00, -2e+00, -1.940327802385007e+00, -1.877216301851485e+00, -1.810849937488456e+00, -1.741487696316894e+00, -1.669460654258728e+00, -1.59516899591484e+00, -1.519072868599096e+00, -1.441680570688212e+00, -1.363534996762882e+00, -1.285195112228394e+00, -1.20721965007635e+00, -1.13015017710609e+00, -1.054495478188737e+00, -9.807194010648457e-01, -9.092302918434143e-01, -8.403752876781353e-01, -7.74436794554004e-01, -7.116323531794735e-01, -6.521177522387518e-01, -5.961540937423706e-01, -5.418579334863312e-01, -4.84133795393221e-01, -4.246145331970435e-01, -3.667049947901371e-01, -3.129824101924896e-01, -2.648274295442596e-01, -2.226868628118333e-01, -1.864185063530396e-01, -1.555629509701821e-01, -1.295222043991089e-01, -1.076680221128231e-01, -8.939932209460046e-02, -7.416978981282542e-02, -6.149871283217863e-02, -5.097073316574097e-02, -4.223206518069301e-02, -3.498377014802656e-02, -2.897466223695344e-02, -2.399480025745184e-02, -1.986896432936192e-02, -1.64514031983811e-02, -1.34117806031774e-02, -8.802746728693326e-03, -4.371548553613623e-03, -1.642475486733019e-03, -4.668970769411342e-04, -1.004214301479531e-04, -1.634252348439065e-05, -2.012401503218905e-06, -1.935937348207517e-07, -1.874999924211807e-07, -1.875000208434322e-07, -1.875000066320354e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07, -1.874999924211807e-07]
+dam.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 1.813970218697891e-01, -1.813970218697891e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -5.29390983761167e+00, -5.595073790874238e+00, -5.90102807062339e+00, -6.209026055615286e+00, -6.516126155853271e+00, -6.819294738220807e+00, -7.115522012399071e+00, -7.401946423041047e+00, -7.675965477977451e+00, -7.935341835021973e+00, -8.178275911964331e+00, -8.403450688887578e+00, -8.610049496032017e+00, -8.797737233703755e+00, -8.966625213623047e+00, -9.117212204334798e+00, -9.250309783500811e+00, -9.366974013430946e+00, -9.468427717149291e+00, -9.555747032165527e+00, -9.626473386822582e+00, -9.679752289105757e+00, -9.721491860504381e+00, -9.755854626382504e+00, -9.785184860229492e+00, -9.810849174227272e+00, -9.833686800825381e+00, -9.854228997963046e+00, -9.872812225705102e+00, -9.889643669128418e+00, -9.9048452739775e+00, -9.918485624914414e+00, -9.930615439407248e+00, -9.941286061340463e+00, -9.950568199157715e+00, -9.958558101061076e+00, -9.965373031138904e+00, -9.971140868120283e+00, -9.975994098611672e+00, -9.980058670043945e+00, -9.983451850986183e+00, -9.986486430492086e+00, -9.991112715302789e+00, -9.995581616997013e+00, -9.99833869934082e+00, -9.999527932704916e+00, -9.999898910267801e+00, -9.999983787566938e+00, -9.99999809263924e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
 vav.dp=[1e+01, 9.199999841054241e+00, 8.399999682108877e+00, 7.599999841054344e+00, 6.800000317891186e+00, 6e+00, 5.199999682108814e+00, 4.399999841054533e+00, 3.600000158945088e+00, 2.80000007947305e+00, 2e+00, 1.199999920526951e+00, 3.999997516480644e-01, -3.999997516480644e-01, -1.200000556306355e+00, -2e+00, -2.799999443694024e+00, -3.6000001589461e+00, -4.399999841053521e+00, -5.200000317888913e+00, -6e+00, -6.799999682111087e+00, -7.600000158946476e+00, -8.399999364217123e+00, -9.200000317887394e+00, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01, -1e+01]
-res.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 2.18602729778299e-01, -2.18602729778299e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -4.841041264350961e+00, -4.414716424466807e+00, -3.789228727018132e+00, -3.045870767842131e+00, -2.285162925720215e+00, -1.603688641677151e+00, -1.062077178274478e+00, -6.728726314579386e-01, -4.150439243127925e-01, -2.785082757472992e-01, -2.021187802441293e-01, -1.49632363466431e-01, -1.108753342801329e-01, -8.192585369378265e-02, -6.06561042368412e-02, -4.535230349972855e-02, -3.446730682526448e-02, -2.672309744079058e-02, -2.116502345100947e-02, -1.712225563824177e-02, -1.407656167676241e-02, -1.007502143774344e-02, -6.109462570051787e-03, -3.325743938012489e-03, -1.700220163911581e-03, -8.446953712585376e-04, -4.182640613773681e-04, -2.102129428007991e-04, -1.085982237859112e-04, -5.815132681163959e-05, -3.243890762259059e-05, -1.889998070913236e-05, -1.150965980489981e-05, -7.32178233076661e-06, -4.858075953961816e-06, -3.354918455997746e-06, -2.405355058286169e-06, -1.78556429013485e-06, -1.368542481522883e-06, -1.079991761798738e-06, -8.75172787128445e-07, -7.263757842030661e-07, -6.159977445349182e-07, -5.325627706662759e-07, -4.684296754930983e-07, -4.183880869062104e-07, -3.788216137371864e-07, -3.471663705345901e-07, -3.215757290169408e-07, -3.006985025422182e-07, -2.83526862608696e-07, -2.693043538291157e-07, -2.57449685363947e-07, -2.475160507682962e-07, -2.391520581568329e-07, -2.320809053230364e-07, -2.260815321978848e-07, -2.209751895799271e-07, -2.166178025444568e-07, -2.128902139020283e-07, -2.096954216145627e-07, -2.069522115391123e-07, -2.045934168002076e-07, -2.025632048499059e-07, -2.008142274689817e-07, -1.9930487487368e-07, -1.980045014647264e-07, -1.968814573831245e-07, -1.95909353288506e-07, -1.9507105264438e-07, -1.943448478501668e-07, -1.937149399545966e-07, -1.931702791365096e-07, -1.926974289285531e-07, -1.922872314708002e-07]
+res.dp=[5e+00, 4.599999920527121e+00, 4.199999841054439e+00, 3.799999920527172e+00, 3.400000158945593e+00, 3e+00, 2.599999841054407e+00, 2.199999920527266e+00, 1.800000079472544e+00, 1.400000039736525e+00, 1e+00, 5.999999602634757e-01, 2.18602729778299e-01, -2.18602729778299e-01, -6.000002781531776e-01, -1e+00, -1.399999721847012e+00, -1.80000007947305e+00, -2.199999920526761e+00, -2.600000158944456e+00, -3e+00, -3.399999841055544e+00, -3.800000079473238e+00, -4.199999682108562e+00, -4.600000158943697e+00, -5e+00, -4.70609016238833e+00, -4.404926209125762e+00, -4.09897192937661e+00, -3.790974182802535e+00, -3.483873605728149e+00, -3.180705023362129e+00, -2.884477749183866e+00, -2.598053576957438e+00, -2.324034760441128e+00, -2.064658164978027e+00, -1.821724207244579e+00, -1.596549430322469e+00, -1.389950742387321e+00, -1.202263123923356e+00, -1.033374667167664e+00, -8.827882725017914e-01, -7.496903953116072e-01, -6.330258077547412e-01, -5.315719848290014e-01, -4.442529380321503e-01, -3.735267621895034e-01, -3.20247591687037e-01, -2.785084077159524e-01, -2.441454183193684e-01, -2.148154079914093e-01, -1.891511833993655e-01, -1.663134226891949e-01, -1.457710616418821e-01, -1.271878338976485e-01, -1.103562787175179e-01, -9.515509854158292e-02, -8.15142186257141e-02, -6.93846127461538e-02, -5.871430373249057e-02, -4.943190515041351e-02, -4.14417201306741e-02, -3.462714394912432e-02, -2.885917658241787e-02, -2.400622548240244e-02, -1.99415348470211e-02, -1.654846380179396e-02, -1.351358999426865e-02, -8.887067700163872e-03, -4.41881047538792e-03, -1.660922425799072e-03, -4.721877874199789e-04, -1.015615173270306e-04, -1.652812913883487e-05, -2.035258175741521e-06, -1.957925803708349e-07, -1.896296311088008e-07, -1.89629645320288e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07, -1.896296311088008e-07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
index e3d3f571b0..f11c2f3920 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_ThreeWayValveParameterization.txt
@@ -5,8 +5,8 @@ statistics-simulation=
   "nonlinear": " ", 
   "linear": " "
 }
-senM_flowCv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowKv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowOpPoi.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
-senM_flowAv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloCv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloKv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloOpPoi.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
+senMasFloAv.m_flow=[2.800002694129944e-01, 2.844979167173507e-01, 2.830516098830156e-01, 2.80597030952447e-01, 2.781562206954674e-01, 2.757297458067942e-01, 2.733181413766351e-01, 2.709220052477673e-01, 2.685419912868693e-01, 2.661787279926476e-01, 2.638328674940366e-01, 2.615050970127267e-01, 2.591961914099525e-01, 2.569068361391111e-01, 2.546378673470408e-01, 2.523900581831002e-01, 2.501642696098488e-01, 2.479613725293018e-01, 2.457822874803352e-01, 2.436279649402958e-01, 2.414993948096176e-01, 2.393975989259537e-01, 2.373236415318574e-01, 2.352786519665582e-01, 2.332637597342288e-01, 2.312801778316498e-01, 2.293291669551005e-01, 2.274120172416237e-01, 2.255300732693057e-01, 2.236847266246147e-01, 2.218774876494854e-01, 2.201098207834909e-01, 2.183833408109333e-01, 2.166996620092236e-01, 2.15060517771582e-01, 2.134676864360295e-01, 2.11922990477059e-01, 2.104283727283928e-01, 2.089858197400729e-01, 2.075974027801134e-01, 2.06265301292577e-01, 2.049917425260341e-01, 2.037790849296886e-01, 2.026297309089157e-01, 2.015462217228757e-01, 2.005311835137059e-01, 1.995873458865811e-01, 1.987175493450037e-01, 1.979247472634887e-01, 1.972120112704645e-01, 1.965825408697128e-01, 1.960396463971898e-01, 1.955867998175464e-01, 1.952275774199141e-01, 1.949657206531076e-01, 1.948051156033668e-01, 1.9474978745275e-01, 1.948039681590131e-01, 1.949719939632079e-01, 1.952584097278472e-01, 1.956679661035751e-01, 1.962055555486658e-01, 1.968762722133507e-01, 1.976854656432393e-01, 1.986386194831301e-01, 1.997415153867636e-01, 2.010000909458701e-01, 2.024205898266581e-01, 2.040094423357482e-01, 2.057733838253157e-01, 2.077194029789109e-01, 2.098547417570237e-01, 2.121869703641042e-01, 2.147239396652758e-01, 2.174738320474777e-01, 2.204451262950897e-01, 2.236466588674688e-01, 2.270876088641365e-01, 2.307775279577683e-01, 2.347263457792169e-01, 2.389444210192359e-01, 2.43442459794828e-01, 2.482316678539684e-01, 2.533236234072618e-01, 2.587304262190173e-01, 2.644646027848078e-01, 2.705392748632759e-01, 2.769679991848297e-01, 2.837649021263788e-01, 2.909446464767934e-01, 2.985225506390887e-01, 3.065144205633387e-01, 3.14936861946586e-01, 3.238070244408635e-01, 3.331427895124658e-01, 3.429626645073416e-01, 3.532860507261662e-01, 3.641328793208302e-01, 3.749553362921406e-01, 3.860508386946669e-01, 4.00000125169754e-01]
 time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
index 334f7f0138..0811364fea 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Actuators_Valves_Validation_TwoWayValveParameterization.txt
@@ -12,6 +12,6 @@ statistics-simulation=
 }
 valCv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
 valKv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
-valOPPoi.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
+valOpePoi.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
 valAv.m_flow=[2.81250009948053e-07, 2.795216518574881e-03, 8.039199925941291e-03, 1.203880020228311e-02, 1.603839954730285e-02, 2.003799907866179e-02, 2.403760009998698e-02, 2.803719963134501e-02, 3.203680065266978e-02, 3.603639683142591e-02, 4.003599971538872e-02, 4.40355988740679e-02, 4.803520175803737e-02, 5.203480091671655e-02, 5.603440082075632e-02, 6.003399699950579e-02, 6.403359913812133e-02, 6.803320276744142e-02, 7.203279894618089e-02, 7.603240108479865e-02, 8.003199726355811e-02, 8.403159940217365e-02, 8.803120303148929e-02, 9.203079921023322e-02, 9.603040134885985e-02, 1.000299975275993e-01, 1.04029607116771e-01, 1.080291973356589e-01, 1.1202879947429e-01, 1.160284016129122e-01, 1.200279918318089e-01, 1.240276014209717e-01, 1.280272035595984e-01, 1.320268012290313e-01, 1.360263959170774e-01, 1.400260055062846e-01, 1.440255882746629e-01, 1.480251978637635e-01, 1.520248074529353e-01, 1.560244021410168e-01, 1.600239998104497e-01, 1.640235944984958e-01, 1.68023204087703e-01, 1.720228017571359e-01, 1.76022396445182e-01, 1.800220060343892e-01, 1.840216037038221e-01, 1.880211983918682e-01, 1.920208079809955e-01, 1.960203907494182e-01, 2.000200003385544e-01, 2.040196099276337e-01, 2.08019204615694e-01, 2.120188142048444e-01, 2.160183850538001e-01, 2.200179946427906e-01, 2.240176042319126e-01, 2.280171989199302e-01, 2.320168085090806e-01, 2.360164031970698e-01, 2.400159889470268e-01, 2.440155985361772e-01, 2.480151932242019e-01, 2.520147879121556e-01, 2.560144124024672e-01, 2.600140070904564e-01, 2.64013577939643e-01, 2.680132024295638e-01, 2.720127971175531e-01, 2.760123918055706e-01, 2.800120162956762e-01, 2.84011610983843e-01, 2.880111818326388e-01, 2.920108063229504e-01, 2.960104010109396e-01, 3.000099956989288e-01, 3.04009590386918e-01, 3.080092148772297e-01, 3.120088095652189e-01, 3.160083804143344e-01, 3.200080049043262e-01, 3.24007599592287e-01, 3.280071942803046e-01, 3.320068187703675e-01, 3.360064134586054e-01, 3.400059843074013e-01, 3.440056087977129e-01, 3.480052034857021e-01, 3.520047981736912e-01, 3.560043928616805e-01, 3.600040173519921e-01, 3.640035882007879e-01, 3.680031828887771e-01, 3.720028073790887e-01, 3.760024020671063e-01, 3.800019967550671e-01, 3.840016212450589e-01, 3.880011920941744e-01, 3.920007867821637e-01, 3.96000381470295e-01, 4.000000059604645e-01]
 time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
index 9a2016312e..32be2b9435 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Basic.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-07
+last-generated=2024-09-10
 statistics-initialization=
 {
   "nonlinear": "0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
@@ -8,9 +8,9 @@ statistics-simulation=
 {
   "linear": "24",
   "nonlinear": "0, 0, 28, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "74",
+  "number of continuous time states": "42",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935721158981323e+00, 5.780122756958008e+00, 5.809436798095703e+00, 5.690345764160156e+00, 5.605271339416504e+00, 5.558052062988281e+00, 5.541194438934326e+00, 5.548244476318359e+00, 5.572593688964844e+00, 5.607280254364014e+00, 5.646525859832764e+00, 5.682021141052246e+00, 5.721714496612549e+00, 5.762363910675049e+00, 5.800236701965332e+00, 5.83419132232666e+00, 5.864240169525146e+00, 5.890645027160645e+00, 5.913696765899658e+00, 5.933664321899414e+00, 5.950789451599121e+00, 5.965281009674072e+00, 5.977311134338379e+00, 5.987007141113281e+00, 5.994472026824951e+00, 5.999792098999023e+00, 6.39022159576416e+00, 6.807061195373535e+00, 6.980993270874023e+00, 7.000591278076172e+00, 6.958049774169922e+00, 6.904640674591064e+00, 6.857918262481689e+00, 6.819075584411621e+00, 6.785079479217529e+00, 6.752769947052002e+00, 6.719420433044434e+00, 6.682559013366699e+00, 6.642751216888428e+00, 6.600095272064209e+00, 6.552642822265625e+00, 6.49930477142334e+00, 6.439417839050293e+00, 6.372363567352295e+00, 6.29749059677124e+00, 6.214093208312988e+00, 6.121403217315674e+00, 6.018584728240967e+00, 5.904737949371338e+00, 5.778937816619873e+00, 4.472180843353271e+00, 1.745591521263123e+00, 5.026280283927917e-01, 9.305516630411148e-02, 1.993046328425407e-02, 1.311412174254656e-02, 1.240587513893843e-02, 1.200379710644484e-02, 1.150235626846552e-02, 1.088702399283648e-02, 1.016877219080925e-02, 9.350220672786236e-03, 8.436619304120541e-03, 7.440093439072371e-03, 6.383233238011599e-03, 5.301308818161488e-03, 4.238933324813843e-03, 3.244264051318169e-03, 2.361989114433527e-03, 1.625006669200957e-03, 1.048622420057654e-03, 6.290209130384028e-04, 3.469457442406565e-04, 1.736424601403996e-04, 7.811999967088923e-05, 3.223259045626037e-05, 1.357683231617557e-05, 7.12389419277315e-06, 5.886284270673059e-06, 6.793243301217444e-06, 7.610740340169286e-06, 6.702958216919797e-06, 4.723371603176929e-06, 2.876939788620803e-06, 1.603460191290651e-06, 8.122611347971542e-07, 3.894814426530502e-07, 1.773387054981868e-07, 7.331462370530062e-08, 3.112046798037227e-08, 1.423268258804455e-08, 6.688190445913733e-09, 2.923839836910247e-09, 1.329296561713988e-09, 7.688559788832094e-10, 6.538088404006714e-10, 6.866132662430857e-10, 6.52207676754557e-10, 5.890742893477352e-10, 5.275556103079282e-10]
-pmpSouth.m_flow=[0e+00, 3.541323184967041e+00, 5.228497982025146e+00, 5.277813911437988e+00, 5.183869361877441e+00, 5.115024089813232e+00, 5.076919078826904e+00, 5.0638747215271e+00, 5.070727825164795e+00, 5.092049121856689e+00, 5.122063636779785e+00, 5.15537166595459e+00, 5.186358451843262e+00, 5.221086978912354e+00, 5.256357192993164e+00, 5.289224147796631e+00, 5.318794727325439e+00, 5.345073699951172e+00, 5.368262767791748e+00, 5.388588905334473e+00, 5.406262397766113e+00, 5.42147159576416e+00, 5.434380054473877e+00, 5.445122718811035e+00, 5.453798770904541e+00, 5.460489749908447e+00, 5.465264320373535e+00, 5.777579307556152e+00, 6.105596542358398e+00, 6.24370288848877e+00, 6.263340950012207e+00, 6.234074115753174e+00, 6.194782257080078e+00, 6.159246921539307e+00, 6.128785610198975e+00, 6.101337909698486e+00, 6.074644088745117e+00, 6.043713092803955e+00, 6.012757778167725e+00, 5.98094367980957e+00, 5.945643901824951e+00, 5.905778408050537e+00, 5.860933780670166e+00, 5.810727596282959e+00, 5.754723072052002e+00, 5.692437648773193e+00, 5.623334884643555e+00, 5.546815872192383e+00, 5.462217807769775e+00, 5.368808269500732e+00, 5.265809535980225e+00, 4.0853590965271e+00, 1.594761490821838e+00, 4.638026654720306e-01, 8.303549140691757e-02, 1.697771809995174e-02, 1.117946300655603e-02, 1.071055699139833e-02, 1.044397801160812e-02, 1.006438210606575e-02, 9.577836841344833e-03, 9.000186808407307e-03, 8.334606885910034e-03, 7.583522237837315e-03, 6.753468420356512e-03, 5.859044380486012e-03, 4.925967194139957e-03, 3.98994330316782e-03, 3.09327500872314e-03, 2.279448322951794e-03, 1.584914512932301e-03, 1.031585037708282e-03, 6.227989215403795e-04, 3.450339136179537e-04, 1.73160617123358e-04, 7.802214531693608e-05, 3.221590668545105e-05, 1.338161382591352e-05, 6.528952326334547e-06, 5.055713245383231e-06, 5.084275471745059e-06, 4.717684987554094e-06, 3.694132601594902e-06, 2.507298859200091e-06, 1.509369099039759e-06, 8.351217957169865e-07, 4.197808607386833e-07, 1.994652478742864e-07, 8.988923383412839e-08, 3.675518556178758e-08, 1.54307393529507e-08, 6.98376201313522e-09, 3.250934410559125e-09, 1.409550365316647e-09, 6.363986559954071e-10, 3.659768044173006e-10, 3.097563039400342e-10, 3.240638868362566e-10, 3.068825471519432e-10, 2.764914130981566e-10, 2.471216842270252e-10]
+pmpNorth.m_flow=[0e+00, 2.590249538421631e+00, 4.262870311737061e+00, 5.342912673950195e+00, 5.632701396942139e+00, 5.587465763092041e+00, 5.659871101379395e+00, 5.72075891494751e+00, 5.77045202255249e+00, 5.809041500091553e+00, 5.836326122283936e+00, 5.851733207702637e+00, 5.854201793670654e+00, 5.841949939727783e+00, 5.871561527252197e+00, 5.897579193115234e+00, 5.920300006866455e+00, 5.939990997314453e+00, 5.956876754760742e+00, 5.971152305603027e+00, 5.982978343963623e+00, 5.992483615875244e+00, 5.999772071838379e+00, 6.004926681518555e+00, 6.00800895690918e+00, 6.009047985076904e+00, 6.008043766021729e+00, 6.254583835601807e+00, 6.452489376068115e+00, 6.608295440673828e+00, 6.726650714874268e+00, 6.810895919799805e+00, 6.863189697265625e+00, 6.88466739654541e+00, 6.875686168670654e+00, 6.836347579956055e+00, 6.767463207244873e+00, 6.672103404998779e+00, 6.556652545928955e+00, 6.502885341644287e+00, 6.442150592803955e+00, 6.374245166778564e+00, 6.298480987548828e+00, 6.21410083770752e+00, 6.120287418365479e+00, 6.016170024871826e+00, 5.900822639465332e+00, 5.77329683303833e+00, 5.632644653320312e+00, 5.477948665618896e+00, 5.308369159698486e+00, 4.676821708679199e+00, 3.499765634536743e+00, 1.931761860847473e+00, 2.670318121090531e-03, 3.923899494111538e-03, 5.138687789440155e-03, 6.222850643098354e-03, 7.049929350614548e-03, 7.484263740479946e-03, 7.438621483743191e-03, 6.934305652976036e-03, 6.090645678341389e-03, 5.052099004387856e-03, 3.978175111114979e-03, 2.984269522130489e-03, 2.116366289556026e-03, 1.405934919603169e-03, 8.644828340038657e-04, 4.8353589954786e-04, 2.393960021436214e-04, 1.001821074169129e-04, 3.242614911869168e-05, 6.658349775534589e-06, 4.837495453102747e-07, 3.252411229226482e-09, 4.581450525620312e-07, 6.372310508595547e-06, 3.048385769943707e-05, 8.966114546637982e-05, 1.959576329682022e-04, 3.447227063588798e-04, 5.086141754873097e-04, 6.432319059967995e-04, 7.004695944488049e-04, 6.410443456843495e-04, 4.426890518516302e-04, 1.510438451077789e-04, 3.040060203574058e-09, 2.776960883466018e-10, 3.305936913111651e-10, 3.542172388737441e-10, 3.682064098065041e-10, 3.94887927912535e-10, 4.39077635361329e-10, 4.675734799342024e-10, 4.870174263871263e-10, 5.03946662178123e-10, 5.342175035671914e-10, 5.661335289453007e-10, 5.908845635005378e-10]
+pmpSouth.m_flow=[0e+00, 2.347795248031616e+00, 3.88747501373291e+00, 4.879833698272705e+00, 5.157901763916016e+00, 5.119084358215332e+00, 5.179433345794678e+00, 5.230185031890869e+00, 5.271530151367188e+00, 5.303447246551514e+00, 5.325657844543457e+00, 5.337550640106201e+00, 5.338079929351807e+00, 5.325552463531494e+00, 5.351479053497314e+00, 5.374359130859375e+00, 5.394422054290771e+00, 5.411873340606689e+00, 5.426887989044189e+00, 5.439618110656738e+00, 5.450190544128418e+00, 5.458705902099609e+00, 5.465245723724365e+00, 5.469877243041992e+00, 5.472648620605469e+00, 5.473583221435547e+00, 5.47268009185791e+00, 5.67002010345459e+00, 5.826502323150635e+00, 5.948439121246338e+00, 6.040303230285645e+00, 6.105294227600098e+00, 6.145499229431152e+00, 6.162050247192383e+00, 6.155321598052979e+00, 6.125333786010742e+00, 6.072505950927734e+00, 5.998912811279297e+00, 5.909227848052979e+00, 5.86393928527832e+00, 5.813002109527588e+00, 5.756283283233643e+00, 5.693256378173828e+00, 5.623339176177979e+00, 5.545895099639893e+00, 5.460233211517334e+00, 5.365599632263184e+00, 5.261194705963135e+00, 5.146178722381592e+00, 5.019684314727783e+00, 4.880834579467773e+00, 4.316765308380127e+00, 3.241622924804688e+00, 1.795577764511108e+00, 1.734344172291458e-03, 2.846687333658338e-03, 3.970941063016653e-03, 4.977670032531023e-03, 5.769306793808937e-03, 6.272046361118555e-03, 6.422411184757948e-03, 6.179784890264273e-03, 5.574416369199753e-03, 4.708272404968739e-03, 3.75688448548317e-03, 2.855347469449043e-03, 2.049527131021023e-03, 1.375691965222359e-03, 8.528282633051276e-04, 4.79840295156464e-04, 2.384822728345171e-04, 1.000213014776818e-04, 3.240926162106916e-05, 6.65763718643575e-06, 4.837458504880487e-07, 3.333850306930231e-09, 4.58141670378609e-07, 6.339274932543049e-06, 2.983450212923344e-05, 8.546034223400056e-05, 1.811458641896024e-04, 3.098493907600641e-04, 4.448223917279392e-04, 5.412112805061042e-04, 5.508115864358842e-04, 4.487854312174022e-04, 2.616095007397234e-04, 7.70578917581588e-05, 1.492759027499346e-09, 1.350387995868729e-10, 1.59421420509176e-10, 1.69607120015236e-10, 1.752775286023578e-10, 1.870865268260857e-10, 2.072174515310721e-10, 2.198776716255679e-10, 2.285714256755611e-10, 2.360445727767058e-10, 2.498171114417858e-10, 2.64392036042338e-10, 2.756520289803888e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
index 128b591868..c21d751fdf 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified1.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-07
+last-generated=2024-09-10
 statistics-initialization=
 {
   "nonlinear": "0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 1",
@@ -8,9 +8,9 @@ statistics-simulation=
 {
   "linear": "24",
   "nonlinear": "0, 0, 8, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "74",
+  "number of continuous time states": "42",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935720205307007e+00, 5.780131340026855e+00, 5.809503078460693e+00, 5.690250396728516e+00, 5.605262279510498e+00, 5.558030605316162e+00, 5.541187763214111e+00, 5.548300266265869e+00, 5.572461605072021e+00, 5.607500076293945e+00, 5.646414756774902e+00, 5.681690692901611e+00, 5.721940994262695e+00, 5.762431144714355e+00, 5.800228595733643e+00, 5.83420467376709e+00, 5.864235401153564e+00, 5.890646934509277e+00, 5.913703441619873e+00, 5.933663368225098e+00, 5.950779438018799e+00, 5.965263366699219e+00, 5.977286815643311e+00, 5.986987590789795e+00, 5.994468212127686e+00, 5.999800682067871e+00, 6.390216827392578e+00, 6.807077407836914e+00, 6.980998992919922e+00, 7.000597476959229e+00, 6.95802116394043e+00, 6.904683589935303e+00, 6.857903480529785e+00, 6.819111347198486e+00, 6.785022735595703e+00, 6.752801418304443e+00, 6.719433307647705e+00, 6.682432651519775e+00, 6.642780303955078e+00, 6.600094318389893e+00, 6.552649021148682e+00, 6.499344825744629e+00, 6.439442157745361e+00, 6.372350692749023e+00, 6.297479629516602e+00, 6.214098930358887e+00, 6.121409893035889e+00, 6.018579959869385e+00, 5.904726505279541e+00, 5.7789306640625e+00, 4.472224712371826e+00, 1.755342602729797e+00, 5.39014995098114e-01, 1.11283965408802e-01, 2.387861348688602e-02, 1.53359891846776e-02, 1.408833917230368e-02, 1.321159675717354e-02, 1.221115328371525e-02, 1.110390666872263e-02, 9.923330508172512e-03, 8.698300458490849e-03, 7.459643296897411e-03, 6.24126847833395e-03, 5.078600253909826e-03, 4.005849827080965e-03, 3.050920320674777e-03, 2.23625497892499e-03, 1.569877844303846e-03, 1.049153390340507e-03, 6.623261724598706e-04, 3.910203813575208e-04, 2.131668443325907e-04, 1.058066845871508e-04, 4.73896689072717e-05, 1.951838385139126e-05, 8.215666639443953e-06, 4.312578766985098e-06, 3.566993655113038e-06, 4.120653557038167e-06, 4.626340796676232e-06, 4.083266503585037e-06, 2.898298589570913e-06, 1.784034793672618e-06, 1.008363142318558e-06, 5.227458359513548e-07, 2.547332940139313e-07, 1.224310608449741e-07, 5.456963592109787e-08, 2.268033405528058e-08, 1.023137130573559e-08, 5.222131616022807e-09, 2.913391305980895e-09, 1.574983365948412e-09, 8.95525265054431e-10, 6.048697653859847e-10, 5.28947552425052e-10, 5.725110940879574e-10, 6.625732185128186e-10, 7.005693247741362e-10]
-pmpSouth.m_flow=[-0e+00, 3.541495084762573e+00, 5.228505611419678e+00, 5.277873992919922e+00, 5.183782577514648e+00, 5.115016460418701e+00, 5.076901435852051e+00, 5.063868999481201e+00, 5.070773601531982e+00, 5.091940879821777e+00, 5.122244358062744e+00, 5.155274868011475e+00, 5.186100006103516e+00, 5.221262454986572e+00, 5.256407737731934e+00, 5.289219856262207e+00, 5.318806171417236e+00, 5.34506893157959e+00, 5.368265628814697e+00, 5.38859748840332e+00, 5.40626335144043e+00, 5.421463012695312e+00, 5.434362888336182e+00, 5.445099830627441e+00, 5.453780651092529e+00, 5.46048641204834e+00, 5.465272426605225e+00, 5.777576446533203e+00, 6.105610370635986e+00, 6.24370813369751e+00, 6.263346672058105e+00, 6.234055042266846e+00, 6.194813251495361e+00, 6.159236431121826e+00, 6.128811836242676e+00, 6.101296424865723e+00, 6.074667453765869e+00, 6.043728828430176e+00, 6.012722015380859e+00, 5.980933666229248e+00, 5.945600509643555e+00, 5.90578556060791e+00, 5.860973358154297e+00, 5.810748100280762e+00, 5.75471305847168e+00, 5.69243049621582e+00, 5.623341083526611e+00, 5.546821594238281e+00, 5.462213516235352e+00, 5.368798732757568e+00, 5.265803813934326e+00, 4.085399150848389e+00, 1.604514598846436e+00, 4.962215721607208e-01, 9.849446266889572e-02, 2.030549384653568e-02, 1.303150039166212e-02, 1.214101724326611e-02, 1.150150876492262e-02, 1.072197034955025e-02, 9.834780357778072e-03, 8.873038925230503e-03, 7.859896868467331e-03, 6.818417925387621e-03, 5.774665623903275e-03, 4.75794356316328e-03, 3.799349302425981e-03, 2.927383640781045e-03, 2.168105216696858e-03, 1.535554183647037e-03, 1.033560023643076e-03, 6.560321780852973e-04, 3.888069768436253e-04, 2.125051687471569e-04, 1.056430846801959e-04, 4.73567888548132e-05, 1.951280137291178e-05, 8.098389116639737e-06, 3.952742645196849e-06, 3.0640005661553e-06, 3.084616082560387e-06, 2.869254331017146e-06, 2.252460717500071e-06, 1.541510528113577e-06, 9.392626338922128e-07, 5.281696076053777e-07, 2.724404453147145e-07, 1.319586857562172e-07, 6.295600485373143e-08, 2.781874108848115e-08, 1.145101613531097e-08, 5.113065082440471e-09, 2.5828199579081e-09, 1.426543216886955e-09, 7.640095778249645e-10, 4.307720291585326e-10, 2.888338179740657e-10, 2.510137098177267e-10, 2.702886525707271e-10, 3.114966895534366e-10, 3.282530913750747e-10]
+pmpNorth.m_flow=[0e+00, 2.592438697814941e+00, 4.262869834899902e+00, 5.342912673950195e+00, 5.632701396942139e+00, 5.587465763092041e+00, 5.659871101379395e+00, 5.72075891494751e+00, 5.77045202255249e+00, 5.809041976928711e+00, 5.836325645446777e+00, 5.851732730865479e+00, 5.854201793670654e+00, 5.841951370239258e+00, 5.871561527252197e+00, 5.897579193115234e+00, 5.920300006866455e+00, 5.939990520477295e+00, 5.956877708435059e+00, 5.971152782440186e+00, 5.982974052429199e+00, 5.992480278015137e+00, 5.999776363372803e+00, 6.004933834075928e+00, 6.008009433746338e+00, 6.009043216705322e+00, 6.00804328918457e+00, 6.254583835601807e+00, 6.452489376068115e+00, 6.608295440673828e+00, 6.726650714874268e+00, 6.81089448928833e+00, 6.863191604614258e+00, 6.884666919708252e+00, 6.875685214996338e+00, 6.836348056793213e+00, 6.767463207244873e+00, 6.672103404998779e+00, 6.556658267974854e+00, 6.502885341644287e+00, 6.442150592803955e+00, 6.374245166778564e+00, 6.29848051071167e+00, 6.214101314544678e+00, 6.120288372039795e+00, 6.016166210174561e+00, 5.900820255279541e+00, 5.773301124572754e+00, 5.632645606994629e+00, 5.477948665618896e+00, 5.30836820602417e+00, 4.676821708679199e+00, 3.499768018722534e+00, 1.937031030654907e+00, 3.022505668923259e-03, 4.296013154089451e-03, 5.423073656857014e-03, 6.308408454060555e-03, 6.838225293904543e-03, 6.916842423379421e-03, 6.525653414428234e-03, 5.761927925050259e-03, 4.793514031916857e-03, 3.773480653762817e-03, 2.83158803358674e-03, 2.035496756434441e-03, 1.392754726111889e-03, 8.993423543870449e-04, 5.414297338575125e-04, 2.984567254316062e-04, 1.46452643093653e-04, 6.096157812862657e-05, 1.965243063750677e-05, 4.01759507440147e-06, 2.925040405443724e-07, 2.434835666420554e-09, 2.77695676231815e-07, 3.862858648062684e-06, 1.849958061939105e-05, 5.454918937175535e-05, 1.198497557197697e-04, 2.12853541597724e-04, 3.187728871125728e-04, 4.118726938031614e-04, 4.6142702922225e-04, 4.374529235064983e-04, 3.149914555251598e-04, 1.126878923969343e-04, 2.292040557350106e-09, 2.246438868258593e-10, 2.811685051451462e-10, 3.550305882615845e-10, 3.787639923924502e-10, 4.264758268757163e-10, 4.718149204663291e-10, 5.14264075768267e-10, 5.716796480648156e-10, 6.259039397882304e-10, 5.727734952998276e-10, 5.939301828128407e-10, 6.150869258370051e-10]
+pmpSouth.m_flow=[-0e+00, 2.351373910903931e+00, 3.88750171661377e+00, 4.879833698272705e+00, 5.157902240753174e+00, 5.119084358215332e+00, 5.179433345794678e+00, 5.230185031890869e+00, 5.271529674530029e+00, 5.303447723388672e+00, 5.325657367706299e+00, 5.337550640106201e+00, 5.338080406188965e+00, 5.325553417205811e+00, 5.351479053497314e+00, 5.374359130859375e+00, 5.394422054290771e+00, 5.411872863769531e+00, 5.426888465881348e+00, 5.439618587493896e+00, 5.450186729431152e+00, 5.45870304107666e+00, 5.465250015258789e+00, 5.469883918762207e+00, 5.472649097442627e+00, 5.473579406738281e+00, 5.472679615020752e+00, 5.67002010345459e+00, 5.826502323150635e+00, 5.948439121246338e+00, 6.040303230285645e+00, 6.105293273925781e+00, 6.145501136779785e+00, 6.162049770355225e+00, 6.155320644378662e+00, 6.1253342628479e+00, 6.072505950927734e+00, 5.998912811279297e+00, 5.909233093261719e+00, 5.86393928527832e+00, 5.813002109527588e+00, 5.756283283233643e+00, 5.69325590133667e+00, 5.623339653015137e+00, 5.545895576477051e+00, 5.460229873657227e+00, 5.365597724914551e+00, 5.261198043823242e+00, 5.146179676055908e+00, 5.019683837890625e+00, 4.880833625793457e+00, 4.316765308380127e+00, 3.241775274276733e+00, 1.801160216331482e+00, 1.966893440112472e-03, 3.12857492826879e-03, 4.214509855955839e-03, 5.085049197077751e-03, 5.652873776853085e-03, 5.873109679669142e-03, 5.727865267544985e-03, 5.2348836325109e-03, 4.478642251342535e-03, 3.588870633393526e-03, 2.724419813603163e-03, 1.97866465896368e-03, 1.365582691505551e-03, 8.878277731128037e-04, 5.372070008888841e-04, 2.97163292998448e-04, 1.461396313970909e-04, 6.090719034546055e-05, 1.964676994248293e-05, 4.017358605779009e-06, 2.925015962773614e-07, 2.434835444375949e-09, 2.776945393634378e-07, 3.843011199933244e-06, 1.81096293090377e-05, 5.202932152315043e-05, 1.109645963879302e-04, 1.918880298035219e-04, 2.801771624945104e-04, 3.491804236546159e-04, 3.667172859422863e-04, 3.104934294242412e-04, 1.892241853056476e-04, 5.853310722159222e-05, 1.146267414320334e-09, 1.111675959619696e-10, 1.377247482725608e-10, 1.722587350538873e-10, 1.822122869254983e-10, 2.036478763400851e-10, 2.238867979897918e-10, 2.427645584557325e-10, 2.687319256011733e-10, 2.932311615744254e-10, 2.677601196321433e-10, 2.770524365480753e-10, 2.863447257084317e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
index a7dba7b920..36f95e3a83 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified2.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-07
+last-generated=2024-09-10
 statistics-initialization=
 {
   "nonlinear": "0, 0, 10, 0, 0, 1, 0, 1, 1, 1",
@@ -8,9 +8,9 @@ statistics-simulation=
 {
   "linear": "24",
   "nonlinear": "0, 0, 9, 0, 1, 0, 1, 1, 1",
-  "number of continuous time states": "74",
+  "number of continuous time states": "42",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.93571949005127e+00, 5.780115604400635e+00, 5.809210300445557e+00, 5.690201759338379e+00, 5.605241298675537e+00, 5.558027744293213e+00, 5.541175842285156e+00, 5.54830265045166e+00, 5.57248592376709e+00, 5.607398986816406e+00, 5.646416187286377e+00, 5.681888580322266e+00, 5.721855640411377e+00, 5.762374401092529e+00, 5.800230503082275e+00, 5.83418607711792e+00, 5.864240646362305e+00, 5.890644073486328e+00, 5.913690090179443e+00, 5.933657169342041e+00, 5.950785636901855e+00, 5.965280055999756e+00, 5.977309226989746e+00, 5.987007141113281e+00, 5.994473934173584e+00, 5.999794006347656e+00, 6.390220165252686e+00, 6.807062149047852e+00, 6.980987071990967e+00, 7.000590324401855e+00, 6.958017349243164e+00, 6.904678344726562e+00, 6.857886791229248e+00, 6.819098949432373e+00, 6.785050392150879e+00, 6.752820014953613e+00, 6.719401359558105e+00, 6.682451248168945e+00, 6.642799854278564e+00, 6.600092887878418e+00, 6.552661895751953e+00, 6.499347686767578e+00, 6.439425468444824e+00, 6.372344017028809e+00, 6.297487258911133e+00, 6.214098453521729e+00, 6.121405601501465e+00, 6.018575191497803e+00, 5.90472412109375e+00, 5.778931617736816e+00, 4.472222805023193e+00, 1.755463361740112e+00, 5.395880937576294e-01, 1.09684444963932e-01, 2.257945388555527e-02, 1.448084134608507e-02, 1.322131603956223e-02, 1.233124453574419e-02, 1.132991071790457e-02, 1.023784745484591e-02, 9.089759550988674e-03, 7.914525456726551e-03, 6.742418743669987e-03, 5.604695994406939e-03, 4.532838705927134e-03, 3.555032424628735e-03, 2.69545498304069e-03, 1.967899268493056e-03, 1.376690110191703e-03, 9.172662976197898e-04, 5.776020116172731e-04, 3.403942100703716e-04, 1.854875008575618e-04, 9.215110185323283e-05, 4.130013257963583e-05, 1.701393011899199e-05, 7.161823759815888e-06, 3.757482772925869e-06, 3.10621430799074e-06, 3.58738384420576e-06, 4.02615705752396e-06, 3.555885996320285e-06, 2.526190428397967e-06, 1.551727564219618e-06, 8.797944133220881e-07, 4.574573608806531e-07, 2.228771620593761e-07, 1.073457909228637e-07, 4.851700552421789e-08, 2.019245748385856e-08, 8.978012999705243e-09, 4.670060782530072e-09, 2.609069404968523e-09, 1.450638831279605e-09, 8.488720837362962e-10, 5.820522397392836e-10, 5.026441485256328e-10, 5.36366007164446e-10, 6.135089103409541e-10, 6.474835112513233e-10]
-pmpSouth.m_flow=[0e+00, 3.541494369506836e+00, 5.228491306304932e+00, 5.277607440948486e+00, 5.183737754821777e+00, 5.114996910095215e+00, 5.076898574829102e+00, 5.063859462738037e+00, 5.070775985717773e+00, 5.091960906982422e+00, 5.122161388397217e+00, 5.155276298522949e+00, 5.186254501342773e+00, 5.221196174621582e+00, 5.256364822387695e+00, 5.289220809936523e+00, 5.318789958953857e+00, 5.34507417678833e+00, 5.368262767791748e+00, 5.388584613800049e+00, 5.406256675720215e+00, 5.421468257904053e+00, 5.434378623962402e+00, 5.445120811462402e+00, 5.453798770904541e+00, 5.46049165725708e+00, 5.465266227722168e+00, 5.777578353881836e+00, 6.105597496032715e+00, 6.243697643280029e+00, 6.263340473175049e+00, 6.234051704406738e+00, 6.194809436798096e+00, 6.159224033355713e+00, 6.128802299499512e+00, 6.101316452026367e+00, 6.074681282043457e+00, 6.04368782043457e+00, 6.012726783752441e+00, 5.980929851531982e+00, 5.945607662200928e+00, 5.905802249908447e+00, 5.860975742340088e+00, 5.810734272003174e+00, 5.754707813262939e+00, 5.692436695098877e+00, 5.623340129852295e+00, 5.546817779541016e+00, 5.462209701538086e+00, 5.368796825408936e+00, 5.265804290771484e+00, 4.085397243499756e+00, 1.604624509811401e+00, 4.967564642429352e-01, 9.707283973693848e-02, 1.910207979381084e-02, 1.225558575242758e-02, 1.135540381073952e-02, 1.070468686521053e-02, 9.925558231770992e-03, 9.05268918722868e-03, 8.119488134980202e-03, 7.149033714085817e-03, 6.164142861962318e-03, 5.189178977161646e-03, 4.250820260494947e-03, 3.375594038516283e-03, 2.589174313470721e-03, 1.909794635139406e-03, 1.347659039311111e-03, 9.04168700799346e-04, 5.723460344597697e-04, 3.385534510016441e-04, 1.849379041232169e-04, 9.201500506605953e-05, 4.127274587517604e-05, 1.700927896308713e-05, 7.059607014525682e-06, 3.44389763995423e-06, 2.668216893653153e-06, 2.685588697204366e-06, 2.497016112101846e-06, 1.961667067007511e-06, 1.343716917290294e-06, 8.170618457370438e-07, 4.609261168297962e-07, 2.384882407113764e-07, 1.155028357402443e-07, 5.522422696913054e-08, 2.474406635144533e-08, 1.019799622525852e-08, 4.486782945178902e-09, 2.308785829185922e-09, 1.276236671898801e-09, 7.024888448725619e-10, 4.07325229101474e-10, 2.770428886300635e-10, 2.375920016284283e-10, 2.520645636661101e-10, 2.869519899473261e-10, 3.016910055109179e-10]
+pmpNorth.m_flow=[0e+00, 2.592436552047729e+00, 4.262869834899902e+00, 5.342912673950195e+00, 5.632701873779297e+00, 5.587465763092041e+00, 5.659871101379395e+00, 5.72075891494751e+00, 5.770452499389648e+00, 5.809041500091553e+00, 5.836324691772461e+00, 5.851733684539795e+00, 5.854202747344971e+00, 5.841952800750732e+00, 5.871561527252197e+00, 5.897579193115234e+00, 5.920300006866455e+00, 5.939990520477295e+00, 5.956877708435059e+00, 5.971152782440186e+00, 5.982974052429199e+00, 5.992479801177979e+00, 5.999775886535645e+00, 6.004935264587402e+00, 6.008009433746338e+00, 6.009043216705322e+00, 6.00804328918457e+00, 6.254584312438965e+00, 6.452489852905273e+00, 6.608295440673828e+00, 6.726650714874268e+00, 6.810895919799805e+00, 6.863189697265625e+00, 6.884666919708252e+00, 6.875685214996338e+00, 6.836346626281738e+00, 6.767463207244873e+00, 6.672104358673096e+00, 6.556654453277588e+00, 6.502885341644287e+00, 6.442150592803955e+00, 6.374245166778564e+00, 6.29848051071167e+00, 6.214101314544678e+00, 6.120288372039795e+00, 6.016165733337402e+00, 5.900820255279541e+00, 5.773301124572754e+00, 5.632646083831787e+00, 5.477948665618896e+00, 5.30836820602417e+00, 4.676821708679199e+00, 3.499768257141113e+00, 1.937031507492065e+00, 2.832588739693165e-03, 4.006675910204649e-03, 5.032187793403864e-03, 5.820032209157944e-03, 6.267879623919725e-03, 6.29493361338973e-03, 5.895644892007113e-03, 5.169569980353117e-03, 4.273667465895414e-03, 3.34538402967155e-03, 2.498344052582979e-03, 1.788771129213274e-03, 1.220031641423702e-03, 7.858958560973406e-04, 4.723054880741984e-04, 2.600524167064577e-04, 1.274966052733362e-04, 5.305640661390498e-05, 1.710921969788615e-05, 3.499673994156183e-06, 2.533094516365963e-07, 2.113228925182398e-09, 2.416049653675145e-07, 3.360797336426913e-06, 1.609544233360793e-05, 4.746712875203229e-05, 1.043353404384106e-04, 1.854575530160218e-04, 2.781305811367929e-04, 3.600443596951663e-04, 4.043894587084651e-04, 3.845798200927675e-04, 2.779497299343348e-04, 9.987226803787053e-05, 2.08268668977496e-09, 2.084514227895795e-10, 2.529974840737026e-10, 2.992233405496592e-10, 3.458739961104129e-10, 3.919577995503687e-10, 4.391453589658312e-10, 4.888431881511224e-10, 5.332546626490853e-10, 5.647093348493115e-10, 5.881323761336432e-10, 6.187587664463479e-10, 6.438602428993079e-10]
+pmpSouth.m_flow=[0e+00, 2.351372241973877e+00, 3.88750171661377e+00, 4.879833698272705e+00, 5.157902240753174e+00, 5.119084358215332e+00, 5.179433345794678e+00, 5.230185031890869e+00, 5.271530151367188e+00, 5.303447246551514e+00, 5.325656890869141e+00, 5.337551593780518e+00, 5.338080883026123e+00, 5.325554370880127e+00, 5.351479053497314e+00, 5.374359130859375e+00, 5.394422054290771e+00, 5.411872863769531e+00, 5.426888942718506e+00, 5.439619064331055e+00, 5.450186729431152e+00, 5.458702087402344e+00, 5.465249538421631e+00, 5.469884872436523e+00, 5.472649097442627e+00, 5.473579406738281e+00, 5.472679615020752e+00, 5.670020580291748e+00, 5.826502799987793e+00, 5.948439121246338e+00, 6.040303230285645e+00, 6.105294227600098e+00, 6.145499229431152e+00, 6.162049770355225e+00, 6.155320644378662e+00, 6.125332832336426e+00, 6.072505950927734e+00, 5.998913288116455e+00, 5.909229755401611e+00, 5.86393928527832e+00, 5.813002109527588e+00, 5.756283283233643e+00, 5.69325590133667e+00, 5.623339653015137e+00, 5.545896053314209e+00, 5.460229873657227e+00, 5.365597248077393e+00, 5.261197566986084e+00, 5.146180152893066e+00, 5.019684314727783e+00, 4.880833625793457e+00, 4.316765308380127e+00, 3.241775512695312e+00, 1.80116069316864e+00, 1.833743881434202e-03, 2.903382992371917e-03, 3.893229179084301e-03, 4.673730116337538e-03, 5.167203024029732e-03, 5.337336100637913e-03, 5.173892248421907e-03, 4.699787124991417e-03, 3.997124265879393e-03, 3.185332054272294e-03, 2.406413201242685e-03, 1.740462146699429e-03, 1.197106088511646e-03, 7.762367022223771e-04, 4.687780747190118e-04, 2.589749929029495e-04, 1.27236417029053e-04, 5.301123019307852e-05, 1.710451579128858e-05, 3.499477088553249e-06, 2.533084000333474e-07, 2.113228925182398e-09, 2.416040274511033e-07, 3.343538310218719e-06, 1.575637179485057e-05, 4.527606506599113e-05, 9.660720388637856e-05, 1.672094513196498e-04, 2.444980491418391e-04, 3.053208056371659e-04, 3.215055039618164e-04, 2.730907581280917e-04, 1.670499477768317e-04, 5.189328294363804e-05, 1.041744024377067e-09, 1.031134552742508e-10, 1.238031760442126e-10, 1.449358411065305e-10, 1.659815895838079e-10, 1.865621546137675e-10, 2.075620231245523e-10, 2.297044637833423e-10, 2.493807382819568e-10, 2.630850814977492e-10, 2.793740516704446e-10, 2.94118368548979e-10, 3.045820262670418e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
index 28173cbe58..443e2c8e7f 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_FlowSystem_Simplified3.txt
@@ -1,4 +1,4 @@
-last-generated=2022-08-12
+last-generated=2024-09-10
 statistics-initialization=
 {
   "nonlinear": "0, 0, 1, 1, 5, 1, 1",
@@ -8,9 +8,9 @@ statistics-simulation=
 {
   "linear": "24",
   "nonlinear": "0, 0, 1, 1, 5, 1, 1",
-  "number of continuous time states": "74",
+  "number of continuous time states": "42",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-pmpNorth.m_flow=[0e+00, 3.935694694519043e+00, 5.780154228210449e+00, 5.809367656707764e+00, 5.690287590026855e+00, 5.605447292327881e+00, 5.558409690856934e+00, 5.541728973388672e+00, 5.548970222473145e+00, 5.573373794555664e+00, 5.608276844024658e+00, 5.647496223449707e+00, 5.683110237121582e+00, 5.722925662994385e+00, 5.763546466827393e+00, 5.801443576812744e+00, 5.835417747497559e+00, 5.865492820739746e+00, 5.89191198348999e+00, 5.914976119995117e+00, 5.934957504272461e+00, 5.952096462249756e+00, 5.966598987579346e+00, 5.978635787963867e+00, 5.988339424133301e+00, 5.995809555053711e+00, 6.001132965087891e+00, 6.390816211700439e+00, 6.807199001312256e+00, 6.981039524078369e+00, 7.000619888305664e+00, 6.958029747009277e+00, 6.904683589935303e+00, 6.857888221740723e+00, 6.819099426269531e+00, 6.785050392150879e+00, 6.752820491790771e+00, 6.716578006744385e+00, 6.678924560546875e+00, 6.641193866729736e+00, 6.599531173706055e+00, 6.552485942840576e+00, 6.499286651611328e+00, 6.43939733505249e+00, 6.372331142425537e+00, 6.297479629516602e+00, 6.214093685150146e+00, 6.121401786804199e+00, 6.018571853637695e+00, 5.904721736907959e+00, 5.778929710388184e+00, 4.472226142883301e+00, 1.755283951759338e+00, 5.383865833282471e-01, 1.038656383752823e-01, 1.01801548153162e-02, 8.456346695311368e-04, 6.90711458446458e-05, 1.268326468562009e-05, 4.12457239917785e-07, 3.218171684693516e-07, 2.311933045007208e-08, -1.5268231123855e-08, 8.895319147939063e-09, 2.523842468349358e-09, -4.228830063901512e-10, -6.754835579769747e-10, -1.484994210931845e-10, 1.859641468593409e-10, 8.35797472897859e-11, 1.212138809464358e-11, -5.521493852411741e-12, -4.95483645432393e-12, -1.610096170973074e-12, 1.03014412321592e-13, 3.234663784653508e-13, 7.634284236680486e-14, 2.990790327526104e-15, 1.758156510113699e-16, 2.149546943110515e-17, 3.324812767487492e-18, 1.114121295241547e-18, 1.022373588247948e-19, 1.502126388183913e-19, -2.487734867819434e-20, 4.100450295581572e-20, 1.415903391420987e-21, 1.929675650025008e-21, 1.686812312174206e-21, -6.040247114324277e-22, -5.978505937389632e-22, 6.863704808275641e-22, 4.311639562996268e-22, 6.720332557304215e-23, -1.723850152089674e-22, -2.513795520174311e-22, -1.762438577000445e-22, -2.154407925581624e-24, 1.67207828373085e-22, 1.845022847446222e-22, 2.60359771013068e-23]
-pmpSouth.m_flow=[0e+00, 3.5414719581604e+00, 5.22852611541748e+00, 5.277751445770264e+00, 5.183816909790039e+00, 5.115185260772705e+00, 5.077246189117432e+00, 5.064364433288574e+00, 5.071390151977539e+00, 5.092769145965576e+00, 5.122970581054688e+00, 5.156259536743164e+00, 5.187353610992432e+00, 5.222183227539062e+00, 5.25743579864502e+00, 5.290326118469238e+00, 5.319912910461426e+00, 5.34621524810791e+00, 5.369418144226074e+00, 5.389755725860596e+00, 5.407441139221191e+00, 5.422662258148193e+00, 5.435580730438232e+00, 5.446329593658447e+00, 5.455012321472168e+00, 5.461708068847656e+00, 5.466485977172852e+00, 5.778119087219238e+00, 6.105720996856689e+00, 6.24374532699585e+00, 6.263367176055908e+00, 6.234063148498535e+00, 6.19481372833252e+00, 6.159225463867188e+00, 6.128803253173828e+00, 6.101316452026367e+00, 6.074681282043457e+00, 6.043688297271729e+00, 6.012726783752441e+00, 5.980929851531982e+00, 5.945608139038086e+00, 5.905802249908447e+00, 5.860974311828613e+00, 5.810732841491699e+00, 5.754709243774414e+00, 5.692437648773193e+00, 5.623340129852295e+00, 5.546817302703857e+00, 5.462209224700928e+00, 5.368796825408936e+00, 5.265804767608643e+00, 4.085401058197021e+00, 1.604460835456848e+00, 4.956307709217072e-01, 9.158726781606674e-02, 8.995151147246361e-03, 7.489583804272115e-04, 6.137102172942832e-05, 1.131675162469037e-05, 3.699728665651492e-07, 2.905397593622183e-07, 2.103240603901213e-08, -1.401213456375672e-08, 8.243119076212224e-09, 2.36318475899111e-09, -4.002040365769233e-10, -6.459901502609e-10, -1.434200952443732e-10, 1.8119096500957e-10, 8.204542600864784e-11, 1.197056776619521e-11, -5.477646114471213e-12, -4.931408580099994e-12, -1.605918306321619e-12, 1.028810961119578e-13, 3.23278567544022e-13, 7.632458711272563e-14, 2.990481372258593e-15, 1.758037925501084e-16, 2.14934759258289e-17, 3.324123312446929e-18, 1.113557468256516e-18, 1.021202481446332e-19, 1.498618108410923e-19, -2.476985235706652e-20, 4.07029891601916e-20, 1.399407237041985e-21, 1.896190991087949e-21, 1.645529819987023e-21, -5.841627841825475e-22, -5.72563171483786e-22, 6.504584527089296e-22, 4.04214221101419e-22, 6.233589601564746e-23, -1.583026489821964e-22, -2.287371740665728e-22, -1.590768307636931e-22, -1.930919686827985e-24, 1.490107889082302e-22, 1.636452189291366e-22, 2.299803588997723e-23]
+pmpNorth.m_flow=[0e+00, 2.592565059661865e+00, 4.26311206817627e+00, 5.343204021453857e+00, 5.632997512817383e+00, 5.587770462036133e+00, 5.66021203994751e+00, 5.721147060394287e+00, 5.77090311050415e+00, 5.809574127197266e+00, 5.836967468261719e+00, 5.852522373199463e+00, 5.855183124542236e+00, 5.843189716339111e+00, 5.872818470001221e+00, 5.898852348327637e+00, 5.92158842086792e+00, 5.941291809082031e+00, 5.958188533782959e+00, 5.972473621368408e+00, 5.984307765960693e+00, 5.993819236755371e+00, 6.001112461090088e+00, 6.006270885467529e+00, 6.009354591369629e+00, 6.010394096374512e+00, 6.009389400482178e+00, 6.255414009094238e+00, 6.452988147735596e+00, 6.608588218688965e+00, 6.726821899414062e+00, 6.810999870300293e+00, 6.863258361816406e+00, 6.884717464447021e+00, 6.875723838806152e+00, 6.836371898651123e+00, 6.767475128173828e+00, 6.672107696533203e+00, 6.55661678314209e+00, 6.50288200378418e+00, 6.442147254943848e+00, 6.374242305755615e+00, 6.298477649688721e+00, 6.214098930358887e+00, 6.120287418365479e+00, 6.016164302825928e+00, 5.900815010070801e+00, 5.773294925689697e+00, 5.632649421691895e+00, 5.477947235107422e+00, 5.308366775512695e+00, 4.676820755004883e+00, 3.499756097793579e+00, 1.936905264854431e+00, -1.063026047631865e-05, -7.104061783280713e-09, 2.119941377998202e-08, 3.058222119989296e-09, -3.927320621488484e-11, -1.141558462341985e-11, 6.112927872226059e-12, -2.515499744268346e-13, -1.0076691881627e-14, 8.57639729152703e-19, -1.881862399284553e-24, -1.042196682399819e-25, 6.553319451307671e-27, -2.389452555973651e-27, 6.000053704323661e-28, 4.18199948964924e-29, -7.319514809236918e-30, -5.002338591336684e-30, -5.756937973971341e-31, 1.417675809549319e-31, 1.130703167141761e-32, -3.71977094314614e-36, 8.307791401168391e-35, -8.040883764360264e-37, -1.625059238037831e-36, -1.063132455392663e-36, 4.473855160973445e-36, 4.444994134390243e-35, 1.857335831213798e-34, 4.694636992081242e-34, 1.353906842628263e-33, 2.881017451391414e-33, 6.122862077317344e-33, 9.396486744030732e-33, 1.479446774028604e-32, -1.945073016827171e-32, -7.352057712062597e-32, -1.51513545842882e-31, -2.582030000408864e-31, -3.96434858557754e-31, -5.736845013933866e-31, -7.946433970315768e-31, -1.051494931217323e-30, -1.351635314405998e-30, -1.705214235020344e-30, -2.105964897577255e-30, -2.551814482358266e-30]
+pmpSouth.m_flow=[0e+00, 2.351489067077637e+00, 3.887722253799438e+00, 4.880100250244141e+00, 5.158173084259033e+00, 5.119363307952881e+00, 5.179745197296143e+00, 5.23054027557373e+00, 5.271941661834717e+00, 5.303934097290039e+00, 5.32624340057373e+00, 5.338270664215088e+00, 5.338974952697754e+00, 5.326682090759277e+00, 5.352624416351318e+00, 5.375519752502441e+00, 5.395596027374268e+00, 5.413058757781982e+00, 5.428082942962646e+00, 5.440821647644043e+00, 5.451401710510254e+00, 5.459922313690186e+00, 5.466466903686523e+00, 5.4711012840271e+00, 5.473874568939209e+00, 5.474809646606445e+00, 5.47390604019165e+00, 5.670773983001709e+00, 5.826954364776611e+00, 5.948704242706299e+00, 6.040458202362061e+00, 6.105388164520264e+00, 6.145561695098877e+00, 6.162095546722412e+00, 6.155355453491211e+00, 6.12535572052002e+00, 6.072516918182373e+00, 5.998916149139404e+00, 5.909232616424561e+00, 5.86393928527832e+00, 5.813002109527588e+00, 5.756283283233643e+00, 5.69325590133667e+00, 5.623340129852295e+00, 5.545897006988525e+00, 5.460230350494385e+00, 5.365594863891602e+00, 5.261194229125977e+00, 5.146183967590332e+00, 5.019684314727783e+00, 4.880833625793457e+00, 4.316765308380127e+00, 3.241764307022095e+00, 1.801043033599854e+00, -9.445993782719597e-06, -6.343853886647821e-09, 1.904034441224667e-08, 2.765373041668795e-09, -3.579063434511198e-11, -1.049839382094575e-11, 5.676472313032033e-12, -2.363837478622927e-13, -9.556250274878487e-15, 8.22125866926081e-19, -1.821761059068028e-24, -1.017702489662948e-25, 6.444733595113174e-27, -2.366590419382813e-27, 5.893033629173951e-28, 4.085998201379166e-29, -7.173578972333745e-30, -4.914969832652496e-30, -5.727165993449195e-31, 1.367274843565723e-31, 1.092032488672379e-32, -3.379192548460906e-36, 1.997123116896315e-34, -1.890073700441958e-36, 3.297335552932331e-36, -2.024631535764776e-36, 6.610631110646182e-36, 7.6879305006945e-35, 3.351552503497717e-34, -1.235236096137946e-34, 1.730224093970741e-33, 3.239218681748789e-33, 5.462567063993295e-33, 7.749479568574547e-33, 1.173906845701502e-32, -1.409669870174174e-32, -5.301285565640631e-32, -1.067500744416763e-31, -1.773660990609685e-31, -2.656526014496746e-31, -3.751835428770912e-31, -5.07811866843363e-31, -6.585610709945098e-31, -8.31275750664218e-31, -1.02134792097749e-30, -1.263107894450091e-30, -1.500070064219924e-30]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_ResistanceVolumeFlowReversal.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_ResistanceVolumeFlowReversal.txt
index 145dc9ec00..685eec89de 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_ResistanceVolumeFlowReversal.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Examples_ResistanceVolumeFlowReversal.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-07
+last-generated=2024-09-10
 statistics-initialization=
 {
   "nonlinear": "2, 1, 0",
@@ -8,11 +8,11 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 1, 0, 0, 0, 0, 0, 0, 0, 1",
-  "number of continuous time states": "4",
+  "number of continuous time states": "3",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+04]
 res[1].m_flow=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 res[2].m_flow=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-vol[1].T=[2.931499938964844e+02, 2.932772827148438e+02, 2.934031677246094e+02, 2.935290222167969e+02, 2.936548767089844e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.939066162109375e+02, 2.94032470703125e+02, 2.941583251953125e+02, 2.942842102050781e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.945359191894531e+02, 2.946618041992188e+02, 2.947876586914062e+02, 2.949135131835938e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.951652526855469e+02, 2.952911071777344e+02, 2.954169616699219e+02, 2.955428466796875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.957945556640625e+02, 2.959204406738281e+02, 2.960462951660156e+02, 2.961721496582031e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.964238891601562e+02, 2.965497436523438e+02, 2.966755981445312e+02, 2.968014831542969e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.970531921386719e+02, 2.971790771484375e+02, 2.97304931640625e+02, 2.974307861328125e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.976825256347656e+02, 2.978083801269531e+02, 2.979342346191406e+02, 2.980601196289062e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.983118286132812e+02, 2.984377136230469e+02, 2.985635681152344e+02, 2.986894226074219e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.98941162109375e+02, 2.990670166015625e+02, 2.9919287109375e+02, 2.993187561035156e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02]
-vol[2].T=[2.931499938964844e+02, 2.932772827148438e+02, 2.934031677246094e+02, 2.935290222167969e+02, 2.936548767089844e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.9378076171875e+02, 2.939066162109375e+02, 2.94032470703125e+02, 2.941583251953125e+02, 2.942842102050781e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.944100646972656e+02, 2.945359191894531e+02, 2.946618041992188e+02, 2.947876586914062e+02, 2.949135131835938e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.950393981933594e+02, 2.951652526855469e+02, 2.952911071777344e+02, 2.954169616699219e+02, 2.955428466796875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.95668701171875e+02, 2.957945556640625e+02, 2.959204406738281e+02, 2.960462951660156e+02, 2.961721496582031e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.962980346679688e+02, 2.964238891601562e+02, 2.965497436523438e+02, 2.966755981445312e+02, 2.968014831542969e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.969273376464844e+02, 2.970531921386719e+02, 2.971790771484375e+02, 2.97304931640625e+02, 2.974307861328125e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.97556640625e+02, 2.976825256347656e+02, 2.978083801269531e+02, 2.979342346191406e+02, 2.980601196289062e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.981859741210938e+02, 2.983118286132812e+02, 2.984377136230469e+02, 2.985635681152344e+02, 2.986894226074219e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.988152770996094e+02, 2.98941162109375e+02, 2.990670166015625e+02, 2.9919287109375e+02, 2.993187561035156e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02, 2.994446105957031e+02]
+vol[1].T=[2.931499938964844e+02, 2.932797241210938e+02, 2.934056091308594e+02, 2.935314636230469e+02, 2.936573181152344e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.939090576171875e+02, 2.94034912109375e+02, 2.941607971191406e+02, 2.942866516113281e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.945383605957031e+02, 2.946642456054688e+02, 2.947901000976562e+02, 2.949159545898438e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.951676940917969e+02, 2.952935485839844e+02, 2.9541943359375e+02, 2.955452880859375e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.957969970703125e+02, 2.959228820800781e+02, 2.960487365722656e+02, 2.961745910644531e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.964263305664062e+02, 2.965521850585938e+02, 2.966780700683594e+02, 2.968039245605469e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.970556335449219e+02, 2.971815185546875e+02, 2.97307373046875e+02, 2.974332275390625e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.976849670410156e+02, 2.978108215332031e+02, 2.979367065429688e+02, 2.980625610351562e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.983142700195312e+02, 2.984401550292969e+02, 2.985660095214844e+02, 2.986918640136719e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.98943603515625e+02, 2.990694580078125e+02, 2.991953125e+02, 2.993211975097656e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02]
+vol[2].T=[2.931499938964844e+02, 2.932797241210938e+02, 2.934056091308594e+02, 2.935314636230469e+02, 2.936573181152344e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.93783203125e+02, 2.939090576171875e+02, 2.94034912109375e+02, 2.941607971191406e+02, 2.942866516113281e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.944125061035156e+02, 2.945383605957031e+02, 2.946642456054688e+02, 2.947901000976562e+02, 2.949159545898438e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.950418395996094e+02, 2.951676940917969e+02, 2.952935485839844e+02, 2.9541943359375e+02, 2.955452880859375e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.95671142578125e+02, 2.957969970703125e+02, 2.959228820800781e+02, 2.960487365722656e+02, 2.961745910644531e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.963004760742188e+02, 2.964263305664062e+02, 2.965521850585938e+02, 2.966780700683594e+02, 2.968039245605469e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.969297790527344e+02, 2.970556335449219e+02, 2.971815185546875e+02, 2.97307373046875e+02, 2.974332275390625e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.975591125488281e+02, 2.976849670410156e+02, 2.978108215332031e+02, 2.979367065429688e+02, 2.980625610351562e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.981884155273438e+02, 2.983142700195312e+02, 2.984401550292969e+02, 2.985660095214844e+02, 2.986918640136719e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.988177490234375e+02, 2.98943603515625e+02, 2.990694580078125e+02, 2.991953125e+02, 2.993211975097656e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02, 2.994470520019531e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
index 1cb77e56fa..43494dde4f 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt
@@ -1,22 +1,18 @@
-last-generated=2022-12-19
+last-generated=2024-09-11
 statistics-fmu-dependencies=
 {
   "Derivatives": {
-    "der(fan.filter.s[1])": [
-      "fan.filter.s[1]"
-    ],
-    "der(fan.filter.s[2])": [
-      "fan.filter.s[1]",
-      "fan.filter.s[2]"
+    "der(fan.motSpe.y)": [
+      "fan.motSpe.y"
     ],
     "der(senTemHXOut.T)": [
-      "fan.filter.s[2]",
+      "fan.motSpe.y",
       "senTemHXOut.T",
       "fluPor[1].backward.T",
       "fluPor[1].backward.X_w"
     ],
     "der(senTemSupAir.T)": [
-      "fan.filter.s[2]",
+      "fan.motSpe.y",
       "senTemSupAir.T",
       "fluPor[1].backward.T",
       "fluPor[1].backward.X_w"
@@ -33,8 +29,7 @@ statistics-fmu-dependencies=
       "zero.k"
     ],
     "TOut": [],
-    "der(fan.filter.s[1])": [],
-    "der(fan.filter.s[2])": [
+    "der(fan.motSpe.y)": [
       "fan.riseTime",
       "fan.m_flow_start"
     ],
@@ -56,10 +51,7 @@ statistics-fmu-dependencies=
       "fluPor[1].backward.T",
       "fluPor[1].backward.X_w"
     ],
-    "fan.filter.s[1]": [
-      "fan.riseTime"
-    ],
-    "fan.filter.s[2]": [
+    "fan.motSpe.y": [
       "fan.m_flow_start"
     ],
     "fluPor[1].forward.T": [
@@ -123,20 +115,20 @@ statistics-fmu-dependencies=
     "QGaiSenCon_flow": [],
     "TOut": [],
     "fluPor[1].forward.T": [
-      "fan.filter.s[2]",
+      "fan.motSpe.y",
       "fluPor[1].backward.T",
       "fluPor[1].backward.X_w"
     ],
     "fluPor[1].forward.X_w": [
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[1].m_flow": [
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[2].forward.T": [],
     "fluPor[2].forward.X_w": [],
     "fluPor[2].m_flow": [
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "weaBus.HDifHor": [],
     "weaBus.HDirNor": [],
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
index a1fc694fd9..1142782f95 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt
@@ -1,38 +1,30 @@
-last-generated=2022-12-19
+last-generated=2024-09-11
 statistics-fmu-dependencies=
 {
   "Derivatives": {
-    "der(fan.filter.s[1])": [
-      "fan.filter.s[1]"
+    "der(fan.motSpe.y)": [
+      "fan.motSpe.y"
     ],
-    "der(fan.filter.s[2])": [
-      "fan.filter.s[1]",
-      "fan.filter.s[2]"
-    ],
-    "der(fan2.filter.s[1])": [
-      "fan2.filter.s[1]"
-    ],
-    "der(fan2.filter.s[2])": [
-      "fan2.filter.s[1]",
-      "fan2.filter.s[2]"
+    "der(fan2.motSpe.y)": [
+      "fan2.motSpe.y"
     ],
     "der(senTemHXOut.T)": [
       "fluPor[1,1].backward.T",
       "fluPor[1,1].backward.X_w",
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
+      "fan.motSpe.y",
       "senTemHXOut.T",
-      "fan2.filter.s[2]"
+      "fan2.motSpe.y"
     ],
     "der(senTemSupAir.T)": [
       "fluPor[1,1].backward.T",
       "fluPor[1,1].backward.X_w",
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
+      "fan.motSpe.y",
       "senTemSupAir.T",
-      "fan2.filter.s[2]"
+      "fan2.motSpe.y"
     ]
   },
   "InitialUnknowns": {
@@ -55,13 +47,11 @@ statistics-fmu-dependencies=
       "zer[2].k"
     ],
     "TOut": [],
-    "der(fan.filter.s[1])": [],
-    "der(fan.filter.s[2])": [
+    "der(fan.motSpe.y)": [
       "fan.riseTime",
       "fan.m_flow_start"
     ],
-    "der(fan2.filter.s[1])": [],
-    "der(fan2.filter.s[2])": [
+    "der(fan2.motSpe.y)": [
       "fan2.riseTime",
       "fan2.m_flow_start"
     ],
@@ -89,16 +79,10 @@ statistics-fmu-dependencies=
       "weaDat.pAtm",
       "fan2.m_flow_start"
     ],
-    "fan.filter.s[1]": [
-      "fan.riseTime"
-    ],
-    "fan.filter.s[2]": [
+    "fan.motSpe.y": [
       "fan.m_flow_start"
     ],
-    "fan2.filter.s[1]": [
-      "fan2.riseTime"
-    ],
-    "fan2.filter.s[2]": [
+    "fan2.motSpe.y": [
       "fan2.m_flow_start"
     ],
     "fluPor[1,1].forward.T": [
@@ -250,90 +234,90 @@ statistics-fmu-dependencies=
       "fluPor[1,1].backward.X_w",
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,1].forward.X_w": [
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[1,1].m_flow": [
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[1,2].forward.T": [
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,2].forward.X_w": [
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,2].m_flow": [
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,3].forward.T": [
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,3].forward.X_w": [
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[1,3].m_flow": [
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,1].forward.T": [
       "fluPor[1,1].backward.T",
       "fluPor[1,1].backward.X_w",
       "fluPor[2,1].backward.T",
       "fluPor[2,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,1].forward.X_w": [
       "fluPor[1,1].backward.X_w",
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[2,1].m_flow": [
-      "fan.filter.s[2]"
+      "fan.motSpe.y"
     ],
     "fluPor[2,2].forward.T": [
       "fluPor[1,1].backward.T",
       "fluPor[1,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,2].forward.X_w": [
       "fluPor[1,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,2].m_flow": [
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,3].forward.T": [
       "fluPor[1,1].backward.T",
       "fluPor[1,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,3].forward.X_w": [
       "fluPor[1,1].backward.X_w",
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "fluPor[2,3].m_flow": [
-      "fan.filter.s[2]",
-      "fan2.filter.s[2]"
+      "fan.motSpe.y",
+      "fan2.motSpe.y"
     ],
     "weaBus.HDifHor": [],
     "weaBus.HDirNor": [],
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt
index 82c2f157b6..ba103d12a8 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Examples_CoolingOffice.txt
@@ -1,4 +1,4 @@
-last-generated=2023-09-22
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,8 +8,8 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "168",
+  "number of continuous time states": "166",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 7.776e+06]
-aquWel.TAquHot[50]=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851503601074219e+02, 2.851541442871094e+02, 2.851709594726562e+02, 2.852155151367188e+02, 2.853010864257812e+02, 2.854338989257812e+02, 2.856117858886719e+02, 2.858262023925781e+02, 2.860653381347656e+02, 2.863170166015625e+02, 2.865707397460938e+02, 2.868182678222656e+02, 2.870536499023438e+02, 2.872730712890625e+02, 2.874745483398438e+02, 2.876573791503906e+02, 2.878218688964844e+02, 2.879689025878906e+02, 2.880995788574219e+02, 2.88215087890625e+02, 2.883170166015625e+02, 2.8840673828125e+02, 2.884857788085938e+02, 2.885553283691406e+02, 2.886164855957031e+02, 2.886702575683594e+02, 2.887176208496094e+02, 2.887593078613281e+02, 2.887959899902344e+02, 2.888284912109375e+02, 2.888571166992188e+02, 2.888824462890625e+02, 2.889049377441406e+02, 2.889248352050781e+02, 2.889425048828125e+02, 2.889581604003906e+02, 2.889721069335938e+02, 2.889844970703125e+02, 2.889955444335938e+02, 2.8900537109375e+02, 2.890141906738281e+02, 2.890221252441406e+02, 2.890292358398438e+02, 2.8903564453125e+02, 2.890414733886719e+02, 2.890467529296875e+02, 2.89051513671875e+02, 2.890558471679688e+02, 2.89059814453125e+02, 2.890634155273438e+02, 2.890666809082031e+02, 2.890696105957031e+02, 2.890723266601562e+02, 2.890748291015625e+02, 2.890770874023438e+02, 2.890791320800781e+02, 2.890809020996094e+02, 2.890826416015625e+02, 2.890841979980469e+02, 2.890856018066406e+02, 2.890868835449219e+02, 2.890880432128906e+02, 2.890891418457031e+02, 2.890901184082031e+02, 2.890910339355469e+02, 2.890918884277344e+02, 2.890926818847656e+02, 2.890933837890625e+02, 2.890940551757812e+02, 2.890946960449219e+02, 2.890952758789062e+02, 2.890958251953125e+02, 2.890963439941406e+02, 2.890968017578125e+02, 2.890972290039062e+02, 2.890976257324219e+02, 2.890980224609375e+02, 2.89098388671875e+02, 2.890987243652344e+02, 2.890990600585938e+02, 2.89099365234375e+02, 2.89099609375e+02, 2.89099853515625e+02, 2.8910009765625e+02, 2.89100341796875e+02, 2.891005554199219e+02, 2.891007385253906e+02, 2.891009216308594e+02, 2.891011047363281e+02, 2.891012573242188e+02, 2.891013793945312e+02, 2.891015319824219e+02, 2.891016845703125e+02, 2.89101806640625e+02, 2.891018981933594e+02, 2.891020202636719e+02, 2.891021118164062e+02, 2.891022033691406e+02]
+aquWel.TAquHot[50]=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851503601074219e+02, 2.851540832519531e+02, 2.851707458496094e+02, 2.852149658203125e+02, 2.853001403808594e+02, 2.854324645996094e+02, 2.856099243164062e+02, 2.858239135742188e+02, 2.860628051757812e+02, 2.863146362304688e+02, 2.865688781738281e+02, 2.868169860839844e+02, 2.870529479980469e+02, 2.872730712890625e+02, 2.874754028320312e+02, 2.876591491699219e+02, 2.878244323730469e+02, 2.879720153808594e+02, 2.881033020019531e+02, 2.882194519042969e+02, 2.88322265625e+02, 2.884129333496094e+02, 2.884927978515625e+02, 2.885630798339844e+02, 2.886248779296875e+02, 2.886792297363281e+02, 2.887270202636719e+02, 2.887690734863281e+02, 2.8880615234375e+02, 2.888388671875e+02, 2.888677673339844e+02, 2.888933410644531e+02, 2.889159851074219e+02, 2.889361267089844e+02, 2.889539794921875e+02, 2.889698181152344e+02, 2.889839477539062e+02, 2.889964904785156e+02, 2.890077209472656e+02, 2.890177307128906e+02, 2.890267028808594e+02, 2.890348205566406e+02, 2.890420837402344e+02, 2.890486145019531e+02, 2.890545349121094e+02, 2.890599365234375e+02, 2.890648193359375e+02, 2.890691528320312e+02, 2.890731201171875e+02, 2.890767517089844e+02, 2.890800476074219e+02, 2.890829772949219e+02, 2.890856323242188e+02, 2.890880737304688e+02, 2.890903015136719e+02, 2.8909228515625e+02, 2.890941162109375e+02, 2.890957641601562e+02, 2.890972900390625e+02, 2.890986938476562e+02, 2.890999755859375e+02, 2.891011352539062e+02, 2.891022338867188e+02, 2.891032409667969e+02, 2.891041870117188e+02, 2.891050415039062e+02, 2.891058654785156e+02, 2.891066284179688e+02, 2.891073303222656e+02, 2.891079711914062e+02, 2.891085815429688e+02, 2.891091613769531e+02, 2.891097106933594e+02, 2.891101989746094e+02, 2.891106567382812e+02, 2.891110534667969e+02, 2.891114501953125e+02, 2.8911181640625e+02, 2.891121826171875e+02, 2.891124877929688e+02, 2.8911279296875e+02, 2.89113037109375e+02, 2.8911328125e+02, 2.89113525390625e+02, 2.891137390136719e+02, 2.891139221191406e+02, 2.891141052246094e+02, 2.891142883300781e+02, 2.891144409179688e+02, 2.891145935058594e+02, 2.891147155761719e+02, 2.891148681640625e+02, 2.89114990234375e+02, 2.891151123046875e+02, 2.891152038574219e+02, 2.891153259277344e+02, 2.891154174804688e+02, 2.891155090332031e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt
index 222c96cf1d..3e3cd41bb8 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_NumberWells.txt
@@ -1,4 +1,4 @@
-last-generated=2023-09-22
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "1, 1",
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1",
-  "number of continuous time states": "214",
+  "number of continuous time states": "210",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.1536e+07]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt
index 32b7832e9f..25e6fdf47f 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Geothermal_Aquifer_Validation_SimulationTest.txt
@@ -1,4 +1,4 @@
-last-generated=2023-09-22
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,8 +8,8 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "471",
+  "number of continuous time states": "469",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.1536e+07]
-aquWel.TAquCol[150]=[3.071499938964844e+02, 3.300186157226562e+02, 3.468785095214844e+02, 3.558555297851562e+02, 3.614811706542969e+02, 3.653800659179688e+02, 3.682676391601562e+02, 3.705054016113281e+02, 3.722997741699219e+02, 3.737757568359375e+02, 3.750149230957031e+02, 3.760731811523438e+02, 3.769894714355469e+02, 3.777916564941406e+02, 3.785013122558594e+02, 3.791343688964844e+02, 3.797026977539062e+02, 3.802161865234375e+02, 3.806825561523438e+02, 3.811087341308594e+02, 3.815003662109375e+02, 3.8186181640625e+02, 3.821966857910156e+02, 3.825077209472656e+02, 3.827976684570312e+02, 3.830683898925781e+02, 3.833220825195312e+02, 3.835601501464844e+02, 3.837842102050781e+02, 3.839955749511719e+02, 3.841953125e+02, 3.843844909667969e+02, 3.845640258789062e+02, 3.842393188476562e+02, 3.803149719238281e+02, 3.768764038085938e+02, 3.738981323242188e+02, 3.712638854980469e+02, 3.688968811035156e+02, 3.6674609375e+02, 3.647747802734375e+02, 3.629554748535156e+02, 3.612675170898438e+02, 3.596945190429688e+02, 3.582230224609375e+02, 3.568418273925781e+02, 3.555416564941406e+02, 3.543146362304688e+02, 3.531539306640625e+02, 3.520537719726562e+02, 3.504641723632812e+02, 3.48736083984375e+02, 3.471212768554688e+02, 3.4560986328125e+02, 3.44192626953125e+02, 3.42861328125e+02, 3.416085815429688e+02, 3.404278564453125e+02, 3.393132629394531e+02, 3.382596130371094e+02, 3.3726220703125e+02, 3.363168029785156e+02, 3.354196166992188e+02, 3.345671997070312e+02, 3.337564086914062e+02, 3.329844055175781e+02, 3.322486267089844e+02, 3.315466613769531e+02, 3.308764038085938e+02, 3.3023583984375e+02, 3.296231384277344e+02, 3.2903662109375e+02, 3.284747009277344e+02, 3.279359741210938e+02, 3.274191284179688e+02, 3.269228820800781e+02, 3.264461669921875e+02, 3.259878845214844e+02, 3.255470886230469e+02, 3.251228332519531e+02, 3.247142639160156e+02, 3.243205871582031e+02, 3.239410705566406e+02, 3.23703125e+02, 3.235012512207031e+02, 3.233044738769531e+02, 3.23112548828125e+02, 3.229252624511719e+02, 3.22742431640625e+02, 3.225638732910156e+02, 3.22389404296875e+02, 3.222189025878906e+02, 3.2205224609375e+02, 3.218892822265625e+02, 3.217298583984375e+02, 3.215739135742188e+02, 3.214212951660156e+02, 3.212719116210938e+02, 3.211256408691406e+02, 3.209823913574219e+02, 3.208421020507812e+02]
+aquWel.TAquCol[150]=[3.071499938964844e+02, 3.300180358886719e+02, 3.468789367675781e+02, 3.558569641113281e+02, 3.61481689453125e+02, 3.65380859375e+02, 3.682671203613281e+02, 3.705050964355469e+02, 3.722978515625e+02, 3.737732238769531e+02, 3.750133972167969e+02, 3.760721130371094e+02, 3.76988037109375e+02, 3.777901916503906e+02, 3.784998779296875e+02, 3.791327819824219e+02, 3.797011108398438e+02, 3.802147521972656e+02, 3.806817932128906e+02, 3.811087341308594e+02, 3.815008239746094e+02, 3.818626403808594e+02, 3.821974792480469e+02, 3.825086059570312e+02, 3.827983703613281e+02, 3.830690612792969e+02, 3.833226318359375e+02, 3.835606994628906e+02, 3.837848205566406e+02, 3.839962463378906e+02, 3.841961364746094e+02, 3.843854675292969e+02, 3.845651245117188e+02, 3.842405395507812e+02, 3.803165893554688e+02, 3.768778686523438e+02, 3.738995666503906e+02, 3.712652282714844e+02, 3.688983154296875e+02, 3.667475280761719e+02, 3.647759704589844e+02, 3.629566345214844e+02, 3.61268798828125e+02, 3.5969580078125e+02, 3.5822412109375e+02, 3.568427124023438e+02, 3.555422973632812e+02, 3.543151550292969e+02, 3.531544799804688e+02, 3.52054443359375e+02, 3.504648742675781e+02, 3.487366638183594e+02, 3.471217651367188e+02, 3.456102600097656e+02, 3.441929931640625e+02, 3.428616333007812e+02, 3.416088562011719e+02, 3.404281005859375e+02, 3.393134765625e+02, 3.382597961425781e+02, 3.372623596191406e+02, 3.363169555664062e+02, 3.354197692871094e+02, 3.345673217773438e+02, 3.337565002441406e+02, 3.329844970703125e+02, 3.322486877441406e+02, 3.315467529296875e+02, 3.308764953613281e+02, 3.302359313964844e+02, 3.296232299804688e+02, 3.290366516113281e+02, 3.284747619628906e+02, 3.279360046386719e+02, 3.274191284179688e+02, 3.269229125976562e+02, 3.264461975097656e+02, 3.259879150390625e+02, 3.255471496582031e+02, 3.251228942871094e+02, 3.247143249511719e+02, 3.243206481933594e+02, 3.239411010742188e+02, 3.237031555175781e+02, 3.235013122558594e+02, 3.233045349121094e+02, 3.231126098632812e+02, 3.229253234863281e+02, 3.227424621582031e+02, 3.225639038085938e+02, 3.223894348144531e+02, 3.222189331054688e+02, 3.220522766113281e+02, 3.218893127441406e+02, 3.217298889160156e+02, 3.215739440917969e+02, 3.214213256835938e+02, 3.212719421386719e+02, 3.211256713867188e+02, 3.20982421875e+02, 3.208421325683594e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_T.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_T.txt
index 4354ba5bff..982c376684 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_T.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_T.txt
@@ -1,15 +1,15 @@
-last-generated=2020-08-17
+last-generated=2024-09-11
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "8",
+  "number of continuous time states": "7",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
 TVol.T=[2.891499938964844e+02, 2.891500854492188e+02, 2.891501770019531e+02, 2.891502990722656e+02, 2.89150390625e+02, 2.891504516601562e+02, 2.891505432128906e+02, 2.891506042480469e+02, 2.891506652832031e+02, 2.891507263183594e+02, 2.891507568359375e+02, 2.891507873535156e+02, 2.891507873535156e+02, 2.891796875e+02, 2.893807067871094e+02, 2.927337951660156e+02, 2.93154541015625e+02, 2.931506652832031e+02, 2.931506042480469e+02, 2.931505432128906e+02, 2.931515197753906e+02, 2.932259216308594e+02, 2.933738403320312e+02, 2.935480651855469e+02, 2.937155151367188e+02, 2.938532104492188e+02, 2.939452209472656e+02, 2.939807739257812e+02, 2.939530639648438e+02, 2.938583679199219e+02, 2.936952819824219e+02, 2.934644775390625e+02, 2.931683044433594e+02, 2.931493530273438e+02, 2.931492919921875e+02, 2.931492309570312e+02, 2.931492309570312e+02, 2.931492004394531e+02, 2.931492004394531e+02, 2.931492309570312e+02, 2.923289794921875e+02, 2.906876220703125e+02, 2.893964233398438e+02, 2.891493835449219e+02, 2.891494445800781e+02, 2.891495361328125e+02, 2.891495971679688e+02, 2.891496887207031e+02, 2.891497802734375e+02, 2.8914990234375e+02, 2.891499938964844e+02, 2.891500854492188e+02, 2.891501770019531e+02, 2.891502990722656e+02, 2.89150390625e+02, 2.891504516601562e+02, 2.891505432128906e+02, 2.891506042480469e+02, 2.891506652832031e+02, 2.891507263183594e+02, 2.891507568359375e+02, 2.891507873535156e+02, 2.891507873535156e+02, 2.891796875e+02, 2.893807067871094e+02, 2.927337951660156e+02, 2.93154541015625e+02, 2.931506652832031e+02, 2.931506042480469e+02, 2.931505432128906e+02, 2.931515197753906e+02, 2.932259216308594e+02, 2.933738403320312e+02, 2.935480651855469e+02, 2.937155151367188e+02, 2.938532104492188e+02, 2.939452209472656e+02, 2.939807739257812e+02, 2.939530639648438e+02, 2.938583679199219e+02, 2.936952819824219e+02, 2.934644775390625e+02, 2.931683044433594e+02, 2.931493530273438e+02, 2.931492919921875e+02, 2.931492309570312e+02, 2.931492309570312e+02, 2.931492004394531e+02, 2.931492004394531e+02, 2.931492309570312e+02, 2.923289794921875e+02, 2.906876220703125e+02, 2.893964233398438e+02, 2.891493835449219e+02, 2.891494445800781e+02, 2.891495361328125e+02, 2.891495971679688e+02, 2.891496887207031e+02, 2.891497802734375e+02, 2.8914990234375e+02, 2.891499938964844e+02]
-THeaOut.T=[2.891499938964844e+02, 2.905083923339844e+02, 2.90476318359375e+02, 2.904233093261719e+02, 2.903502502441406e+02, 2.902582397460938e+02, 2.901487426757812e+02, 2.900235290527344e+02, 2.89884521484375e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891795959472656e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.936115417480469e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936953735351562e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110473632812e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006408691406e+02, 2.92330078125e+02, 2.906884765625e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491516113281e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081176757812e+02, 2.9051904296875e+02, 2.905083923339844e+02, 2.90476318359375e+02, 2.904233093261719e+02, 2.903502502441406e+02, 2.902582397460938e+02, 2.901487426757812e+02, 2.900235290527344e+02, 2.89884521484375e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891795959472656e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.936115417480469e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936953735351562e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110473632812e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006408691406e+02, 2.92330078125e+02, 2.906884765625e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491516113281e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081176757812e+02, 2.9051904296875e+02]
-hea.TSet=[2.881499938964844e+02, 2.905082702636719e+02, 2.904760437011719e+02, 2.904229125976562e+02, 2.903497009277344e+02, 2.902575988769531e+02, 2.901480102539062e+02, 2.900226745605469e+02, 2.898835754394531e+02, 2.897329406738281e+02, 2.895730895996094e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936126708984375e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.931127624511719e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935118713378906e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225219726562e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904229125976562e+02, 2.904760437011719e+02, 2.905082397460938e+02, 2.9051904296875e+02, 2.905082397460938e+02, 2.904760437011719e+02, 2.904229125976562e+02, 2.903497009277344e+02, 2.902575988769531e+02, 2.901480102539062e+02, 2.900226745605469e+02, 2.898835754394531e+02, 2.897329406738281e+02, 2.895730895996094e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936126708984375e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.931127624511719e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935118713378906e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225219726562e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904229125976562e+02, 2.904760437011719e+02, 2.905082397460938e+02, 2.9051904296875e+02]
-hea.Q_flow=[0e+00, 2.678921203613281e+02, 2.615410766601562e+02, 2.510679168701172e+02, 2.366352691650391e+02, 2.184707336425781e+02, 1.968607635498047e+02, 1.721461944580078e+02, 1.447167358398438e+02, 1.150051040649414e+02, 8.347972869873047e+01, 5.063780975341797e+01, 1.699731826782227e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015090179443359e+01, 7.135606384277338e+01, 4.392023849487305e+01, 1.919826698303223e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.134703826904297e+01, 1.009948959350587e+02, 1.325202636718749e+02, 1.653621826171875e+02, 1.99002685546875e+02, 2.329112396240234e+02, 2.665531005859375e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.72055419921875e+02, 1.968017425537109e+02, 2.184200286865234e+02, 2.365937652587891e+02, 2.510361785888672e+02, 2.615196533203125e+02, 2.678787841796875e+02, 2.700133361816406e+02, 2.678896179199219e+02, 2.615410766601562e+02, 2.510678863525391e+02, 2.366352691650391e+02, 2.184707183837889e+02, 1.968607635498045e+02, 1.72146194458008e+02, 1.447167816162109e+02, 1.150050888061523e+02, 8.347972106933594e+01, 5.063779830932617e+01, 1.699730110168457e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015074920654297e+01, 7.135591888427734e+01, 4.392025756835915e+01, 1.919827651977559e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.134705352783203e+01, 1.009948883056641e+02, 1.325202789306641e+02, 1.653621826171875e+02, 1.99002685546875e+02, 2.329112396240234e+02, 2.665531005859375e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.720554351806641e+02, 1.968017730712891e+02, 2.184200439453125e+02, 2.365937194824219e+02, 2.510361633300781e+02, 2.615196533203125e+02, 2.678787841796875e+02, 2.700133361816406e+02]
+THeaOut.T=[2.891499938964844e+02, 2.905083923339844e+02, 2.90476318359375e+02, 2.904233093261719e+02, 2.903502502441406e+02, 2.902582397460938e+02, 2.901487426757812e+02, 2.900235290527344e+02, 2.89884521484375e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891795959472656e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.936115417480469e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936953735351562e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110473632812e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006103515625e+02, 2.92330078125e+02, 2.906884765625e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491516113281e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081176757812e+02, 2.9051904296875e+02, 2.905083923339844e+02, 2.90476318359375e+02, 2.904233093261719e+02, 2.903502502441406e+02, 2.902582397460938e+02, 2.901487426757812e+02, 2.900235290527344e+02, 2.89884521484375e+02, 2.897339172363281e+02, 2.895741271972656e+02, 2.894076232910156e+02, 2.89237060546875e+02, 2.891795959472656e+02, 2.893805541992188e+02, 2.982056274414062e+02, 2.936115417480469e+02, 2.935125427246094e+02, 2.933733825683594e+02, 2.932479553222656e+02, 2.931515197753906e+02, 2.932258605957031e+02, 2.933737487792969e+02, 2.935479431152344e+02, 2.937154235839844e+02, 2.938531494140625e+02, 2.939451599121094e+02, 2.939807739257812e+02, 2.93953125e+02, 2.938584289550781e+02, 2.936953735351562e+02, 2.934646301269531e+02, 2.931684875488281e+02, 2.935110473632812e+02, 2.936612548828125e+02, 2.938210754394531e+02, 2.93987548828125e+02, 2.941581115722656e+02, 2.943300476074219e+02, 2.945006103515625e+02, 2.92330078125e+02, 2.906884765625e+02, 2.893970947265625e+02, 2.900216979980469e+02, 2.90147216796875e+02, 2.902569274902344e+02, 2.903491516113281e+02, 2.904224853515625e+02, 2.904757690429688e+02, 2.905081176757812e+02, 2.9051904296875e+02]
+hea.TSet=[2.881499938964844e+02, 2.905082702636719e+02, 2.904760437011719e+02, 2.904229125976562e+02, 2.903497009277344e+02, 2.902575988769531e+02, 2.901480102539062e+02, 2.900226745605469e+02, 2.898835754394531e+02, 2.897329406738281e+02, 2.895730895996094e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936126708984375e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.9311279296875e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935118713378906e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225219726562e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904229125976562e+02, 2.904760437011719e+02, 2.905082397460938e+02, 2.9051904296875e+02, 2.905082397460938e+02, 2.904760437011719e+02, 2.904229125976562e+02, 2.903497009277344e+02, 2.902575988769531e+02, 2.901480102539062e+02, 2.900226745605469e+02, 2.898835754394531e+02, 2.897329406738281e+02, 2.895730895996094e+02, 2.894065551757812e+02, 2.892359924316406e+02, 2.881499938964844e+02, 2.881499938964844e+02, 3.031499938964844e+02, 2.936126708984375e+02, 2.935116271972656e+02, 2.933725280761719e+02, 2.932472229003906e+02, 2.9311279296875e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.935118713378906e+02, 2.936622619628906e+02, 2.938221130371094e+02, 2.939886474609375e+02, 2.941592102050781e+02, 2.943311157226562e+02, 2.94501708984375e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.900225219726562e+02, 2.901479797363281e+02, 2.90257568359375e+02, 2.903497009277344e+02, 2.904229125976562e+02, 2.904760437011719e+02, 2.905082397460938e+02, 2.9051904296875e+02]
+hea.Q_flow=[0e+00, 2.678922119140625e+02, 2.615411071777344e+02, 2.510679168701172e+02, 2.366352691650391e+02, 2.184707183837891e+02, 1.968607635498047e+02, 1.721461944580078e+02, 1.447167816162109e+02, 1.150051040649414e+02, 8.347972106933594e+01, 5.063783264160156e+01, 1.699730682373047e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015103149414062e+01, 7.135606384277338e+01, 4.392023849487305e+01, 1.919827079772949e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.134705352783203e+01, 1.009949111938478e+02, 1.325202789306639e+02, 1.653621826171875e+02, 1.99002685546875e+02, 2.329112548828125e+02, 2.665531005859375e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.720555267333984e+02, 1.968017425537109e+02, 2.184200439453125e+02, 2.365937194824219e+02, 2.510361785888672e+02, 2.615196533203125e+02, 2.678787841796875e+02, 2.700133361816406e+02, 2.678895874023438e+02, 2.615410766601562e+02, 2.510679168701172e+02, 2.3663525390625e+02, 2.184707183837889e+02, 1.968607635498045e+02, 1.72146179199219e+02, 1.447167816162109e+02, 1.150050811767578e+02, 8.347971343994141e+01, 5.063779067993164e+01, 1.6997314453125e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.079999755859375e+03, 9.015114593505859e+01, 7.135609436035156e+01, 4.392023468017556e+01, 1.919826889038106e+01, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 7.134703063964844e+01, 1.009949035644531e+02, 1.325202484130859e+02, 1.653621826171875e+02, 1.99002685546875e+02, 2.329112396240234e+02, 2.665531005859375e+02, 1.972265745280311e-04, 1.972265745280311e-04, 1.972265745280311e-04, 1.720555572509766e+02, 1.968017730712891e+02, 2.184200286865234e+02, 2.365937194824219e+02, 2.510361785888672e+02, 2.615196533203125e+02, 2.678787841796875e+02, 2.700133361816406e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_u.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_u.txt
index ab3ab10426..c50faf99c1 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_u.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_AirHeater_u.txt
@@ -1,14 +1,14 @@
-last-generated=2022-09-09
+last-generated=2024-09-11
 statistics-simulation=
 {
   "linear": "0, 0",
   "nonlinear": " ",
-  "number of continuous time states": "9",
+  "number of continuous time states": "8",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
-TVol.T=[2.891499938964844e+02, 2.891552429199219e+02, 2.891502380371094e+02, 2.891507873535156e+02, 2.891510314941406e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.891520690917969e+02, 2.891521301269531e+02, 2.891521606445312e+02, 2.891802368164062e+02, 2.893769836425781e+02, 2.925571594238281e+02, 2.931549377441406e+02, 2.9315087890625e+02, 2.931517028808594e+02, 2.931514892578125e+02, 2.931523132324219e+02, 2.932249450683594e+02, 2.933702087402344e+02, 2.935420532226562e+02, 2.937080078125e+02, 2.938453369140625e+02, 2.9393798828125e+02, 2.939751281738281e+02, 2.939498291015625e+02, 2.938580627441406e+02, 2.936983947753906e+02, 2.934712829589844e+02, 2.93178955078125e+02, 2.931484680175781e+02, 2.931479797363281e+02, 2.931479187011719e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388244628906e+02, 2.891487121582031e+02, 2.891487121582031e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02, 2.891502685546875e+02, 2.891505126953125e+02, 2.891507873535156e+02, 2.891510314941406e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.891520690917969e+02, 2.891521301269531e+02, 2.891521911621094e+02, 2.891802368164062e+02, 2.89376953125e+02, 2.9255712890625e+02, 2.931549377441406e+02, 2.9315087890625e+02, 2.931517028808594e+02, 2.931515197753906e+02, 2.931523132324219e+02, 2.932249450683594e+02, 2.933702087402344e+02, 2.935420837402344e+02, 2.937080993652344e+02, 2.938453979492188e+02, 2.9393798828125e+02, 2.9397509765625e+02, 2.939497985839844e+02, 2.938580322265625e+02, 2.936983642578125e+02, 2.934712524414062e+02, 2.931789245605469e+02, 2.931484680175781e+02, 2.931479797363281e+02, 2.931479187011719e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388549804688e+02, 2.891487121582031e+02, 2.891487121582031e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02]
-THeaOut.T=[2.891499938964844e+02, 2.905536193847656e+02, 2.904776306152344e+02, 2.904240417480469e+02, 2.903511962890625e+02, 2.902593994140625e+02, 2.901500854492188e+02, 2.900249938964844e+02, 2.898860778808594e+02, 2.897355651855469e+02, 2.895758972167969e+02, 2.894093322753906e+02, 2.892388610839844e+02, 2.891783447265625e+02, 2.893721313476562e+02, 2.979071960449219e+02, 2.938721618652344e+02, 2.935129089355469e+02, 2.933744812011719e+02, 2.932490844726562e+02, 2.931520690917969e+02, 2.932228393554688e+02, 2.933672485351562e+02, 2.935389404296875e+02, 2.937052307128906e+02, 2.938432006835938e+02, 2.93936767578125e+02, 2.939750061035156e+02, 2.939508361816406e+02, 2.938602905273438e+02, 2.937018432617188e+02, 2.934759521484375e+02, 2.931847534179688e+02, 2.935198669433594e+02, 2.936596069335938e+02, 2.938193664550781e+02, 2.939857788085938e+02, 2.941563415527344e+02, 2.943282775878906e+02, 2.944989013671875e+02, 2.924078063964844e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.900108947753906e+02, 2.901439208984375e+02, 2.902560424804688e+02, 2.903484497070312e+02, 2.904219360351562e+02, 2.904754333496094e+02, 2.905079650878906e+02, 2.905191345214844e+02, 2.905087280273438e+02, 2.904768676757812e+02, 2.90424072265625e+02, 2.903511962890625e+02, 2.902593688964844e+02, 2.901500549316406e+02, 2.900249633789062e+02, 2.898860473632812e+02, 2.897355651855469e+02, 2.895758361816406e+02, 2.894093933105469e+02, 2.892388305664062e+02, 2.891783447265625e+02, 2.893721008300781e+02, 2.979071350097656e+02, 2.938721008300781e+02, 2.935129089355469e+02, 2.9337451171875e+02, 2.932490844726562e+02, 2.93152099609375e+02, 2.932228698730469e+02, 2.933672790527344e+02, 2.935389709472656e+02, 2.93705322265625e+02, 2.938432922363281e+02, 2.93936767578125e+02, 2.939749755859375e+02, 2.939508056640625e+02, 2.938602905273438e+02, 2.937018127441406e+02, 2.934759216308594e+02, 2.931847229003906e+02, 2.935198974609375e+02, 2.936595764160156e+02, 2.938193359375e+02, 2.9398583984375e+02, 2.941563415527344e+02, 2.943282775878906e+02, 2.944989013671875e+02, 2.924078063964844e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.900111694335938e+02, 2.901439514160156e+02, 2.902559814453125e+02, 2.903484191894531e+02, 2.904219055175781e+02, 2.904754333496094e+02, 2.905080871582031e+02, 2.905192260742188e+02]
-hea.Q_flow=[0e+00, 2.735514221191406e+02, 2.617113037109375e+02, 2.508968353271484e+02, 2.364153747558594e+02, 2.181974334716797e+02, 1.965350799560547e+02, 1.717710266113281e+02, 1.442973937988281e+02, 1.145487823486328e+02, 8.300736999511719e+01, 5.012900161743164e+01, 1.649262809753418e+01, 0e+00, 0e+00, 1.08e+03, 1.365176544189453e+02, 7.117188262939447e+01, 4.346327590942383e+01, 1.882695198059082e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.34969482421875e+01, 1.014662399291993e+02, 1.330014495849608e+02, 1.658595581054688e+02, 1.995128936767578e+02, 2.334257965087891e+02, 2.670628662109375e+02, 0e+00, 0e+00, 0e+00, 1.753006134033203e+02, 1.966798553466797e+02, 2.187508850097656e+02, 2.368733673095703e+02, 2.512481384277344e+02, 2.616699829101562e+02, 2.679632263183594e+02, 2.700367736816406e+02, 2.678497619628906e+02, 2.61437255859375e+02, 2.509042663574219e+02, 2.364088592529297e+02, 2.18188751220703e+02, 1.965268707275389e+02, 1.717659606933596e+02, 1.442959289550781e+02, 1.145514831542969e+02, 8.2998046875e+01, 5.013766479492188e+01, 1.648542404174805e+01, 0e+00, 0e+00, 1.08e+03, 1.36507080078125e+02, 7.117445373535156e+01, 4.347165298461893e+01, 1.882853889465352e+01, 5.506706202140776e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.350254058837891e+01, 1.014616394042969e+02, 1.32999755859375e+02, 1.658681182861328e+02, 1.995161437988281e+02, 2.334267730712891e+02, 2.670628662109375e+02, 0e+00, 0e+00, 0e+00, 1.753413848876953e+02, 1.966874694824219e+02, 2.187425384521484e+02, 2.368647918701172e+02, 2.512443542480469e+02, 2.616670532226562e+02, 2.679816284179688e+02, 2.700491027832031e+02]
+TVol.T=[2.891499938964844e+02, 2.891551818847656e+02, 2.891502380371094e+02, 2.891507873535156e+02, 2.891510314941406e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.891520690917969e+02, 2.891521301269531e+02, 2.891521911621094e+02, 2.891802368164062e+02, 2.89376953125e+02, 2.9255712890625e+02, 2.931549377441406e+02, 2.9315087890625e+02, 2.931517028808594e+02, 2.931514892578125e+02, 2.931523132324219e+02, 2.932249450683594e+02, 2.933702087402344e+02, 2.935420227050781e+02, 2.937079772949219e+02, 2.938452758789062e+02, 2.939379272460938e+02, 2.9397509765625e+02, 2.939497985839844e+02, 2.938580627441406e+02, 2.936983947753906e+02, 2.934712829589844e+02, 2.931789245605469e+02, 2.931484375e+02, 2.931479797363281e+02, 2.931479187011719e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388244628906e+02, 2.891487121582031e+02, 2.891487121582031e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02, 2.891502685546875e+02, 2.891505126953125e+02, 2.891507873535156e+02, 2.891510314941406e+02, 2.891512756347656e+02, 2.891514892578125e+02, 2.891516723632812e+02, 2.891518249511719e+02, 2.891519775390625e+02, 2.891520690917969e+02, 2.891521301269531e+02, 2.891521911621094e+02, 2.891802368164062e+02, 2.893768920898438e+02, 2.9255712890625e+02, 2.931549682617188e+02, 2.931509094238281e+02, 2.931517028808594e+02, 2.931515197753906e+02, 2.9315234375e+02, 2.932249145507812e+02, 2.933701782226562e+02, 2.935420532226562e+02, 2.937080688476562e+02, 2.938453674316406e+02, 2.939380187988281e+02, 2.939751586914062e+02, 2.939498291015625e+02, 2.938580932617188e+02, 2.936983947753906e+02, 2.934712829589844e+02, 2.93178955078125e+02, 2.931484375e+02, 2.931479797363281e+02, 2.9314794921875e+02, 2.931478576660156e+02, 2.931478271484375e+02, 2.931478271484375e+02, 2.931478576660156e+02, 2.923747253417969e+02, 2.907518615722656e+02, 2.894662170410156e+02, 2.891388244628906e+02, 2.891487121582031e+02, 2.891487121582031e+02, 2.8914892578125e+02, 2.89149169921875e+02, 2.891494445800781e+02, 2.891497192382812e+02, 2.891499938964844e+02]
+THeaOut.T=[2.891499938964844e+02, 2.905537414550781e+02, 2.904776306152344e+02, 2.90424072265625e+02, 2.903512268066406e+02, 2.902593383789062e+02, 2.901500549316406e+02, 2.900249328613281e+02, 2.898860778808594e+02, 2.897355346679688e+02, 2.895758056640625e+02, 2.894093933105469e+02, 2.892388610839844e+02, 2.891783142089844e+02, 2.893721008300781e+02, 2.979071350097656e+02, 2.938719177246094e+02, 2.935129089355469e+02, 2.933745727539062e+02, 2.932490844726562e+02, 2.931520690917969e+02, 2.932228393554688e+02, 2.933672485351562e+02, 2.935389099121094e+02, 2.937052001953125e+02, 2.938431701660156e+02, 2.939367370605469e+02, 2.939749450683594e+02, 2.939508056640625e+02, 2.938602905273438e+02, 2.937018432617188e+02, 2.934759216308594e+02, 2.931847229003906e+02, 2.9352001953125e+02, 2.936595764160156e+02, 2.938193359375e+02, 2.939858093261719e+02, 2.941563415527344e+02, 2.943282775878906e+02, 2.944989318847656e+02, 2.924077758789062e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.900109558105469e+02, 2.901439208984375e+02, 2.902559509277344e+02, 2.903484497070312e+02, 2.904219665527344e+02, 2.904754333496094e+02, 2.905079650878906e+02, 2.905190734863281e+02, 2.905086059570312e+02, 2.904768676757812e+02, 2.904241027832031e+02, 2.903511657714844e+02, 2.902593688964844e+02, 2.901500549316406e+02, 2.900249328613281e+02, 2.898860473632812e+02, 2.897355651855469e+02, 2.895758361816406e+02, 2.894093933105469e+02, 2.892388305664062e+02, 2.891783447265625e+02, 2.893720397949219e+02, 2.979071350097656e+02, 2.938720397949219e+02, 2.935128784179688e+02, 2.9337451171875e+02, 2.932491455078125e+02, 2.931520690917969e+02, 2.932228393554688e+02, 2.933672180175781e+02, 2.935389404296875e+02, 2.937052917480469e+02, 2.9384326171875e+02, 2.939367980957031e+02, 2.939750061035156e+02, 2.939508361816406e+02, 2.938603210449219e+02, 2.937018737792969e+02, 2.934759521484375e+02, 2.931847534179688e+02, 2.935199890136719e+02, 2.936596069335938e+02, 2.938193359375e+02, 2.9398583984375e+02, 2.941563110351562e+02, 2.943283081054688e+02, 2.944989013671875e+02, 2.924077758789062e+02, 2.907777099609375e+02, 2.894869384765625e+02, 2.900109558105469e+02, 2.901439208984375e+02, 2.902559509277344e+02, 2.903484497070312e+02, 2.904219665527344e+02, 2.904754333496094e+02, 2.905079650878906e+02, 2.905190734863281e+02]
+hea.Q_flow=[0e+00, 2.735958862304688e+02, 2.617105712890625e+02, 2.509038696289062e+02, 2.364179534912109e+02, 2.181839599609375e+02, 1.965281524658203e+02, 1.71766357421875e+02, 1.442949371337891e+02, 1.145458145141602e+02, 8.299624633789062e+01, 5.014064407348633e+01, 1.648892974853516e+01, 0e+00, 0e+00, 1.08e+03, 1.364728393554688e+02, 7.117681884765619e+01, 4.348004531860352e+01, 1.882985305786133e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.353244781494141e+01, 1.014623870849611e+02, 1.329996795654295e+02, 1.658634643554688e+02, 1.995107727050781e+02, 2.334243469238281e+02, 2.670653076171875e+02, 0e+00, 0e+00, 0e+00, 1.753096923828125e+02, 1.966810302734375e+02, 2.187359466552734e+02, 2.368690185546875e+02, 2.512538909912109e+02, 2.616748657226562e+02, 2.679658813476562e+02, 2.700269470214844e+02, 2.678269653320312e+02, 2.614382629394531e+02, 2.509086303710938e+02, 2.364043121337891e+02, 2.18192428588867e+02, 1.965289611816404e+02, 1.717624969482424e+02, 1.442917327880859e+02, 1.145506820678711e+02, 8.300197601318359e+01, 5.01392936706543e+01, 1.648337936401367e+01, 0e+00, 0e+00, 1.08e+03, 1.364741821289062e+02, 7.116547393798828e+01, 4.347202301025369e+01, 1.883790588378926e+01, 5.46229728115577e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.353021240234375e+01, 1.014647979736328e+02, 1.329932403564453e+02, 1.658699645996094e+02, 1.995082397460938e+02, 2.334307403564453e+02, 2.6705908203125e+02, 0e+00, 0e+00, 0e+00, 1.753095703125e+02, 1.966810302734375e+02, 2.187359008789062e+02, 2.368690338134766e+02, 2.512538909912109e+02, 2.616748352050781e+02, 2.679658508300781e+02, 2.700268859863281e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
index a53a939504..bbe00a1ad2 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
@@ -1,4 +1,4 @@
-last-generated=2021-06-17
+last-generated=2024-09-11
 statistics-initialization=
 {
   "nonlinear": "0, 1",
@@ -8,17 +8,17 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "0",
-  "number of continuous time states": "4",
+  "number of continuous time states": "3",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+03]
 P.u_s=[3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02]
-P.u_m=[2.931499938964844e+02, 2.974283142089844e+02, 2.991485290527344e+02, 2.999058532714844e+02, 3.000377807617188e+02, 3.001163940429688e+02, 3.00136962890625e+02, 3.001456909179688e+02, 3.001484375e+02, 3.001494750976562e+02, 3.001498107910156e+02, 3.001499328613281e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 2.960359191894531e+02, 2.954528198242188e+02, 2.953340454101562e+02, 2.952472229003906e+02, 2.951998291015625e+02, 2.951758422851562e+02, 2.951634521484375e+02, 2.951570129394531e+02, 2.951536560058594e+02, 2.951519165039062e+02, 2.951510009765625e+02, 2.951505126953125e+02, 2.951502685546875e+02, 2.95150146484375e+02, 2.951500854492188e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02]
+P.u_m=[2.931499938964844e+02, 3.060716552734375e+02, 2.991805419921875e+02, 2.988214111328125e+02, 2.995417175292969e+02, 2.998757629394531e+02, 3.000271606445312e+02, 3.000950927734375e+02, 3.001255187988281e+02, 3.001390686035156e+02, 3.001451416015625e+02, 3.001478271484375e+02, 3.001490173339844e+02, 3.001495666503906e+02, 3.001498107910156e+02, 3.0014990234375e+02, 3.001499633789062e+02, 3.001499633789062e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001500244140625e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 2.960516662597656e+02, 2.954137878417969e+02, 2.953138122558594e+02, 2.952525024414062e+02, 2.952144470214844e+02, 2.951906433105469e+02, 2.951756896972656e+02, 2.951662292480469e+02, 2.951602783203125e+02, 2.951565246582031e+02, 2.951541137695312e+02, 2.951526184082031e+02, 2.951516418457031e+02, 2.951510620117188e+02, 2.951506652832031e+02, 2.951504211425781e+02, 2.951502685546875e+02, 2.951501770019531e+02, 2.951501159667969e+02, 2.951500549316406e+02, 2.951500549316406e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02]
 hex.sta_a1.T=[3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02, 3.331499938964844e+02]
-hex.sta_b1.T=[3.224120178222656e+02, 3.051754150390625e+02, 3.077341918945312e+02, 3.085609130859375e+02, 3.087298889160156e+02, 3.088188781738281e+02, 3.088434448242188e+02, 3.08853515625e+02, 3.08856689453125e+02, 3.0885791015625e+02, 3.088583068847656e+02, 3.088584594726562e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585510253906e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.015717163085938e+02, 2.990910949707031e+02, 2.984875183105469e+02, 2.980413513183594e+02, 2.977983703613281e+02, 2.976754455566406e+02, 2.976119689941406e+02, 2.975789184570312e+02, 2.975617065429688e+02, 2.97552734375e+02, 2.975480651855469e+02, 2.975456237792969e+02, 2.975443420410156e+02, 2.97543701171875e+02, 2.975433654785156e+02, 2.975431518554688e+02, 2.975430603027344e+02, 2.975430297851562e+02, 2.975429992675781e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02]
+hex.sta_b1.T=[3.224120178222656e+02, 3.153963317871094e+02, 3.074909362792969e+02, 3.072661437988281e+02, 3.081383666992188e+02, 3.085355224609375e+02, 3.08714111328125e+02, 3.087941284179688e+02, 3.088298034667969e+02, 3.088457336425781e+02, 3.088528137207031e+02, 3.088559875488281e+02, 3.088573913574219e+02, 3.088580322265625e+02, 3.088583068847656e+02, 3.088584289550781e+02, 3.088584899902344e+02, 3.088584899902344e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585205078125e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.088585510253906e+02, 3.015429992675781e+02, 2.988956298828125e+02, 2.983867797851562e+02, 2.980715942382812e+02, 2.978753356933594e+02, 2.977525024414062e+02, 2.976753234863281e+02, 2.976266479492188e+02, 2.975959167480469e+02, 2.975765075683594e+02, 2.97564208984375e+02, 2.975564270019531e+02, 2.975514831542969e+02, 2.975483703613281e+02, 2.9754638671875e+02, 2.975451354980469e+02, 2.975443420410156e+02, 2.975438232421875e+02, 2.975435180664062e+02, 2.975433044433594e+02, 2.975431823730469e+02, 2.975430908203125e+02, 2.975430297851562e+02, 2.975429992675781e+02, 2.975429992675781e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02, 2.9754296875e+02]
 hex.sta_a2.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-hex.sta_b2.T=[3.122243957519531e+02, 2.973334045410156e+02, 2.992259826660156e+02, 2.999028930664062e+02, 3.000429992675781e+02, 3.001169738769531e+02, 3.001374206542969e+02, 3.001458129882812e+02, 3.001484680175781e+02, 3.001494750976562e+02, 3.001498107910156e+02, 3.001499328613281e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 2.959891967773438e+02, 2.954486389160156e+02, 2.953310852050781e+02, 2.952453918457031e+02, 2.951989135742188e+02, 2.951753845214844e+02, 2.951632385253906e+02, 2.951568908691406e+02, 2.951535949707031e+02, 2.951518859863281e+02, 2.951509704589844e+02, 2.951505126953125e+02, 2.951502685546875e+02, 2.95150146484375e+02, 2.951500854492188e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02]
-hex.Q1_flow=[-2.03193328125e+05, -4.456452734375e+04, -6.472556640625e+04, -7.1936234375e+04, -7.34287109375e+04, -7.4217e+04, -7.44346875e+04, -7.45240234375e+04, -7.4552421875e+04, -7.4563109375e+04, -7.45667578125e+04, -7.4567984375e+04, -7.4568484375e+04, -7.4568578125e+04, -7.45686484375e+04, -7.4568703125e+04, -7.4568671875e+04, -7.4568671875e+04, -7.45686796875e+04, -7.45686875e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -3.0244904296875e+04, -2.4486568359375e+04, -2.32342578125e+04, -2.2321564453125e+04, -2.1826306640625e+04, -2.157566015625e+04, -2.1446205078125e+04, -2.1378751953125e+04, -2.1343609375e+04, -2.13253046875e+04, -2.1315751953125e+04, -2.1310771484375e+04, -2.1308171875e+04, -2.1306837890625e+04, -2.1306142578125e+04, -2.130574609375e+04, -2.1305552734375e+04, -2.13054609375e+04, -2.130539453125e+04, -2.1305369140625e+04, -2.1305361328125e+04, -2.130534375e+04, -2.1305333984375e+04, -2.1305333984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.1305337890625e+04, -2.130533203125e+04, -2.1305333984375e+04, -2.1305333984375e+04, -2.1305337890625e+04, -2.130533984375e+04, -2.1305341796875e+04, -2.130533984375e+04, -2.1305337890625e+04, -2.1305337890625e+04, -2.1305337890625e+04, -2.1305337890625e+04, -2.130533984375e+04, -2.1305341796875e+04, -2.1305341796875e+04, -2.1305341796875e+04, -2.1305341796875e+04, -2.1305341796875e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.1305337890625e+04, -2.130533984375e+04, -2.130533984375e+04]
-hex.Q2_flow=[2.03193328125e+05, 4.456452734375e+04, 6.472556640625e+04, 7.1936234375e+04, 7.34287109375e+04, 7.4217e+04, 7.44346875e+04, 7.45240234375e+04, 7.4552421875e+04, 7.4563109375e+04, 7.45667578125e+04, 7.4567984375e+04, 7.4568484375e+04, 7.4568578125e+04, 7.45686484375e+04, 7.4568703125e+04, 7.4568671875e+04, 7.4568671875e+04, 7.45686796875e+04, 7.45686875e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 3.0244904296875e+04, 2.4486568359375e+04, 2.32342578125e+04, 2.2321564453125e+04, 2.1826306640625e+04, 2.157566015625e+04, 2.1446205078125e+04, 2.1378751953125e+04, 2.1343609375e+04, 2.13253046875e+04, 2.1315751953125e+04, 2.1310771484375e+04, 2.1308171875e+04, 2.1306837890625e+04, 2.1306142578125e+04, 2.130574609375e+04, 2.1305552734375e+04, 2.13054609375e+04, 2.130539453125e+04, 2.1305369140625e+04, 2.1305361328125e+04, 2.130534375e+04, 2.1305333984375e+04, 2.1305333984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.1305337890625e+04, 2.130533203125e+04, 2.1305333984375e+04, 2.1305333984375e+04, 2.1305337890625e+04, 2.130533984375e+04, 2.1305341796875e+04, 2.130533984375e+04, 2.1305337890625e+04, 2.1305337890625e+04, 2.1305337890625e+04, 2.1305337890625e+04, 2.130533984375e+04, 2.1305341796875e+04, 2.1305341796875e+04, 2.1305341796875e+04, 2.1305341796875e+04, 2.1305341796875e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.1305337890625e+04, 2.130533984375e+04, 2.130533984375e+04]
-hex.m1_flow=[4.522670269012451e+00, 3.807449340820312e-01, 6.0866779088974e-01, 6.992195844650269e-01, 7.186655402183533e-01, 7.290374040603638e-01, 7.319140434265137e-01, 7.33096182346344e-01, 7.334721684455872e-01, 7.336136698722839e-01, 7.336620092391968e-01, 7.336781620979309e-01, 7.336848378181458e-01, 7.336861491203308e-01, 7.336870431900024e-01, 7.336877584457397e-01, 7.336872816085815e-01, 7.336872816085815e-01, 7.336874008178711e-01, 7.336875200271606e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 2.289137095212936e-01, 1.718326210975647e-01, 1.602055579423904e-01, 1.519563645124435e-01, 1.475636214017868e-01, 1.453634798526764e-01, 1.442332714796066e-01, 1.436460167169571e-01, 1.43340528011322e-01, 1.431815177202225e-01, 1.430985629558563e-01, 1.43055334687233e-01, 1.430327594280243e-01, 1.430211812257767e-01, 1.430151611566544e-01, 1.430117189884186e-01, 1.430100351572037e-01, 1.430092453956604e-01, 1.430086642503738e-01, 1.430084407329559e-01, 1.430083811283112e-01, 1.430082321166992e-01, 1.430081278085709e-01, 1.430081427097321e-01, 1.430081874132156e-01, 1.430082023143768e-01, 1.430081725120544e-01, 1.430081278085709e-01, 1.430081427097321e-01, 1.430081278085709e-01, 1.430081725120544e-01, 1.430081874132156e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430081725120544e-01, 1.430081725120544e-01, 1.430081725120544e-01, 1.430081725120544e-01, 1.430081874132156e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01]
+hex.sta_b2.T=[3.122243957519531e+02, 3.058585205078125e+02, 2.990297546386719e+02, 2.988497314453125e+02, 2.995550842285156e+02, 2.998818664550781e+02, 3.000298767089844e+02, 3.000963745117188e+02, 3.001260681152344e+02, 3.001393127441406e+02, 3.001452331542969e+02, 3.001478881835938e+02, 3.001490478515625e+02, 3.001495666503906e+02, 3.001498107910156e+02, 3.0014990234375e+02, 3.001499633789062e+02, 3.001499633789062e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001500244140625e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 3.001499938964844e+02, 2.959820251464844e+02, 2.954102783203125e+02, 2.953116760253906e+02, 2.952511901855469e+02, 2.95213623046875e+02, 2.951901245117188e+02, 2.951753540039062e+02, 2.951660461425781e+02, 2.9516015625e+02, 2.951564331054688e+02, 2.951540832519531e+02, 2.95152587890625e+02, 2.951516418457031e+02, 2.951510314941406e+02, 2.951506652832031e+02, 2.951504211425781e+02, 2.951502685546875e+02, 2.951501770019531e+02, 2.951501159667969e+02, 2.951500549316406e+02, 2.951500549316406e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951500244140625e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02]
+hex.Q1_flow=[-2.03193328125e+05, -1.3537975e+05, -6.26350546875e+04, -6.07172734375e+04, -6.82312578125e+04, -7.17125078125e+04, -7.3289125e+04, -7.3997546875e+04, -7.4313671875e+04, -7.44549765625e+04, -7.4517953125e+04, -7.4546046875e+04, -7.45585703125e+04, -7.4564109375e+04, -7.4566625e+04, -7.4567765625e+04, -7.4568234375e+04, -7.456840625e+04, -7.45685078125e+04, -7.4568625e+04, -7.45687734375e+04, -7.4568796875e+04, -7.45687578125e+04, -7.4568703125e+04, -7.45686328125e+04, -7.45686171875e+04, -7.45686015625e+04, -7.45686328125e+04, -7.456865625e+04, -7.45686796875e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686875e+04, -7.45686875e+04, -7.45686796875e+04, -7.4568671875e+04, -7.45686796875e+04, -7.4568671875e+04, -7.4568671875e+04, -7.45686796875e+04, -7.45686796875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686875e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -7.45686953125e+04, -3.0168736328125e+04, -2.4077876953125e+04, -2.3027529296875e+04, -2.2383248046875e+04, -2.19831484375e+04, -2.173280859375e+04, -2.1575423828125e+04, -2.1476169921875e+04, -2.141347265625e+04, -2.13738125e+04, -2.1348712890625e+04, -2.13328203125e+04, -2.1322751953125e+04, -2.1316373046875e+04, -2.13123359375e+04, -2.13097734375e+04, -2.1308150390625e+04, -2.130712890625e+04, -2.1306466796875e+04, -2.13060625e+04, -2.1305791015625e+04, -2.130562890625e+04, -2.1305505859375e+04, -2.1305439453125e+04, -2.13053984375e+04, -2.1305375e+04, -2.130536328125e+04, -2.130535546875e+04, -2.1305349609375e+04, -2.130534375e+04, -2.1305341796875e+04, -2.130533984375e+04, -2.1305337890625e+04, -2.130533984375e+04, -2.130533984375e+04, -2.1305341796875e+04, -2.1305341796875e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.130533984375e+04, -2.1305341796875e+04, -2.130534375e+04, -2.130534375e+04, -2.130534375e+04, -2.130534765625e+04, -2.13053515625e+04]
+hex.Q2_flow=[2.03193328125e+05, 1.3537975e+05, 6.26350546875e+04, 6.07172734375e+04, 6.82312578125e+04, 7.17125078125e+04, 7.3289125e+04, 7.3997546875e+04, 7.4313671875e+04, 7.44549765625e+04, 7.4517953125e+04, 7.4546046875e+04, 7.45585703125e+04, 7.4564109375e+04, 7.4566625e+04, 7.4567765625e+04, 7.4568234375e+04, 7.456840625e+04, 7.45685078125e+04, 7.4568625e+04, 7.45687734375e+04, 7.4568796875e+04, 7.45687578125e+04, 7.4568703125e+04, 7.45686328125e+04, 7.45686171875e+04, 7.45686015625e+04, 7.45686328125e+04, 7.456865625e+04, 7.45686796875e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686875e+04, 7.45686875e+04, 7.45686796875e+04, 7.4568671875e+04, 7.45686796875e+04, 7.4568671875e+04, 7.4568671875e+04, 7.45686796875e+04, 7.45686796875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686875e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 7.45686953125e+04, 3.0168736328125e+04, 2.4077876953125e+04, 2.3027529296875e+04, 2.2383248046875e+04, 2.19831484375e+04, 2.173280859375e+04, 2.1575423828125e+04, 2.1476169921875e+04, 2.141347265625e+04, 2.13738125e+04, 2.1348712890625e+04, 2.13328203125e+04, 2.1322751953125e+04, 2.1316373046875e+04, 2.13123359375e+04, 2.13097734375e+04, 2.1308150390625e+04, 2.130712890625e+04, 2.1306466796875e+04, 2.13060625e+04, 2.1305791015625e+04, 2.130562890625e+04, 2.1305505859375e+04, 2.1305439453125e+04, 2.13053984375e+04, 2.1305375e+04, 2.130536328125e+04, 2.130535546875e+04, 2.1305349609375e+04, 2.130534375e+04, 2.1305341796875e+04, 2.130533984375e+04, 2.1305337890625e+04, 2.130533984375e+04, 2.130533984375e+04, 2.1305341796875e+04, 2.1305341796875e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.130533984375e+04, 2.1305341796875e+04, 2.130534375e+04, 2.130534375e+04, 2.130534375e+04, 2.130534765625e+04, 2.13053515625e+04]
+hex.m1_flow=[4.522670269012451e+00, 1.822526574134827e+00, 5.834247469902039e-01, 5.606500506401062e-01, 6.520033478736877e-01, 6.96325957775116e-01, 7.168362140655518e-01, 7.261428236961365e-01, 7.303142547607422e-01, 7.321824431419373e-01, 7.330158352851868e-01, 7.333877682685852e-01, 7.335535883903503e-01, 7.336269021034241e-01, 7.336602210998535e-01, 7.336753606796265e-01, 7.336814999580383e-01, 7.336837649345398e-01, 7.336851954460144e-01, 7.336867451667786e-01, 7.336886525154114e-01, 7.3368901014328e-01, 7.336884140968323e-01, 7.336877584457397e-01, 7.336868047714233e-01, 7.33686625957489e-01, 7.336864471435547e-01, 7.336867451667786e-01, 7.336870431900024e-01, 7.336874008178711e-01, 7.336875796318054e-01, 7.336876392364502e-01, 7.336876392364502e-01, 7.336875796318054e-01, 7.336875200271606e-01, 7.336874604225159e-01, 7.336873412132263e-01, 7.336874008178711e-01, 7.336874008178711e-01, 7.336874008178711e-01, 7.336874604225159e-01, 7.336874604225159e-01, 7.336875200271606e-01, 7.336875200271606e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336875796318054e-01, 7.336876392364502e-01, 7.336876392364502e-01, 7.336876392364502e-01, 7.33687698841095e-01, 2.281298786401749e-01, 1.680004894733429e-01, 1.583199501037598e-01, 1.525076478719711e-01, 1.489482522010803e-01, 1.467410773038864e-01, 1.453614085912704e-01, 1.44494503736496e-01, 1.439481526613235e-01, 1.436030566692352e-01, 1.433848589658737e-01, 1.432467848062515e-01, 1.43159344792366e-01, 1.431039571762085e-01, 1.430689245462418e-01, 1.430466771125793e-01, 1.4303258061409e-01, 1.430237144231796e-01, 1.4301797747612e-01, 1.430144608020782e-01, 1.430121064186096e-01, 1.430107057094574e-01, 1.430096328258514e-01, 1.430090516805649e-01, 1.430086940526962e-01, 1.430085003376007e-01, 1.430083960294724e-01, 1.430083215236664e-01, 1.430082768201828e-01, 1.430082321166992e-01, 1.430082023143768e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430082023143768e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430081874132156e-01, 1.430082023143768e-01, 1.43008217215538e-01, 1.430082321166992e-01, 1.430082321166992e-01, 1.430082619190216e-01, 1.430082768201828e-01]
 hex.m2_flow=[1.05e+01, 1.05e+01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterCooler_T.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
index 27d8085a24..86eed35918 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterCooler_T.txt
@@ -1,15 +1,15 @@
-last-generated=2022-11-30
+last-generated=2024-09-19
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 TOut.y=[2.901499938964844e+02, 2.901894226074219e+02, 2.903070983886719e+02, 2.905011291503906e+02, 2.907684631347656e+02, 2.911049194335938e+02, 2.915051574707031e+02, 2.91962890625e+02, 2.924708557128906e+02, 2.930211181640625e+02, 2.936049194335938e+02, 2.942131042480469e+02, 2.948360595703125e+02, 2.954639587402344e+02, 2.960869140625e+02, 2.966950988769531e+02, 2.972789001464844e+02, 2.978291320800781e+02, 2.983371276855469e+02, 2.987948303222656e+02, 2.991950988769531e+02, 2.995315246582031e+02, 2.997988891601562e+02, 2.99992919921875e+02, 3.001105651855469e+02, 3.001499938964844e+02, 3.001105651855469e+02, 2.99992919921875e+02, 2.997988891601562e+02, 2.995315246582031e+02, 2.991950988769531e+02, 2.987948303222656e+02, 2.983371276855469e+02, 2.978291320800781e+02, 2.972789001464844e+02, 2.966950988769531e+02, 2.960869140625e+02, 2.954639587402344e+02, 2.948360595703125e+02, 2.942131042480469e+02, 2.936049194335938e+02, 2.930211181640625e+02, 2.924708557128906e+02, 2.91962890625e+02, 2.915051574707031e+02, 2.911049194335938e+02, 2.907684631347656e+02, 2.905011291503906e+02, 2.903070983886719e+02, 2.901894226074219e+02, 2.901499938964844e+02, 2.901894226074219e+02, 2.903070983886719e+02, 2.905011291503906e+02, 2.907684631347656e+02, 2.911049194335938e+02, 2.915051574707031e+02, 2.91962890625e+02, 2.924708557128906e+02, 2.930211181640625e+02, 2.936049194335938e+02, 2.942131042480469e+02, 2.948360595703125e+02, 2.954639587402344e+02, 2.960869140625e+02, 2.966950988769531e+02, 2.972789001464844e+02, 2.978291320800781e+02, 2.983371276855469e+02, 2.987948303222656e+02, 2.991950988769531e+02, 2.995315246582031e+02, 2.997988891601562e+02, 2.99992919921875e+02, 3.001105651855469e+02, 3.001499938964844e+02, 3.001105651855469e+02, 2.99992919921875e+02, 2.997988891601562e+02, 2.995315246582031e+02, 2.991950988769531e+02, 2.987948303222656e+02, 2.983371276855469e+02, 2.978291320800781e+02, 2.972789001464844e+02, 2.966950988769531e+02, 2.960869140625e+02, 2.954639587402344e+02, 2.948360595703125e+02, 2.942131042480469e+02, 2.936049194335938e+02, 2.930211181640625e+02, 2.924708557128906e+02, 2.91962890625e+02, 2.915051574707031e+02, 2.911049194335938e+02, 2.907684631347656e+02, 2.905011291503906e+02, 2.903070983886719e+02, 2.901894226074219e+02, 2.901499938964844e+02]
-TVol.T=[2.891499938964844e+02, 2.890717468261719e+02, 2.891900329589844e+02, 2.891500854492188e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902336120605469e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909912109375e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056030273438e+02, 2.903829956054688e+02, 2.890553283691406e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902336120605469e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909912109375e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056030273438e+02, 2.903829956054688e+02, 2.890553283691406e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
+TVol.T=[2.891499938964844e+02, 2.890717163085938e+02, 2.891900024414062e+02, 2.891500854492188e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902336120605469e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909912109375e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056030273438e+02, 2.903829956054688e+02, 2.890553283691406e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.894725952148438e+02, 2.902336120605469e+02, 2.909750061035156e+02, 2.916949768066406e+02, 2.923909912109375e+02, 2.930599365234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.923056030273438e+02, 2.903829956054688e+02, 2.890553283691406e+02, 2.891507568359375e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 THeaOut.T=[2.891499938964844e+02, 2.890716552734375e+02, 2.8918994140625e+02, 2.891495056152344e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 2.894721374511719e+02, 2.90233154296875e+02, 2.90974609375e+02, 2.91694580078125e+02, 2.923905944824219e+02, 2.930595703125e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.922979125976562e+02, 2.903752136230469e+02, 2.890551147460938e+02, 2.891494750976562e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02, 2.891495361328125e+02, 2.891494750976562e+02, 2.891494140625e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 2.894721374511719e+02, 2.90233154296875e+02, 2.90974609375e+02, 2.91694580078125e+02, 2.923905944824219e+02, 2.930595703125e+02, 2.931471862792969e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.922979125976562e+02, 2.903752136230469e+02, 2.890551147460938e+02, 2.891494750976562e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02]
-coo.TSet=[2.831499938964844e+02, 3.031499938964844e+02, 3.003883972167969e+02, 2.891494445800781e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931471557617188e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962586975097656e+02, 2.891494140625e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02, 2.891495361328125e+02, 2.891494750976562e+02, 2.891494140625e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931472473144531e+02, 2.931470031738281e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962587585449219e+02, 2.891494140625e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02]
-coo.Q_flow=[-0e+00, -1.129679977893829e-01, -1.129679977893829e-01, -6.817494964599609e+01, -8.0923095703125e+01, -9.774171447753906e+01, -1.177551498413086e+02, -1.406342010498047e+02, -1.660401153564453e+02, -1.935538330078125e+02, -2.227446899414062e+02, -2.531539154052734e+02, -2.843019104003906e+02, -3.156974792480469e+02, -3.468453369140626e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.197896728515625e+02, -3.324442749023438e+02, -3.421456298828125e+02, -3.48017822265625e+02, -3.499991760253906e+02, -3.480289916992188e+02, -3.421590881347656e+02, -3.324662170410156e+02, -3.190772094726562e+02, -3.022598876953125e+02, -2.822443542480469e+02, -2.593638916015625e+02, -2.339666900634766e+02, -2.064564361572264e+02, -1.77277557373047e+02, -1.468378295898438e+02, -1.156975860595703e+02, -8.431132507324219e+01, -5.315418243408203e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.455722808837891e+02, -1.177578125e+02, -9.774576568603516e+01, -8.092311096191406e+01, -6.755137634277344e+01, -5.784880447387695e+01, -5.196857070922852e+01, -4.999994277954102e+01, -5.196603775024414e+01, -5.784777069091797e+01, -6.754628753662109e+01, -8.090171051025391e+01, -9.774118041992203e+01, -1.177484436035158e+02, -1.406451416015623e+02, -1.660469360351562e+02, -1.935571441650391e+02, -2.227523040771484e+02, -2.531566619873047e+02, -2.8431005859375e+02, -3.156994323730469e+02, -3.468535766601562e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.189697570800781e+02, -3.3223583984375e+02, -3.421458435058594e+02, -3.480147399902344e+02, -3.499825744628906e+02, -3.480397033691406e+02, -3.421617431640625e+02, -3.324490966796875e+02, -3.190840148925781e+02, -3.022595520019531e+02, -2.822423400878906e+02, -2.593607177734375e+02, -2.339665069580078e+02, -2.06459716796875e+02, -1.772736206054688e+02, -1.468679809570312e+02, -1.157217636108398e+02, -8.429972076416016e+01, -5.315471267700195e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.451734466552734e+02, -1.177648086547852e+02, -9.774623870849609e+01, -8.092345428466797e+01, -6.755821228027344e+01, -5.786182022094727e+01, -5.196845626831055e+01, -4.999625396728516e+01]
+coo.TSet=[2.831499938964844e+02, 3.031499938964844e+02, 3.003905334472656e+02, 2.891494750976562e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.93147216796875e+02, 2.931470642089844e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962585754394531e+02, 2.891494445800781e+02, 2.891489562988281e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02, 2.891495361328125e+02, 2.891494750976562e+02, 2.891494140625e+02, 2.891492919921875e+02, 2.891491394042969e+02, 2.891489562988281e+02, 2.891487426757812e+02, 2.891485290527344e+02, 2.891482849121094e+02, 2.891480407714844e+02, 2.891477661132812e+02, 2.891474914550781e+02, 2.89147216796875e+02, 2.891469421386719e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931471862792969e+02, 2.931470336914062e+02, 2.9314697265625e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.931469116210938e+02, 2.9314697265625e+02, 2.931470642089844e+02, 2.931471862792969e+02, 2.931473388671875e+02, 2.931474914550781e+02, 2.93147705078125e+02, 2.931479187011719e+02, 2.931481628417969e+02, 2.931484375e+02, 2.931487121582031e+02, 2.931489868164062e+02, 2.931492614746094e+02, 2.931495361328125e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.962586975097656e+02, 2.891494140625e+02, 2.891489868164062e+02, 2.891491394042969e+02, 2.891492919921875e+02, 2.891494140625e+02, 2.891494750976562e+02, 2.891495361328125e+02, 2.891495666503906e+02]
+coo.Q_flow=[-0e+00, -1.129679977893829e-01, -1.129679977893829e-01, -6.816161346435547e+01, -8.092326354980469e+01, -9.774567413330078e+01, -1.177576065063477e+02, -1.406430969238282e+02, -1.660431365966797e+02, -1.935425262451172e+02, -2.227426300048828e+02, -2.531428527832031e+02, -2.842998352050781e+02, -3.156939697265625e+02, -3.468459777832032e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.194328002929688e+02, -3.324442443847656e+02, -3.421457824707031e+02, -3.480290222167969e+02, -3.500005493164062e+02, -3.4803076171875e+02, -3.421533813476562e+02, -3.324556579589843e+02, -3.190812072753906e+02, -3.022593078613281e+02, -2.822514343261719e+02, -2.593609619140625e+02, -2.339574890136719e+02, -2.064511413574218e+02, -1.772579345703126e+02, -1.468458099365234e+02, -1.15700065612793e+02, -8.430316162109375e+01, -5.315437698364258e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.457022552490234e+02, -1.177577972412109e+02, -9.774578094482422e+01, -8.092324066162109e+01, -6.755579376220703e+01, -5.785415649414062e+01, -5.197127532958984e+01, -4.999993515014648e+01, -5.197126007080078e+01, -5.785414505004883e+01, -6.755587768554688e+01, -8.092403411865234e+01, -9.774743652343766e+01, -1.177599792480471e+02, -1.406483459472654e+02, -1.660458374023438e+02, -1.935608062744141e+02, -2.227485198974609e+02, -2.531614685058594e+02, -2.843052368164062e+02, -3.157053833007812e+02, -3.468480529785156e+02, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -1.129679977893829e-01, -3.190503845214844e+02, -3.318486633300781e+02, -3.421458129882812e+02, -3.480206604003906e+02, -3.499996643066406e+02, -3.480352783203125e+02, -3.4215283203125e+02, -3.324532470703125e+02, -3.190820007324219e+02, -3.022564697265625e+02, -2.822460021972656e+02, -2.593622131347656e+02, -2.339608764648438e+02, -2.064460906982422e+02, -1.772564544677734e+02, -1.468481292724609e+02, -1.15698844909668e+02, -8.430246734619141e+01, -5.315469741821289e+01, -9.998870239257812e+02, -9.998870239257812e+02, -1.129679977893829e-01, -1.456959381103516e+02, -1.176349411010742e+02, -9.764650726318359e+01, -8.092727661132812e+01, -6.756092834472656e+01, -5.785651397705078e+01, -5.197166442871094e+01, -5.000051879882812e+01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_T.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
index c2aa8cf65e..9daa1b67be 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_T.txt
@@ -1,15 +1,15 @@
-last-generated=2021-07-22
+last-generated=2024-09-19
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
-TVol.T=[2.891499938964844e+02, 2.891349487304688e+02, 2.891425170898438e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891506042480469e+02, 2.891575012207031e+02, 2.892590942382812e+02, 2.894894714355469e+02, 2.897234497070312e+02, 2.899605407714844e+02, 2.902002868652344e+02, 2.904420166015625e+02, 2.906850891113281e+02, 2.909288024902344e+02, 2.9117236328125e+02, 2.914150085449219e+02, 2.916559143066406e+02, 2.918942565917969e+02, 2.921292419433594e+02, 2.923600769042969e+02, 2.925859985351562e+02, 2.928063354492188e+02, 2.930204162597656e+02, 2.932276306152344e+02, 2.932452697753906e+02, 2.932276000976562e+02, 2.932040710449219e+02, 2.931744995117188e+02, 2.93138671875e+02, 2.93105712890625e+02, 2.931511840820312e+02, 2.931217041015625e+02, 2.930602722167969e+02, 2.929934387207031e+02, 2.929217224121094e+02, 2.928456420898438e+02, 2.927658081054688e+02, 2.926828918457031e+02, 2.9259765625e+02, 2.925108642578125e+02, 2.924233703613281e+02, 2.923359375e+02, 2.922494201660156e+02, 2.921646728515625e+02, 2.920824890136719e+02, 2.920036315917969e+02, 2.919288024902344e+02, 2.918586730957031e+02, 2.917938537597656e+02, 2.9173486328125e+02, 2.9168212890625e+02, 2.91635986328125e+02, 2.915966796875e+02, 2.915643005371094e+02, 2.915389404296875e+02, 2.915204772949219e+02, 2.915965881347656e+02, 2.918021545410156e+02, 2.920115966796875e+02, 2.922243957519531e+02, 2.924400939941406e+02, 2.926580505371094e+02, 2.928776245117188e+02, 2.930980834960938e+02, 2.93261962890625e+02, 2.932706604003906e+02, 2.932800903320312e+02, 2.932894287109375e+02, 2.932978210449219e+02, 2.933044738769531e+02, 2.933086242675781e+02, 2.933095092773438e+02, 2.933064880371094e+02, 2.932989196777344e+02, 2.932863159179688e+02, 2.932681884765625e+02, 2.932442626953125e+02, 2.932142639160156e+02, 2.931780090332031e+02, 2.93135498046875e+02, 2.931218566894531e+02, 2.931476135253906e+02, 2.930859069824219e+02, 2.930188293457031e+02, 2.929468383789062e+02, 2.928704833984375e+02, 2.927903747558594e+02, 2.927071838378906e+02, 2.926217041015625e+02, 2.9253466796875e+02, 2.924468688964844e+02, 2.923591918945312e+02]
-THeaOut.T=[2.891499938964844e+02, 2.891357421875e+02, 2.891432800292969e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891506042480469e+02, 2.891575012207031e+02, 2.892598571777344e+02, 2.89490234375e+02, 2.897241821289062e+02, 2.899613037109375e+02, 2.902010192871094e+02, 2.904427490234375e+02, 2.906858215332031e+02, 2.909295349121094e+02, 2.911731262207031e+02, 2.91415771484375e+02, 2.916566772460938e+02, 2.9189501953125e+02, 2.921300048828125e+02, 2.9236083984375e+02, 2.925867614746094e+02, 2.928070983886719e+02, 2.930211791992188e+02, 2.932283935546875e+02, 2.932453002929688e+02, 2.932276306152344e+02, 2.932041015625e+02, 2.931744995117188e+02, 2.93138671875e+02, 2.931065063476562e+02, 2.931512145996094e+02, 2.931217346191406e+02, 2.93060302734375e+02, 2.929934997558594e+02, 2.929217834472656e+02, 2.92845703125e+02, 2.927658386230469e+02, 2.926829528808594e+02, 2.925977172851562e+02, 2.925109252929688e+02, 2.924234008789062e+02, 2.923359680175781e+02, 2.922494812011719e+02, 2.921647338867188e+02, 2.920825500488281e+02, 2.92003662109375e+02, 2.919288330078125e+02, 2.918587341308594e+02, 2.917939147949219e+02, 2.917349243164062e+02, 2.916821594238281e+02, 2.916360168457031e+02, 2.915967102050781e+02, 2.915643310546875e+02, 2.915389404296875e+02, 2.915204772949219e+02, 2.915973510742188e+02, 2.918029174804688e+02, 2.920123596191406e+02, 2.922251586914062e+02, 2.924408569335938e+02, 2.926588134765625e+02, 2.928783874511719e+02, 2.930988159179688e+02, 2.93261962890625e+02, 2.932706604003906e+02, 2.932800903320312e+02, 2.932894287109375e+02, 2.932978210449219e+02, 2.933044738769531e+02, 2.933086242675781e+02, 2.933095092773438e+02, 2.933064880371094e+02, 2.932989196777344e+02, 2.932863159179688e+02, 2.932682189941406e+02, 2.932442932128906e+02, 2.932142639160156e+02, 2.931780090332031e+02, 2.93135498046875e+02, 2.931226501464844e+02, 2.931476440429688e+02, 2.930859375e+02, 2.930188598632812e+02, 2.929468688964844e+02, 2.928705139160156e+02, 2.927904052734375e+02, 2.927072448730469e+02, 2.926217346191406e+02, 2.925346984863281e+02, 2.924469299316406e+02, 2.923592529296875e+02]
-hea.TSet=[2.831499938964844e+02, 2.901029052734375e+02, 2.891699829101562e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891206359863281e+02, 2.879745483398438e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.973264770507812e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.838648376464844e+02, 2.936448669433594e+02, 2.912017517089844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.844855346679688e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.841210021972656e+02, 2.946079711914062e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
-hea.Q_flow=[0e+00, 9.988703155517578e+01, 9.988703155517578e+01, 2.324679374694824e+01, 2.190492057800293e+01, 2.02187442779541e+01, 1.822239112854004e+01, 1.593581104278564e+01, 1.33952522277832e+01, 1.064444160461426e+01, 7.725541591644287e+00, 4.610069274902344e+00, 1.106446862220764e+00, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01]
+TVol.T=[2.891499938964844e+02, 2.891347961425781e+02, 2.891401672363281e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891563415527344e+02, 2.892580261230469e+02, 2.894884338378906e+02, 2.89722412109375e+02, 2.899595031738281e+02, 2.901992492675781e+02, 2.904409790039062e+02, 2.9068408203125e+02, 2.909277954101562e+02, 2.911713562011719e+02, 2.914140014648438e+02, 2.916549377441406e+02, 2.91893310546875e+02, 2.921282958984375e+02, 2.923591613769531e+02, 2.925851440429688e+02, 2.928054809570312e+02, 2.930195922851562e+02, 2.932268371582031e+02, 2.93245361328125e+02, 2.932276611328125e+02, 2.932041625976562e+02, 2.93174560546875e+02, 2.931387329101562e+02, 2.931056213378906e+02, 2.931510314941406e+02, 2.931226806640625e+02, 2.930612182617188e+02, 2.929944152832031e+02, 2.929226684570312e+02, 2.928465881347656e+02, 2.927667236328125e+02, 2.926838073730469e+02, 2.925985717773438e+02, 2.925117797851562e+02, 2.924242553710938e+02, 2.923368225097656e+02, 2.922503051757812e+02, 2.921655578613281e+02, 2.920833435058594e+02, 2.920044555664062e+02, 2.919296264648438e+02, 2.918595275878906e+02, 2.917947082519531e+02, 2.917356872558594e+02, 2.916829528808594e+02, 2.916367797851562e+02, 2.915974426269531e+02, 2.915650634765625e+02, 2.915396728515625e+02, 2.915212097167969e+02, 2.915973510742188e+02, 2.918029174804688e+02, 2.920123291015625e+02, 2.922251586914062e+02, 2.924408264160156e+02, 2.926587829589844e+02, 2.928783569335938e+02, 2.930987854003906e+02, 2.932620849609375e+02, 2.932707824707031e+02, 2.932802124023438e+02, 2.9328955078125e+02, 2.932979431152344e+02, 2.933045959472656e+02, 2.933087158203125e+02, 2.933096008300781e+02, 2.933065795898438e+02, 2.932990112304688e+02, 2.932864074707031e+02, 2.93268310546875e+02, 2.932443542480469e+02, 2.9321435546875e+02, 2.931781005859375e+02, 2.931355895996094e+02, 2.931214294433594e+02, 2.931479187011719e+02, 2.930862121582031e+02, 2.930191345214844e+02, 2.929471130371094e+02, 2.928707580566406e+02, 2.927906494140625e+02, 2.927074890136719e+02, 2.926220092773438e+02, 2.925349731445312e+02, 2.924472045898438e+02, 2.923595275878906e+02]
+THeaOut.T=[2.891499938964844e+02, 2.891355895996094e+02, 2.891409606933594e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891499938964844e+02, 2.891563415527344e+02, 2.892587890625e+02, 2.894891662597656e+02, 2.8972314453125e+02, 2.899602661132812e+02, 2.901999816894531e+02, 2.904417114257812e+02, 2.90684814453125e+02, 2.909285278320312e+02, 2.91172119140625e+02, 2.914147644042969e+02, 2.916556701660156e+02, 2.9189404296875e+02, 2.921290283203125e+02, 2.923599243164062e+02, 2.925858764648438e+02, 2.928062438964844e+02, 2.930203552246094e+02, 2.932276000976562e+02, 2.93245361328125e+02, 2.932276916503906e+02, 2.932041625976562e+02, 2.93174560546875e+02, 2.931387329101562e+02, 2.931063842773438e+02, 2.931510620117188e+02, 2.931227111816406e+02, 2.93061279296875e+02, 2.929944458007812e+02, 2.929227294921875e+02, 2.928466186523438e+02, 2.927667846679688e+02, 2.926838684082031e+02, 2.925986328125e+02, 2.925118408203125e+02, 2.9242431640625e+02, 2.923368835449219e+02, 2.922503662109375e+02, 2.921655883789062e+02, 2.920834045410156e+02, 2.920045166015625e+02, 2.919296875e+02, 2.918595581054688e+02, 2.917947387695312e+02, 2.917357177734375e+02, 2.916829833984375e+02, 2.916368103027344e+02, 2.915974731445312e+02, 2.915650939941406e+02, 2.915397033691406e+02, 2.915212097167969e+02, 2.915981140136719e+02, 2.918036804199219e+02, 2.920130920410156e+02, 2.922258911132812e+02, 2.924415893554688e+02, 2.926595458984375e+02, 2.928790893554688e+02, 2.930995483398438e+02, 2.932620849609375e+02, 2.932707824707031e+02, 2.932802124023438e+02, 2.9328955078125e+02, 2.932979431152344e+02, 2.933045959472656e+02, 2.933087158203125e+02, 2.933096008300781e+02, 2.933065795898438e+02, 2.932990112304688e+02, 2.932864074707031e+02, 2.93268310546875e+02, 2.93244384765625e+02, 2.9321435546875e+02, 2.931781311035156e+02, 2.931356201171875e+02, 2.931221923828125e+02, 2.9314794921875e+02, 2.930862426757812e+02, 2.930191650390625e+02, 2.929471740722656e+02, 2.928708190917969e+02, 2.927907104492188e+02, 2.927075500488281e+02, 2.926220397949219e+02, 2.925350036621094e+02, 2.924472351074219e+02, 2.923595581054688e+02]
+hea.TSet=[2.831499938964844e+02, 2.901143188476562e+02, 2.891820373535156e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891499633789062e+02, 2.883370056152344e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.974313659667969e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.838583068847656e+02, 2.936265869140625e+02, 2.912235412597656e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.843733215332031e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.841084289550781e+02, 2.945998840332031e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02, 2.831499938964844e+02]
+hea.Q_flow=[0e+00, 9.988703155517578e+01, 9.988703155517578e+01, 2.324471092224121e+01, 2.190735626220703e+01, 2.02252311706543e+01, 1.822393989562988e+01, 1.59356689453125e+01, 1.339588260650635e+01, 1.068739223480225e+01, 7.816309452056885e+00, 4.764855861663818e+00, 1.539037346839905e+00, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 9.988703155517578e+01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01, 1.129679977893829e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_u.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
index 8a8ec0da86..25d84c7466 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_WaterHeater_u.txt
@@ -1,14 +1,14 @@
-last-generated=2024-06-05
+last-generated=2024-09-19
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
 TOut.y=[2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02, 2.841894226074219e+02, 2.843070983886719e+02, 2.845011291503906e+02, 2.847684631347656e+02, 2.851049194335938e+02, 2.855051574707031e+02, 2.85962890625e+02, 2.864708557128906e+02, 2.870211181640625e+02, 2.876049194335938e+02, 2.882131042480469e+02, 2.888360595703125e+02, 2.894639587402344e+02, 2.900869140625e+02, 2.906950988769531e+02, 2.912789001464844e+02, 2.918291320800781e+02, 2.923371276855469e+02, 2.927948303222656e+02, 2.931950988769531e+02, 2.935315246582031e+02, 2.937988891601562e+02, 2.93992919921875e+02, 2.941105651855469e+02, 2.941499938964844e+02, 2.941105651855469e+02, 2.93992919921875e+02, 2.937988891601562e+02, 2.935315246582031e+02, 2.931950988769531e+02, 2.927948303222656e+02, 2.923371276855469e+02, 2.918291320800781e+02, 2.912789001464844e+02, 2.906950988769531e+02, 2.900869140625e+02, 2.894639587402344e+02, 2.888360595703125e+02, 2.882131042480469e+02, 2.876049194335938e+02, 2.870211181640625e+02, 2.864708557128906e+02, 2.85962890625e+02, 2.855051574707031e+02, 2.851049194335938e+02, 2.847684631347656e+02, 2.845011291503906e+02, 2.843070983886719e+02, 2.841894226074219e+02, 2.841499938964844e+02]
-TVol.T=[2.891499938964844e+02, 2.891498107910156e+02, 2.891499938964844e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891502075195312e+02, 2.891515197753906e+02, 2.893240966796875e+02, 2.897386474609375e+02, 2.901535034179688e+02, 2.90568603515625e+02, 2.909838562011719e+02, 2.913991088867188e+02, 2.918142700195312e+02, 2.922292175292969e+02, 2.926437683105469e+02, 2.930578002929688e+02, 2.931883850097656e+02, 2.931903076171875e+02, 2.931921081542969e+02, 2.931935424804688e+02, 2.931945190429688e+02, 2.931948852539062e+02, 2.931944580078125e+02, 2.931931762695312e+02, 2.931908874511719e+02, 2.931875e+02, 2.931829833984375e+02, 2.931772155761719e+02, 2.931702270507812e+02, 2.931619262695312e+02, 2.931523742675781e+02, 2.931450500488281e+02, 2.931330261230469e+02, 2.93119873046875e+02, 2.931056823730469e+02, 2.930904846191406e+02, 2.93074462890625e+02, 2.930577392578125e+02, 2.930404052734375e+02, 2.930226135253906e+02, 2.930045776367188e+02, 2.929863891601562e+02, 2.9296826171875e+02, 2.929503173828125e+02, 2.929327697753906e+02, 2.929156799316406e+02, 2.928992614746094e+02, 2.928836364746094e+02, 2.928689270019531e+02, 2.928552551269531e+02, 2.928426818847656e+02, 2.92831298828125e+02, 2.928211975097656e+02, 2.928123474121094e+02, 2.928048400878906e+02, 2.927986145019531e+02, 2.929637145996094e+02, 2.931850891113281e+02, 2.931817626953125e+02, 2.931795349121094e+02, 2.931782836914062e+02, 2.931779479980469e+02, 2.931783447265625e+02, 2.931793518066406e+02, 2.931808471679688e+02, 2.931826477050781e+02, 2.931846008300781e+02, 2.931865539550781e+02, 2.931883544921875e+02, 2.931898193359375e+02, 2.931907958984375e+02, 2.931911926269531e+02, 2.931907958984375e+02, 2.931895141601562e+02, 2.93187255859375e+02, 2.931838989257812e+02, 2.931793823242188e+02, 2.931736450195312e+02, 2.931666564941406e+02, 2.931583862304688e+02, 2.931492004394531e+02, 2.931456298828125e+02, 2.931336364746094e+02, 2.931204833984375e+02, 2.931062622070312e+02, 2.930910949707031e+02, 2.930750732421875e+02, 2.930583190917969e+02, 2.930409851074219e+02, 2.930232238769531e+02, 2.930051574707031e+02, 2.929869995117188e+02]
-THeaOut.T=[2.891499938964844e+02, 2.891500549316406e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891502075195312e+02, 2.891514892578125e+02, 2.893255310058594e+02, 2.897400512695312e+02, 2.901549072265625e+02, 2.905700073242188e+02, 2.909852600097656e+02, 2.914005126953125e+02, 2.91815673828125e+02, 2.922306213378906e+02, 2.926452026367188e+02, 2.930592346191406e+02, 2.931883239746094e+02, 2.931902770996094e+02, 2.931920776367188e+02, 2.931935424804688e+02, 2.931945190429688e+02, 2.931948852539062e+02, 2.931944885253906e+02, 2.931932067871094e+02, 2.931909484863281e+02, 2.931875915527344e+02, 2.931830749511719e+02, 2.931773376464844e+02, 2.931703491210938e+02, 2.93162109375e+02, 2.931525573730469e+02, 2.93145263671875e+02, 2.931332702636719e+02, 2.931201171875e+02, 2.931059265136719e+02, 2.930907897949219e+02, 2.930747680664062e+02, 2.930580444335938e+02, 2.930407104492188e+02, 2.9302294921875e+02, 2.930049133300781e+02, 2.929867248535156e+02, 2.929685974121094e+02, 2.929506530761719e+02, 2.929330749511719e+02, 2.929159851074219e+02, 2.928995666503906e+02, 2.928839111328125e+02, 2.928692016601562e+02, 2.928554992675781e+02, 2.928428955078125e+02, 2.928315124511719e+02, 2.928213500976562e+02, 2.928125e+02, 2.928049621582031e+02, 2.927987365722656e+02, 2.929652709960938e+02, 2.931851806640625e+02, 2.931818237304688e+02, 2.931795654296875e+02, 2.931783142089844e+02, 2.931779479980469e+02, 2.931783142089844e+02, 2.931793212890625e+02, 2.931808166503906e+02, 2.931826171875e+02, 2.931845703125e+02, 2.931865234375e+02, 2.931883239746094e+02, 2.931897888183594e+02, 2.931907958984375e+02, 2.93191162109375e+02, 2.931907958984375e+02, 2.931895446777344e+02, 2.931873168945312e+02, 2.931839599609375e+02, 2.931794738769531e+02, 2.931737365722656e+02, 2.931667785644531e+02, 2.931585388183594e+02, 2.931494140625e+02, 2.931458435058594e+02, 2.931338500976562e+02, 2.931207275390625e+02, 2.931065368652344e+02, 2.930913696289062e+02, 2.930753479003906e+02, 2.930586242675781e+02, 2.930412902832031e+02, 2.930235290527344e+02, 2.930054931640625e+02, 2.929873352050781e+02]
-hea.Q_flow=[0e+00, 2.503922271728516e+01, 2.465002632141113e+01, 2.320894813537598e+01, 2.18117618560791e+01, 2.014156150817871e+01, 1.816590881347656e+01, 1.588892841339111e+01, 1.33554801940918e+01, 1.060130023956299e+01, 7.678647041320801e+00, 4.630670070648193e+00, 1.512943863868713e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.65168514251709e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+TVol.T=[2.891499938964844e+02, 2.891498107910156e+02, 2.891499938964844e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891500244140625e+02, 2.891502075195312e+02, 2.891514892578125e+02, 2.893240966796875e+02, 2.897386474609375e+02, 2.901535034179688e+02, 2.90568603515625e+02, 2.909838256835938e+02, 2.913991088867188e+02, 2.918142700195312e+02, 2.922292175292969e+02, 2.926437683105469e+02, 2.930578002929688e+02, 2.931883544921875e+02, 2.931903076171875e+02, 2.931921081542969e+02, 2.931935424804688e+02, 2.931945190429688e+02, 2.931948852539062e+02, 2.931944580078125e+02, 2.931931762695312e+02, 2.931908874511719e+02, 2.931875305175781e+02, 2.931830139160156e+02, 2.9317724609375e+02, 2.931702575683594e+02, 2.931619873046875e+02, 2.931524353027344e+02, 2.9314501953125e+02, 2.931330261230469e+02, 2.93119873046875e+02, 2.931056518554688e+02, 2.930904846191406e+02, 2.930744934082031e+02, 2.930577392578125e+02, 2.930404357910156e+02, 2.930226745605469e+02, 2.93004638671875e+02, 2.929864501953125e+02, 2.929683227539062e+02, 2.929503784179688e+02, 2.929328002929688e+02, 2.929157409667969e+02, 2.928993225097656e+02, 2.928836975097656e+02, 2.928689880371094e+02, 2.928553161621094e+02, 2.928427429199219e+02, 2.928313903808594e+02, 2.928212585449219e+02, 2.928124389648438e+02, 2.92804931640625e+02, 2.927987060546875e+02, 2.929638061523438e+02, 2.931851196289062e+02, 2.931817932128906e+02, 2.931795349121094e+02, 2.931783142089844e+02, 2.931779479980469e+02, 2.931783447265625e+02, 2.931793823242188e+02, 2.931808776855469e+02, 2.931826782226562e+02, 2.931846313476562e+02, 2.931866149902344e+02, 2.931883850097656e+02, 2.931898498535156e+02, 2.931908569335938e+02, 2.931912231445312e+02, 2.931908264160156e+02, 2.931895446777344e+02, 2.931872863769531e+02, 2.931839294433594e+02, 2.931794128417969e+02, 2.931736755371094e+02, 2.931666870117188e+02, 2.931584167480469e+02, 2.931492004394531e+02, 2.931456604003906e+02, 2.931336364746094e+02, 2.931204833984375e+02, 2.931062927246094e+02, 2.930910949707031e+02, 2.930750732421875e+02, 2.93058349609375e+02, 2.93041015625e+02, 2.930232238769531e+02, 2.930051879882812e+02, 2.929869995117188e+02]
+THeaOut.T=[2.891499938964844e+02, 2.891500549316406e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891502075195312e+02, 2.891501770019531e+02, 2.891501770019531e+02, 2.89150146484375e+02, 2.89150146484375e+02, 2.891501159667969e+02, 2.891500854492188e+02, 2.891500549316406e+02, 2.891500244140625e+02, 2.891501770019531e+02, 2.891514587402344e+02, 2.893255004882812e+02, 2.897400512695312e+02, 2.901549072265625e+02, 2.905700073242188e+02, 2.909852294921875e+02, 2.914005126953125e+02, 2.91815673828125e+02, 2.922306213378906e+02, 2.926452026367188e+02, 2.930592346191406e+02, 2.931883239746094e+02, 2.931902770996094e+02, 2.931920776367188e+02, 2.931935424804688e+02, 2.931945190429688e+02, 2.931948852539062e+02, 2.931944885253906e+02, 2.931932067871094e+02, 2.931909484863281e+02, 2.931875915527344e+02, 2.9318310546875e+02, 2.931773681640625e+02, 2.931703796386719e+02, 2.931621398925781e+02, 2.931526184082031e+02, 2.931452331542969e+02, 2.931332397460938e+02, 2.931201171875e+02, 2.931059265136719e+02, 2.930907592773438e+02, 2.930747680664062e+02, 2.930580444335938e+02, 2.930407409667969e+02, 2.930230102539062e+02, 2.930049438476562e+02, 2.929867858886719e+02, 2.929686279296875e+02, 2.9295068359375e+02, 2.9293310546875e+02, 2.92916015625e+02, 2.928995971679688e+02, 2.928839721679688e+02, 2.928692321777344e+02, 2.928555297851562e+02, 2.928429565429688e+02, 2.928315734863281e+02, 2.928214416503906e+02, 2.928125915527344e+02, 2.928050537109375e+02, 2.927987976074219e+02, 2.929653625488281e+02, 2.931851806640625e+02, 2.931818237304688e+02, 2.931795654296875e+02, 2.931783142089844e+02, 2.931779479980469e+02, 2.931783447265625e+02, 2.931793518066406e+02, 2.931808471679688e+02, 2.931826477050781e+02, 2.931846008300781e+02, 2.931865844726562e+02, 2.931883544921875e+02, 2.931898498535156e+02, 2.931908264160156e+02, 2.931912231445312e+02, 2.931908264160156e+02, 2.931895751953125e+02, 2.931873474121094e+02, 2.931839904785156e+02, 2.931795043945312e+02, 2.931737976074219e+02, 2.931668090820312e+02, 2.931585693359375e+02, 2.931494140625e+02, 2.931458740234375e+02, 2.931338806152344e+02, 2.931207275390625e+02, 2.931065368652344e+02, 2.930913696289062e+02, 2.930753784179688e+02, 2.930586547851562e+02, 2.930413208007812e+02, 2.930235595703125e+02, 2.930055236816406e+02, 2.929873352050781e+02]
+hea.Q_flow=[0e+00, 2.49993839263916e+01, 2.465565299987793e+01, 2.326037788391113e+01, 2.188517951965332e+01, 2.022467422485352e+01, 1.820369148254395e+01, 1.589406394958496e+01, 1.335392570495605e+01, 1.059931087493896e+01, 7.674013614654541e+00, 4.63314962387085e+00, 1.518237829208374e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.566738414764404e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
index 8bef6af74a..f677491996 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_ClosedLoop_y.txt
@@ -1,17 +1,17 @@
-last-generated=2024-06-05
+last-generated=2024-08-26
 statistics-initialization=
 {
-  "nonlinear": "0, 1, 0",
+  "nonlinear": "1, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "0, 1",
-  "number of continuous time states": "6",
+  "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+03]
 conPID.u_s=[7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 7.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01, 2.5e-01]
-conPID.u_m=[0e+00, 5.224461555480957e-01, 6.58552348613739e-01, 7.132970690727234e-01, 7.352567911148071e-01, 7.441821098327637e-01, 7.477735280990601e-01, 7.490531206130981e-01, 7.496210336685181e-01, 7.498462796211243e-01, 7.499350309371948e-01, 7.499726414680481e-01, 7.499886155128479e-01, 4.751942157745361e-01, 3.413117229938506e-01, 2.861240208148956e-01, 2.642611563205719e-01, 2.554755806922913e-01, 2.52094954252243e-01, 2.50797837972641e-01, 2.502994537353516e-01, 2.501098811626434e-01, 2.500710189342499e-01, 2.499862015247345e-01, 2.499829232692719e-01, 2.5007164478302e-01, 6.077881455421448e-01, 6.925642490386964e-01, 7.269526720046998e-01, 7.407311201095581e-01, 7.463434338569641e-01, 7.483694553375244e-01, 7.495084404945374e-01, 7.497617602348328e-01, 7.499039769172668e-01, 7.499611377716064e-01, 7.499840259552002e-01, 7.499933838844299e-01, 4.751960933208466e-01, 3.413124978542328e-01, 2.861243188381195e-01, 2.642637193202972e-01, 2.554847896099091e-01, 2.520952522754669e-01, 2.507985830307007e-01, 2.503036260604858e-01, 2.501157820224762e-01, 2.500442266464233e-01, 2.500172555446625e-01, 2.500069439411163e-01, 2.500025629997253e-01, 6.072956323623657e-01, 6.925587058067322e-01, 7.269401550292969e-01, 7.407395839691162e-01, 7.460852265357971e-01, 7.485127449035645e-01, 7.494041323661804e-01, 7.497589588165283e-01, 7.499040365219116e-01, 7.499610781669617e-01, 7.499846816062927e-01, 7.499934434890747e-01, 4.751962721347809e-01, 3.413125574588776e-01, 2.861245274543762e-01, 2.642569541931152e-01, 2.554798126220703e-01, 2.520926594734192e-01, 2.507974207401276e-01, 2.5030317902565e-01, 2.501168549060822e-01, 2.500477433204651e-01, 2.500150203704834e-01, 2.499830424785614e-01, 2.500042319297791e-01, 6.072967052459717e-01, 6.925588250160217e-01, 7.269401550292969e-01, 7.407400012016296e-01, 7.4608314037323e-01, 7.485110759735107e-01, 7.494041919708252e-01, 7.497588992118835e-01, 7.499040365219116e-01, 7.499610781669617e-01, 7.499846816062927e-01, 7.499934434890747e-01, 4.751962721347809e-01, 3.413125574588776e-01, 2.861245572566986e-01, 2.642560601234436e-01, 2.554692029953003e-01, 2.520784139633179e-01, 2.507986426353455e-01, 2.503048777580261e-01, 2.501155436038971e-01, 2.500432431697845e-01, 2.500163614749908e-01, 2.500057816505432e-01, 2.500005960464478e-01]
-conPID.y=[3.75e-01, 5.646343231201172e-01, 6.758749485015869e-01, 7.204659581184387e-01, 7.383713126182556e-01, 7.455018758773804e-01, 7.483592629432678e-01, 7.495948672294617e-01, 7.500596046447754e-01, 7.50243067741394e-01, 7.503153085708618e-01, 7.503460049629211e-01, 7.50359058380127e-01, 4.350666701793671e-01, 3.239242136478423e-01, 2.799611389636993e-01, 2.624926269054413e-01, 2.558540999889374e-01, 2.533157467842102e-01, 2.523505985736847e-01, 2.519841194152832e-01, 2.518446743488312e-01, 2.517758905887604e-01, 2.517839372158051e-01, 2.517736852169037e-01, 2.517236173152924e-01, 6.33356511592865e-01, 7.035771012306214e-01, 7.315863370895386e-01, 7.428390979766846e-01, 7.473146319389343e-01, 7.492234110832214e-01, 7.498319149017334e-01, 7.501740455627441e-01, 7.502902150154114e-01, 7.503366470336914e-01, 7.503553032875061e-01, 7.503629326820374e-01, 4.350682497024536e-01, 3.239248394966125e-01, 2.799614071846008e-01, 2.624927759170532e-01, 2.558517754077911e-01, 2.533163130283356e-01, 2.523503601551056e-01, 2.519822120666504e-01, 2.518426179885864e-01, 2.517892420291901e-01, 2.517691552639008e-01, 2.517615556716919e-01, 2.517585158348083e-01, 6.336069107055664e-01, 7.035755515098572e-01, 7.315836548805237e-01, 7.428315281867981e-01, 7.474407553672791e-01, 7.491526007652283e-01, 7.498800754547119e-01, 7.501731514930725e-01, 7.502896189689636e-01, 7.503368854522705e-01, 7.5035560131073e-01, 7.503634095191956e-01, 4.350684881210327e-01, 3.239249587059021e-01, 2.799613773822784e-01, 2.624876499176025e-01, 2.558490037918091e-01, 2.533146142959595e-01, 2.523495256900787e-01, 2.519822418689728e-01, 2.518410086631775e-01, 2.517874240875244e-01, 2.517698407173157e-01, 2.517729103565216e-01, 2.517587542533875e-01, 6.336067318916321e-01, 7.035756707191467e-01, 7.315837144851685e-01, 7.428313493728638e-01, 7.47441828250885e-01, 7.491534352302551e-01, 7.498800754547119e-01, 7.501731514930725e-01, 7.502896189689636e-01, 7.503368854522705e-01, 7.5035560131073e-01, 7.503634095191956e-01, 4.350684881210327e-01, 3.239249587059021e-01, 2.799613773822784e-01, 2.624880373477936e-01, 2.558552920818329e-01, 2.533215582370758e-01, 2.523504197597504e-01, 2.519831359386444e-01, 2.518423795700073e-01, 2.517887055873871e-01, 2.517687082290649e-01, 2.51760870218277e-01, 2.517570555210114e-01]
+conPID.u_m=[0e+00, 5.438299775123596e-01, 6.573857665061951e-01, 7.084161639213562e-01, 7.314903736114502e-01, 7.417096495628357e-01, 7.462905049324036e-01, 7.483401298522949e-01, 7.492573261260986e-01, 7.496677041053772e-01, 7.498518228530884e-01, 7.499334812164307e-01, 7.499703764915466e-01, 4.652140438556671e-01, 3.463896811008452e-01, 2.930191159248352e-01, 2.690401971340179e-01, 2.582347691059113e-01, 2.53561407327652e-01, 2.515311241149902e-01, 2.506555020809174e-01, 2.502800226211548e-01, 2.501197159290314e-01, 2.500512003898621e-01, 2.500218451023102e-01, 2.500091195106506e-01, 6.065045595169067e-01, 6.85715675354004e-01, 7.217010855674745e-01, 7.371494770050049e-01, 7.442302107810974e-01, 7.474167346954346e-01, 7.488451600074768e-01, 7.494834661483765e-01, 7.49769926071167e-01, 7.498971819877625e-01, 7.4995356798172e-01, 7.499793171882629e-01, 4.652180671691895e-01, 3.463805913925171e-01, 2.940079867839813e-01, 2.690222263336182e-01, 2.582431137561798e-01, 2.53576397895813e-01, 2.515588998794556e-01, 2.506585717201233e-01, 2.502817213535309e-01, 2.501205503940582e-01, 2.500521242618561e-01, 2.500226199626923e-01, 2.500098645687103e-01, 6.065430045127869e-01, 6.857402920722961e-01, 7.212550640106201e-01, 7.372729182243347e-01, 7.448393702507019e-01, 7.467672228813171e-01, 7.488458156585693e-01, 7.494825720787048e-01, 7.497644424438477e-01, 7.498927712440491e-01, 7.499513030052185e-01, 7.499778866767883e-01, 4.652172327041626e-01, 3.463802337646484e-01, 2.940094470977783e-01, 2.690222859382629e-01, 2.582438886165619e-01, 2.535763084888458e-01, 2.515601217746735e-01, 2.506586015224457e-01, 2.502817213535309e-01, 2.50120609998703e-01, 2.500521540641785e-01, 2.500226199626923e-01, 2.500098645687103e-01, 6.066364645957947e-01, 6.857480406761169e-01, 7.212258577346802e-01, 7.371153235435486e-01, 7.442318797111511e-01, 7.474233508110046e-01, 7.488382458686829e-01, 7.494744062423706e-01, 7.497606873512268e-01, 7.499001622200012e-01, 7.499301433563232e-01, 7.500026822090149e-01, 4.652171730995178e-01, 3.463321328163147e-01, 2.931202054023743e-01, 2.690333425998688e-01, 2.5826495885849e-01, 2.535656094551086e-01, 2.515194118022919e-01, 2.506466209888458e-01, 2.502793967723846e-01, 2.501213848590851e-01, 2.500523328781128e-01, 2.500226497650146e-01, 2.500098049640656e-01]
+conPID.y=[3.75e-01, 5.455456376075745e-01, 6.588048338890076e-01, 7.094231843948364e-01, 7.319757342338562e-01, 7.421299815177917e-01, 7.466824650764465e-01, 7.487190365791321e-01, 7.496304512023926e-01, 7.500381469726562e-01, 7.502210140228271e-01, 7.503027319908142e-01, 7.503385543823242e-01, 4.637234807014465e-01, 3.456630706787108e-01, 2.929189503192902e-01, 2.695042192935944e-01, 2.59403795003891e-01, 2.55033016204834e-01, 2.531629502773285e-01, 2.523582577705383e-01, 2.520135641098022e-01, 2.51866489648819e-01, 2.518035173416138e-01, 2.517765760421753e-01, 2.517648935317993e-01, 6.077945232391357e-01, 6.865410804748536e-01, 7.215428352355958e-01, 7.375522255897522e-01, 7.446346879005432e-01, 7.478012442588806e-01, 7.492207884788513e-01, 7.498550415039062e-01, 7.501397132873535e-01, 7.502661347389221e-01, 7.50322163105011e-01, 7.503477931022644e-01, 4.637276828289032e-01, 3.456704318523407e-01, 2.924253344535828e-01, 2.695144712924957e-01, 2.59401261806488e-01, 2.550278306007385e-01, 2.531499266624451e-01, 2.523593604564667e-01, 2.52015084028244e-01, 2.518671751022339e-01, 2.51804381608963e-01, 2.517772912979126e-01, 2.517655789852142e-01, 6.077757477760315e-01, 6.865296959877014e-01, 7.217661738395691e-01, 7.374874949455262e-01, 7.443312406539917e-01, 7.481269836425781e-01, 7.492213845252991e-01, 7.498540878295898e-01, 7.501342296600342e-01, 7.502617239952087e-01, 7.503198981285095e-01, 7.50346302986145e-01, 4.637268483638763e-01, 3.456700444221497e-01, 2.92424350976944e-01, 2.695143520832062e-01, 2.594008445739746e-01, 2.550278306007385e-01, 2.531493008136749e-01, 2.523593306541443e-01, 2.52015084028244e-01, 2.518672347068787e-01, 2.51804381608963e-01, 2.517772912979126e-01, 2.517655789852142e-01, 6.077291369438171e-01, 6.865248084068298e-01, 7.217749953269958e-01, 7.375646829605103e-01, 7.446343898773193e-01, 7.477967739105225e-01, 7.492163181304932e-01, 7.498535513877869e-01, 7.501377463340759e-01, 7.502564191818237e-01, 7.503315210342407e-01, 7.503344416618347e-01, 4.637269973754883e-01, 3.456986546516418e-01, 2.928726673126221e-01, 2.695099413394928e-01, 2.593912780284882e-01, 2.550356686115265e-01, 2.531710863113403e-01, 2.523663938045502e-01, 2.520173192024231e-01, 2.518679201602936e-01, 2.518045604228973e-01, 2.51777321100235e-01, 2.517655491828918e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
index 4ed394cd3a..f00430c833 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsParallel.txt
@@ -1,19 +1,19 @@
-last-generated=2021-06-17
+last-generated=2024-09-19
 statistics-initialization=
 {
-  "nonlinear": "2",
+  "nonlinear": "2, 0, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "2",
-  "number of continuous time states": "6",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+02]
 floMac1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMac1.dp=[0e+00, -1.1634990234375e+03, -2.479821044921875e+03, -3.250246826171875e+03, -3.639493896484375e+03, -3.8258408203125e+03, -3.913047607421875e+03, -3.953544677734375e+03, -3.97224365234375e+03, -3.98091162109375e+03, -3.984892578125e+03, -3.98668798828125e+03, -3.98750927734375e+03, -3.98789306640625e+03, -3.98808203125e+03, -3.988166259765625e+03, -3.988186767578125e+03, -3.988185302734375e+03, -3.988188232421875e+03, -3.988196044921875e+03, -3.988198974609375e+03, -3.98819677734375e+03, -3.98818408203125e+03, -3.9881767578125e+03, -3.988173095703125e+03, -3.988184326171875e+03, -3.988195068359375e+03, -3.9882021484375e+03, -3.988205810546875e+03, -3.98820654296875e+03, -3.988204833984375e+03, -3.988203125e+03, -3.98820068359375e+03, -3.988198974609375e+03, -3.988197998046875e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.9881982421875e+03, -3.98819921875e+03, -3.98819921875e+03, -3.9882001953125e+03, -3.98820263671875e+03, -3.98820556640625e+03, -3.98820751953125e+03, -3.988208251953125e+03, -3.9882060546875e+03, -3.988205810546875e+03, -3.98820751953125e+03, -3.988208984375e+03, -3.988209228515625e+03, -3.988208251953125e+03, -2.81905810546875e+03, -1.458623046875e+03, -7.54064453125e+02, -4.1129638671875e+02, -2.041957244873047e+02, -9.961580657958922e+01, -4.310785675048871e+01, -1.419166088104248e+01, -4.206310272216797e+00, -1.386677622795105e+00, -6.490764617919922e-01, -4.623441398143768e-01, -4.158974587917328e-01, -4.045192897319794e-01, -4.017325043678284e-01, -4.010524153709412e-01, -4.008915722370148e-01, -4.008540511131287e-01, -4.00843620300293e-01, -4.00839775800705e-01, -4.008384943008423e-01, -4.008382558822632e-01, -4.008381962776184e-01, -4.008381962776184e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01]
-floMac2.dp=[0e+00, -1.1634990234375e+03, -2.479821044921875e+03, -3.250246826171875e+03, -3.639493896484375e+03, -3.8258408203125e+03, -3.913047607421875e+03, -3.953544677734375e+03, -3.97224365234375e+03, -3.98091162109375e+03, -3.984892578125e+03, -3.98668798828125e+03, -3.98750927734375e+03, -3.98789306640625e+03, -3.98808203125e+03, -3.988166259765625e+03, -3.988186767578125e+03, -3.988185302734375e+03, -3.988188232421875e+03, -3.988196044921875e+03, -3.988198974609375e+03, -3.98819677734375e+03, -3.98818408203125e+03, -3.9881767578125e+03, -3.988173095703125e+03, -3.988184326171875e+03, -3.988195068359375e+03, -3.9882021484375e+03, -3.988205810546875e+03, -3.98820654296875e+03, -3.988204833984375e+03, -3.988203125e+03, -3.98820068359375e+03, -3.988198974609375e+03, -3.988197998046875e+03, -3.988197509765625e+03, -3.98819775390625e+03, -3.9881982421875e+03, -3.98819921875e+03, -3.98819921875e+03, -3.9882001953125e+03, -3.98820263671875e+03, -3.98820556640625e+03, -3.98820751953125e+03, -3.988208251953125e+03, -3.9882060546875e+03, -3.988205810546875e+03, -3.98820751953125e+03, -3.988208984375e+03, -3.988209228515625e+03, -3.988208251953125e+03, -3.81204345703125e+03, -3.56787109375e+03, -3.381185546875e+03, -3.26497998046875e+03, -3.2207744140625e+03, -3.20295361328125e+03, -3.194193115234375e+03, -3.18991748046875e+03, -3.1884716796875e+03, -3.18806640625e+03, -3.18796044921875e+03, -3.18793359375e+03, -3.187927001953125e+03, -3.18792529296875e+03, -3.187925048828125e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03]
-floMac1.m_flow=[-0e+00, 2.696640193462372e-01, 3.936861753463745e-01, 4.507110118865967e-01, 4.769364297389984e-01, 4.88993912935257e-01, 4.945356249809265e-01, 4.970880746841431e-01, 4.982622265815735e-01, 4.988055527210236e-01, 4.990549087524414e-01, 4.991672933101654e-01, 4.992187321186066e-01, 4.99242752790451e-01, 4.992545545101166e-01, 4.992598295211792e-01, 4.992611408233643e-01, 4.992610216140747e-01, 4.992612302303314e-01, 4.992617070674896e-01, 4.99261885881424e-01, 4.99261736869812e-01, 4.992609620094299e-01, 4.992605149745941e-01, 4.99260276556015e-01, 4.992609620094299e-01, 4.992616474628448e-01, 4.992620944976807e-01, 4.992623031139374e-01, 4.992623627185822e-01, 4.992622435092926e-01, 4.992621541023254e-01, 4.992620050907135e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992618560791016e-01, 4.99261885881424e-01, 4.992619156837463e-01, 4.992619454860687e-01, 4.992621243000031e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992624819278717e-01, 4.992623329162598e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992625117301941e-01, 4.992625415325165e-01, 4.992624819278717e-01, 3.840707838535309e-01, 2.014315128326416e-01, 3.26470285654068e-02, -9.575036913156509e-02, -1.52726411819458e-01, -1.775592863559724e-01, -1.902441978454589e-01, -1.965608894824982e-01, -1.987163573503494e-01, -1.993226855993271e-01, -1.994811296463013e-01, -1.995212286710739e-01, -1.995311975479126e-01, -1.995336413383484e-01, -1.995342373847961e-01, -1.995343863964081e-01, -1.995344161987305e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01]
-floMac2.m_flow=[0e+00, 2.696640193462372e-01, 3.936861753463745e-01, 4.507110118865967e-01, 4.769364297389984e-01, 4.88993912935257e-01, 4.945356249809265e-01, 4.970880746841431e-01, 4.982622265815735e-01, 4.988055527210236e-01, 4.990549087524414e-01, 4.991672933101654e-01, 4.992187321186066e-01, 4.99242752790451e-01, 4.992545545101166e-01, 4.992598295211792e-01, 4.992611408233643e-01, 4.992610216140747e-01, 4.992612302303314e-01, 4.992617070674896e-01, 4.99261885881424e-01, 4.99261736869812e-01, 4.992609620094299e-01, 4.992605149745941e-01, 4.99260276556015e-01, 4.992609620094299e-01, 4.992616474628448e-01, 4.992620944976807e-01, 4.992623031139374e-01, 4.992623627185822e-01, 4.992622435092926e-01, 4.992621541023254e-01, 4.992620050907135e-01, 4.99261885881424e-01, 4.992618262767792e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992618560791016e-01, 4.99261885881424e-01, 4.992619156837463e-01, 4.992619454860687e-01, 4.992621243000031e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992624819278717e-01, 4.992623329162598e-01, 4.992623031139374e-01, 4.992624223232269e-01, 4.992625117301941e-01, 4.992625415325165e-01, 4.992624819278717e-01, 5.211847424507141e-01, 5.515710711479187e-01, 5.748035907745361e-01, 5.892650485038757e-01, 5.947663187980652e-01, 5.969840288162231e-01, 5.980742573738098e-01, 5.986063480377197e-01, 5.987862944602966e-01, 5.988367199897766e-01, 5.98849892616272e-01, 5.988532304763794e-01, 5.988540649414062e-01, 5.988542437553406e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01]
+floMac1.dp=[0e+00, -4.522065734863281e+01, -1.608616180419922e+02, -3.587976684570312e+02, -6.379514770507812e+02, -9.96882568359375e+02, -1.435590942382812e+03, -1.954076660156251e+03, -2.552339599609375e+03, -3.2303798828125e+03, -3.985279052734375e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.32249755859375e+03, -2.720909912109375e+03, -2.183637451171875e+03, -1.710973999023438e+03, -1.303464477539062e+03, -9.634875488281222e+02, -6.954458618164085e+02, -4.526117248535156e+02, -2.031973876953125e+02, -4.106224477291107e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01, -4.00838166475296e-01]
+floMac2.dp=[0e+00, -4.522065734863281e+01, -1.608616180419922e+02, -3.587976684570312e+02, -6.379514770507812e+02, -9.96882568359375e+02, -1.435590942382812e+03, -1.954076660156251e+03, -2.552339599609375e+03, -3.2303798828125e+03, -3.985279052734375e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.988197509765625e+03, -3.890245361328125e+03, -3.796267578125e+03, -3.705979248046875e+03, -3.61890478515625e+03, -3.53415380859375e+03, -3.449433105468749e+03, -3.359217285156251e+03, -3.275970703125e+03, -3.220593017578125e+03, -3.18792626953125e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03, -3.1879248046875e+03]
+floMac1.m_flow=[-0e+00, 4.318511486053467e-02, 9.892354160547256e-02, 1.497493088245392e-01, 1.996796578168869e-01, 2.496100217103958e-01, 2.995403707027435e-01, 3.494707345962525e-01, 3.994010984897614e-01, 4.493314325809479e-01, 4.990791082382202e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.365941286087036e-01, 3.731798827648163e-01, 3.086630403995514e-01, 2.424316555261612e-01, 1.73321932554245e-01, 9.843663871288222e-02, 1.017980463802904e-02, -8.24340432882309e-02, -1.529728025197983e-01, -1.995323300361633e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01, -1.995344310998917e-01]
+floMac2.m_flow=[0e+00, 4.318511486053467e-02, 9.892354160547256e-02, 1.497493088245392e-01, 1.996796578168869e-01, 2.496100217103958e-01, 2.995403707027435e-01, 3.494707345962525e-01, 3.994010984897614e-01, 4.493314325809479e-01, 4.990791082382202e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 4.992617964744568e-01, 5.11451780796051e-01, 5.231471657752991e-01, 5.343833565711975e-01, 5.452196598052979e-01, 5.55766761302948e-01, 5.663100481033326e-01, 5.775372982025145e-01, 5.878971815109253e-01, 5.947888493537903e-01, 5.988541841506958e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01, 5.988543033599854e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
index 160706733f..22b279dffe 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_PumpsSeries.txt
@@ -1,4 +1,4 @@
-last-generated=2021-06-17
+last-generated=2024-09-19
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,12 +8,12 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1",
-  "number of continuous time states": "4",
+  "number of continuous time states": "2",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+02]
 floMac1.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-floMac1.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.140467895507812e+03, -1.119023895263672e+02, 3.452047729492188e+02, 3.932883911132812e+02, 2.924685363769531e+02, 1.823004913330069e+02, 8.801720428466879e+01, 2.982197189331055e+01, 8.999917984008789e+00, 3.074394702911377e+00, 1.522541642189026e+00, 1.129523158073425e+00, 1.031545400619507e+00, 1.007470607757568e+00, 1.001608490943909e+00, 1.000197649002075e+00, 9.998603463172913e-01, 9.9977707862854e-01, 9.997564554214478e-01, 9.997519254684448e-01, 9.997510313987732e-01, 9.997530579566956e-01, 9.997526407241821e-01, 9.997508525848389e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997504949569702e-01, 9.997509121894836e-01, 9.997506141662598e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01]
-floMac2.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2.8595322265625e+03, -3.88809765625e+03, -4.34520458984375e+03, -4.39328857421875e+03, -4.29246875e+03, -4.182300292968749e+03, -4.088017089843751e+03, -4.029822021484375e+03, -4.009e+03, -4.003074462890625e+03, -4.0015224609375e+03, -4.001129638671875e+03, -4.001031494140625e+03, -4.001007568359375e+03, -4.001001708984375e+03, -4.001000244140625e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03]
-floMac1.m_flow=[-9.955859985351562e+02, 7.698646187782288e-02, 4.694104492664337e-01, 6.230761408805847e-01, 6.905182600021362e-01, 7.209883332252502e-01, 7.348966598510742e-01, 7.412737011909485e-01, 7.441999316215515e-01, 7.455441355705261e-01, 7.461614012718201e-01, 7.464463710784912e-01, 7.465773820877075e-01, 7.466378808021545e-01, 7.466645836830139e-01, 7.466752529144287e-01, 7.466810345649719e-01, 7.46685802936554e-01, 7.466890811920166e-01, 7.466908097267151e-01, 7.466919422149658e-01, 7.466914057731628e-01, 7.46690571308136e-01, 7.466898560523987e-01, 7.466892600059509e-01, 7.466888427734375e-01, 7.466889023780823e-01, 7.466889023780823e-01, 7.466890811920166e-01, 7.466892600059509e-01, 7.466894388198853e-01, 7.466896176338196e-01, 7.466897964477539e-01, 7.466898560523987e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897368431091e-01, 7.466896772384644e-01, 7.466896176338196e-01, 7.466895580291748e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466893792152405e-01, 6.397221684455872e-01, 5.117190480232239e-01, 4.548328518867493e-01, 4.488489329814911e-01, 4.61395800113678e-01, 4.751060307025911e-01, 4.868394136428832e-01, 4.940817058086395e-01, 4.966729879379272e-01, 4.97410386800766e-01, 4.976035356521606e-01, 4.976524412631989e-01, 4.976646304130554e-01, 4.976676106452942e-01, 4.976683557033539e-01, 4.976685345172882e-01, 4.976685643196106e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
-floMac2.m_flow=[-9.955859985351562e+02, 7.698646187782288e-02, 4.694104492664337e-01, 6.230761408805847e-01, 6.905182600021362e-01, 7.209883332252502e-01, 7.348966598510742e-01, 7.412737011909485e-01, 7.441999316215515e-01, 7.455441355705261e-01, 7.461614012718201e-01, 7.464463710784912e-01, 7.465773820877075e-01, 7.466378808021545e-01, 7.466645836830139e-01, 7.466752529144287e-01, 7.466810345649719e-01, 7.46685802936554e-01, 7.466890811920166e-01, 7.466908097267151e-01, 7.466919422149658e-01, 7.466914057731628e-01, 7.46690571308136e-01, 7.466898560523987e-01, 7.466892600059509e-01, 7.466888427734375e-01, 7.466889023780823e-01, 7.466889023780823e-01, 7.466890811920166e-01, 7.466892600059509e-01, 7.466894388198853e-01, 7.466896176338196e-01, 7.466897964477539e-01, 7.466898560523987e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897964477539e-01, 7.466897368431091e-01, 7.466896772384644e-01, 7.466896176338196e-01, 7.466895580291748e-01, 7.466895580291748e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466894388198853e-01, 7.466893792152405e-01, 6.397221684455872e-01, 5.117190480232239e-01, 4.548328518867493e-01, 4.488489329814911e-01, 4.61395800113678e-01, 4.751060307025911e-01, 4.868394136428832e-01, 4.940817058086395e-01, 4.966729879379272e-01, 4.97410386800766e-01, 4.976035356521606e-01, 4.976524412631989e-01, 4.976646304130554e-01, 4.976676106452942e-01, 4.976683557033539e-01, 4.976685345172882e-01, 4.976685643196106e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
+floMac1.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.515716918945312e+03, -1.06652587890625e+03, -6.586179809570312e+02, -2.997312622070312e+02, 3.333055675029755e-01, 2.289754638671892e+02, 3.697194519042959e+02, 4.005999145507812e+02, 2.916676025390625e+02, 1.020210146903992e+00, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01, 9.997500777244568e-01]
+floMac2.dp=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2.484283203125e+03, -2.93347412109375e+03, -3.341382080078125e+03, -3.700268798828125e+03, -4.000333251953125e+03, -4.228975585937502e+03, -4.369719238281249e+03, -4.40060009765625e+03, -4.29166748046875e+03, -4.001020263671875e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03, -4.000999755859375e+03]
+floMac1.m_flow=[-9.955859985351562e+02, -2.384042263031006e+00, -1.044320940971375e+00, -5.30669629573822e-01, -2.239228785037994e-01, 4.669875597329565e-15, 1.824936866760254e-01, 3.413071930408479e-01, 4.853178560733795e-01, 6.194584965705872e-01, 7.462338805198669e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 6.864213347434998e-01, 6.305202841758728e-01, 5.797568559646606e-01, 5.350940227508545e-01, 4.977515339851379e-01, 4.69297409057617e-01, 4.517820477485658e-01, 4.479390382766724e-01, 4.614954888820648e-01, 4.976660311222076e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
+floMac2.m_flow=[-9.955859985351562e+02, -2.384042263031006e+00, -1.044320940971375e+00, -5.30669629573822e-01, -2.239228785037994e-01, 4.669875597329565e-15, 1.824936866760254e-01, 3.413071930408479e-01, 4.853178560733795e-01, 6.194584965705872e-01, 7.462338805198669e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 7.4668949842453e-01, 6.864213347434998e-01, 6.305202841758728e-01, 5.797568559646606e-01, 5.350940227508545e-01, 4.977515339851379e-01, 4.69297409057617e-01, 4.517820477485658e-01, 4.479390382766724e-01, 4.614954888820648e-01, 4.976660311222076e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01, 4.97668594121933e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
index 5242279cde..90c49009af 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Examples_StaticReset.txt
@@ -1,4 +1,4 @@
-last-generated=2023-02-01
+last-generated=2024-09-19
 statistics-initialization=
 {
   "nonlinear": "1, 0, 1, 0, 1, 0",
@@ -8,13 +8,13 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 1, 1",
-  "number of continuous time states": "21",
+  "number of continuous time states": "15",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+03]
-fan1.P=[0e+00, 6.37822151184082e-02, 2.43301048874855e-01, 7.878413200378418e-01, 2.350958824157715e+00, 6.652777194976807e+00, 1.837021255493164e+01, 5.114969635009771e+01, 1.437913055419922e+02, 3.450308532714844e+02, 6.635015258789062e+02, 1.189980712890625e+03, 1.990408447265625e+03, 3.104797607421875e+03, 4.522754882812503e+03, 4.95498828125e+03, 4.9754697265625e+03, 4.9931611328125e+03, 5.0059072265625e+03, 5.01852783203125e+03, 5.0323427734375e+03, 5.04749462890625e+03, 5.06411181640625e+03, 5.0823291015625e+03, 5.1022900390625e+03, 5.12414794921875e+03, 5.14806494140625e+03, 5.17421142578125e+03, 5.20276513671875e+03, 5.23390966796875e+03, 5.26783203125e+03, 5.30472021484375e+03, 5.3447587890625e+03, 5.388126953125e+03, 5.43499169921875e+03, 5.4855078125e+03, 5.53981005859375e+03, 5.59801220703125e+03, 5.660205078125e+03, 5.72645751953125e+03, 5.79681494140625e+03, 5.87130615234375e+03, 5.9499462890625e+03, 6.03274365234375e+03, 6.11970654296875e+03, 6.2108505859375e+03, 6.30620556640625e+03, 6.40582080078125e+03, 6.50977294921875e+03, 6.6181669921875e+03, 6.7311435546875e+03, 6.84887939453125e+03, 6.97159130859375e+03, 7.0995390625e+03, 7.233026367187501e+03, 7.372406250000001e+03, 7.518080566406251e+03, 7.6705068359375e+03, 7.830203125e+03, 7.9977509765625e+03, 8.1738515625e+03, 8.3594384765625e+03, 8.555205078125e+03, 8.761091796875e+03, 8.9768056640625e+03, 9.202966796875e+03, 9.4400810546875e+03, 9.6884658203125e+03, 9.9484365234375e+03, 1.02202919921875e+04, 1.05043154296875e+04, 1.0800765625e+04, 1.11098876953125e+04, 1.1431935546875e+04, 1.17669736328125e+04, 1.21152421875e+04, 1.24769296875e+04, 1.28521796875e+04, 1.3241064453125e+04, 1.3643609375e+04, 1.4059736328125e+04, 1.44892724609375e+04, 1.4931984375e+04, 1.53875302734375e+04, 1.58554736328125e+04, 1.633527734375e+04, 1.6826318359375e+04, 1.73278828125e+04, 1.783914453125e+04, 1.835921484375e+04, 1.8887119140625e+04, 1.9421818359375e+04, 1.9962216796875e+04, 2.0507171875e+04, 2.1055505859375e+04, 2.16060234375e+04, 2.2157505859375e+04, 2.2708748046875e+04, 2.325856640625e+04, 2.38057890625e+04, 2.434926953125e+04]
-fan2.P=[0e+00, 6.37822151184082e-02, 2.43301048874855e-01, 7.878413200378418e-01, 2.350958824157715e+00, 6.652777194976807e+00, 1.837021255493164e+01, 5.114969635009771e+01, 1.437913055419922e+02, 3.450308532714844e+02, 6.635015258789062e+02, 1.189980712890625e+03, 1.990408447265625e+03, 3.104797607421875e+03, 4.516426269531253e+03, 6.1784755859375e+03, 6.43138720703125e+03, 6.44997265625e+03, 6.4633798828125e+03, 6.47662109375e+03, 6.4911064453125e+03, 6.50699267578125e+03, 6.52441552734375e+03, 6.5435166015625e+03, 6.5644462890625e+03, 6.58736572265625e+03, 6.61244580078125e+03, 6.639865234375e+03, 6.6698115234375e+03, 6.70247802734375e+03, 6.73806201171875e+03, 6.77676171875e+03, 6.8187734375e+03, 6.8642861328125e+03, 6.91347998046875e+03, 6.96651904296875e+03, 7.02354931640625e+03, 7.0846962890625e+03, 7.1500615234375e+03, 7.21972216796875e+03, 7.293736328125e+03, 7.37214208984375e+03, 7.4549658203125e+03, 7.5422265625e+03, 7.6339462890625e+03, 7.73015380859375e+03, 7.83089453125e+03, 7.93623583984375e+03, 8.04627392578125e+03, 8.16113720703125e+03, 8.2809912109375e+03, 8.40604296875e+03, 8.536541015625e+03, 8.6727802734375e+03, 8.815106445312502e+03, 8.964146484375002e+03, 9.121343750000002e+03, 9.2872177734375e+03, 9.4622021484375e+03, 9.6467626953125e+03, 9.8413681640625e+03, 1.00463857421875e+04, 1.02622880859375e+04, 1.0488763671875e+04, 1.07251884765625e+04, 1.09718974609375e+04, 1.122907421875e+04, 1.149666015625e+04, 1.17745576171875e+04, 1.2062615234375e+04, 1.236062890625e+04, 1.26683447265625e+04, 1.29858291015625e+04, 1.33134072265625e+04, 1.365124609375e+04, 1.39998330078125e+04, 1.43596328125e+04, 1.4731091796875e+04, 1.5114607421875e+04, 1.55105478515625e+04, 1.59191865234375e+04, 1.63407041015625e+04, 1.67752265625e+04, 1.72227578125e+04, 1.7683201171875e+04, 1.81563359375e+04, 1.86418359375e+04, 1.9138837890625e+04, 1.9644033203125e+04, 2.0156259765625e+04, 2.067476953125e+04, 2.11987265625e+04, 2.1727244140625e+04, 2.225936328125e+04, 2.279408984375e+04, 2.3330390625e+04, 2.3867201171875e+04, 2.440344921875e+04, 2.493808203125e+04, 2.5470037109375e+04, 2.5998263671875e+04]
-fan3.P=[0e+00, 1.301677897572517e-03, 4.965327680110931e-03, 1.60783939063549e-02, 4.797875136137009e-02, 1.357709616422653e-01, 3.749023079872131e-01, 1.04387128353119e+00, 2.934516429901123e+00, 7.041445732116699e+00, 1.354084777832031e+01, 2.428532028198242e+01, 4.062057876586914e+01, 6.336322021484375e+01, 9.217196655273443e+01, 1.250319595336914e+02, 1.581680603027344e+02, 1.866132202148438e+02, 2.069951171875e+02, 2.273897247314453e+02, 2.497643280029297e+02, 2.743042602539062e+02, 3.012080078125e+02, 3.306885681152344e+02, 3.629734497070312e+02, 3.98304443359375e+02, 4.369366455078125e+02, 4.791370239257814e+02, 5.251821289062501e+02, 5.7535498046875e+02, 6.29941162109375e+02, 6.892235717773438e+02, 7.534766235351562e+02, 8.229594116210938e+02, 8.97908447265625e+02, 9.785307006835938e+02, 1.064996948242188e+03, 1.157436645507812e+03, 1.25593505859375e+03, 1.36053271484375e+03, 1.471227905273438e+03, 1.587982788085938e+03, 1.71073095703125e+03, 1.839388305664062e+03, 1.973863525390625e+03, 2.114070068359375e+03, 2.25993701171875e+03, 2.411417724609375e+03, 2.568499267578125e+03, 2.731207763671875e+03, 2.8996142578125e+03, 3.073838623046875e+03, 3.25405126953125e+03, 3.440478271484375e+03, 3.633402099609376e+03, 3.833165039062501e+03, 4.040174072265626e+03, 4.2549033203125e+03, 4.47790185546875e+03, 4.7097998046875e+03, 4.951330078125e+03, 5.20335986328125e+03, 5.46676708984375e+03, 5.741263671875e+03, 6.0264677734375e+03, 6.32325537109375e+03, 6.63221728515625e+03, 6.95368896484375e+03, 7.28799951171875e+03, 7.6354619140625e+03, 7.99636669921875e+03, 8.3709814453125e+03, 8.759578125e+03, 9.1625419921875e+03, 9.5798994140625e+03, 1.00117607421875e+04, 1.045817578125e+04, 1.09191416015625e+04, 1.13945771484375e+04, 1.188434765625e+04, 1.23882138671875e+04, 1.2905837890625e+04, 1.3436822265625e+04, 1.398065625e+04, 1.453673828125e+04, 1.5104369140625e+04, 1.56827666015625e+04, 1.62710576171875e+04, 1.6868271484375e+04, 1.7473373046875e+04, 1.8085251953125e+04, 1.8702744140625e+04, 1.9324630859375e+04, 1.994966015625e+04, 2.057655859375e+04, 2.1204033203125e+04, 2.1830787109375e+04, 2.2455544921875e+04, 2.3077060546875e+04, 2.3694111328125e+04, 2.430551171875e+04]
-fan1.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
-fan2.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
-fan3.y_actual=[0e+00, 5.898704528808594e-01, 6.386487483978271e-01, 6.476296782493591e-01, 6.493147611618042e-01, 6.496323943138123e-01, 6.496935486793518e-01, 6.497072577476501e-01, 6.497147083282471e-01, 6.497257351875305e-01, 6.497452259063721e-01, 6.497777700424194e-01, 6.498280763626099e-01, 6.498994827270508e-01, 6.499918699264526e-01, 6.500999927520752e-01, 6.502125859260559e-01, 6.503137350082397e-01, 6.503891348838806e-01, 6.504585146903992e-01, 6.50533139705658e-01, 6.506147384643555e-01, 6.507042050361633e-01, 6.508023738861084e-01, 6.509100198745728e-01, 6.510279178619385e-01, 6.511571407318115e-01, 6.512986421585083e-01, 6.514533758163452e-01, 6.516225934028625e-01, 6.518073081970215e-01, 6.520088911056519e-01, 6.522285342216492e-01, 6.524675488471985e-01, 6.527272462844849e-01, 6.530089974403381e-01, 6.533141732215881e-01, 6.536440253257751e-01, 6.540000438690186e-01, 6.543834805488586e-01, 6.547958254814148e-01, 6.552384495735168e-01, 6.55712902545929e-01, 6.562207937240601e-01, 6.567638516426086e-01, 6.573439836502075e-01, 6.579633355140686e-01, 6.586242914199829e-01, 6.593294739723206e-01, 6.600818634033203e-01, 6.608846783638e-01, 6.617415547370911e-01, 6.626565456390381e-01, 6.636340618133545e-01, 6.646788716316223e-01, 6.657962203025818e-01, 6.669917702674866e-01, 6.682717204093933e-01, 6.696426868438721e-01, 6.711117029190063e-01, 6.726853847503662e-01, 6.743670701980591e-01, 6.761629581451416e-01, 6.780781745910645e-01, 6.801111102104187e-01, 6.822678446769714e-01, 6.845569014549255e-01, 6.86985194683075e-01, 6.895600557327271e-01, 6.922883987426758e-01, 6.951767802238464e-01, 6.982313990592957e-01, 7.014559507369995e-01, 7.048414945602417e-01, 7.083806991577148e-01, 7.120717763900757e-01, 7.15911865234375e-01, 7.198972105979919e-01, 7.240231037139893e-01, 7.282840609550476e-01, 7.326732277870178e-01, 7.371826171875e-01, 7.41803765296936e-01, 7.465271949768066e-01, 7.513425946235657e-01, 7.562389969825745e-01, 7.612049579620361e-01, 7.662285566329956e-01, 7.712973952293396e-01, 7.763990163803101e-01, 7.815207839012146e-01, 7.866501212120056e-01, 7.917746901512146e-01, 7.968824505805969e-01, 8.019615411758423e-01, 8.070008158683777e-01, 8.119895458221436e-01, 8.169176578521729e-01, 8.217758536338806e-01, 8.26555609703064e-01, 8.312487602233887e-01]
+fan1.P=[0e+00, 1.616507470607758e-01, 6.349126100540161e-01, 1.989501118659973e+00, 5.716249465942383e+00, 1.584262561798096e+01, 4.401175689697266e+01, 1.24029151916504e+02, 3.119059753417969e+02, 6.06017578125e+02, 1.097951171875e+03, 1.855180053710938e+03, 2.923345458984375e+03, 4.2958251953125e+03, 4.9519873046875e+03, 4.9725927734375e+03, 4.99086767578125e+03, 5.00413671875e+03, 5.016623046875e+03, 5.03026318359375e+03, 5.0452158203125e+03, 5.06161376953125e+03, 5.07959130859375e+03, 5.099291015625e+03, 5.12086474609375e+03, 5.1444736328125e+03, 5.170287109375e+03, 5.1984814453125e+03, 5.229240234375e+03, 5.26274951171875e+03, 5.299197265625e+03, 5.33876904296875e+03, 5.38164501953125e+03, 5.4279951171875e+03, 5.47797412109375e+03, 5.53172119140625e+03, 5.589353515625e+03, 5.65096484375e+03, 5.716626953125e+03, 5.78638916015625e+03, 5.86028173828125e+03, 5.93832177734375e+03, 6.0205185546875e+03, 6.1068798828125e+03, 6.19741943359375e+03, 6.2921650390625e+03, 6.3911630859375e+03, 6.4944853515625e+03, 6.6022333984375e+03, 6.7145419921875e+03, 6.83158203125e+03, 6.95356591796875e+03, 7.08074609375e+03, 7.213419921875e+03, 7.351933105468751e+03, 7.496680664062501e+03, 7.648112304687501e+03, 7.8067353515625e+03, 7.97312353515625e+03, 8.1479423828125e+03, 8.3321162109375e+03, 8.526384765625e+03, 8.730873046875e+03, 8.9451416015625e+03, 9.1697626953125e+03, 9.4052939453125e+03, 9.652044921875e+03, 9.9103466796875e+03, 1.01804912109375e+04, 1.0462759765625e+04, 1.07574189453125e+04, 1.10646904296875e+04, 1.138484765625e+04, 1.1717986328125e+04, 1.206433203125e+04, 1.242406640625e+04, 1.2797345703125e+04, 1.31842568359375e+04, 1.35848173828125e+04, 1.39989638671875e+04, 1.44265517578125e+04, 1.486734765625e+04, 1.53210263671875e+04, 1.5787166015625e+04, 1.6265248046875e+04, 1.675466015625e+04, 1.7254693359375e+04, 1.7764546875e+04, 1.828333984375e+04, 1.8810107421875e+04, 1.934382421875e+04, 1.9883400390625e+04, 2.042769921875e+04, 2.0975548828125e+04, 2.152575e+04, 2.207709765625e+04, 2.26283828125e+04, 2.317841015625e+04, 2.372601171875e+04, 2.4270052734375e+04, 2.48094453125e+04]
+fan2.P=[0e+00, 1.616507470607758e-01, 6.349126100540161e-01, 1.989501118659973e+00, 5.716249465942383e+00, 1.584262561798096e+01, 4.401175689697266e+01, 1.24029151916504e+02, 3.119059753417969e+02, 6.06017578125e+02, 1.097951171875e+03, 1.855180053710938e+03, 2.923345458984375e+03, 4.2958251953125e+03, 5.898648437500003e+03, 6.42836767578125e+03, 6.447556640625e+03, 6.4615146484375e+03, 6.474623046875e+03, 6.488927734375e+03, 6.50460595703125e+03, 6.52179931640625e+03, 6.5406484375e+03, 6.5613046875e+03, 6.58392626953125e+03, 6.60868359375e+03, 6.63575390625e+03, 6.6653232421875e+03, 6.6975849609375e+03, 6.7327353515625e+03, 6.77097265625e+03, 6.812494140625e+03, 6.85748974609375e+03, 6.90614111328125e+03, 6.958615234375e+03, 7.01506103515625e+03, 7.0756064453125e+03, 7.1403564453125e+03, 7.20939306640625e+03, 7.282775390625e+03, 7.36054541015625e+03, 7.44272998046875e+03, 7.529349609375e+03, 7.6204248046875e+03, 7.71598291015625e+03, 7.8160673828125e+03, 7.92074169921875e+03, 8.03009765625e+03, 8.14425927734375e+03, 8.2633857421875e+03, 8.387677734375e+03, 8.51737890625e+03, 8.65277734375e+03, 8.7942099609375e+03, 8.942196289062502e+03, 9.098183593750002e+03, 9.262791015625002e+03, 9.4364443359375e+03, 9.6196064453125e+03, 9.81275390625e+03, 1.00162431640625e+04, 1.0230560546875e+04, 1.04555947265625e+04, 1.06905771484375e+04, 1.09357900390625e+04, 1.1191482421875e+04, 1.14575869140625e+04, 1.1734033203125e+04, 1.20206630859375e+04, 1.23172783203125e+04, 1.26236357421875e+04, 1.29396748046875e+04, 1.32657705078125e+04, 1.360208984375e+04, 1.394909765625e+04, 1.43072431640625e+04, 1.46769873046875e+04, 1.5058736328125e+04, 1.54528466796875e+04, 1.58596064453125e+04, 1.62792275390625e+04, 1.671183203125e+04, 1.71574453125e+04, 1.7615984375e+04, 1.8087251953125e+04, 1.8570935546875e+04, 1.90663984375e+04, 1.9570451171875e+04, 2.0081640625e+04, 2.059921875e+04, 2.112237109375e+04, 2.1650212890625e+04, 2.2181798828125e+04, 2.271613671875e+04, 2.32521953125e+04, 2.3788921875e+04, 2.4325248046875e+04, 2.486010546875e+04, 2.539244140625e+04, 2.5921220703125e+04, 2.6445439453125e+04]
+fan3.P=[0e+00, 3.298994852229953e-03, 1.295739971101284e-02, 4.060206189751625e-02, 1.166581511497498e-01, 3.233188688755035e-01, 8.981990814208984e-01, 2.531207084655764e+00, 6.36542797088623e+00, 1.236770534515381e+01, 2.240716552734375e+01, 3.786081695556641e+01, 5.966011047363281e+01, 8.766989898681641e+01, 1.20137062072754e+02, 1.535231628417969e+02, 1.829728851318359e+02, 2.041864013671875e+02, 2.243095397949219e+02, 2.463859252929688e+02, 2.705996704101562e+02, 2.971474914550781e+02, 3.262402954101562e+02, 3.581034851074219e+02, 3.929768981933594e+02, 4.311137084960938e+02, 4.727793273925781e+02, 5.182490234375001e+02, 5.678052978515626e+02, 6.217334594726562e+02, 6.803172607421875e+02, 7.438327026367188e+02, 8.125415649414062e+02, 8.8668408203125e+02, 9.664719848632812e+02, 1.052081665039062e+03, 1.143648803710938e+03, 1.24126513671875e+03, 1.344977661132812e+03, 1.45479052734375e+03, 1.570670776367188e+03, 1.692555419921875e+03, 1.8203623046875e+03, 1.954000610351562e+03, 2.09338232421875e+03, 2.23843359375e+03, 2.38910400390625e+03, 2.545375244140625e+03, 2.707267578125e+03, 2.874845458984375e+03, 3.048220703125e+03, 3.227557373046875e+03, 3.41307275390625e+03, 3.605041259765625e+03, 3.803796386718751e+03, 4.009735351562501e+03, 4.223322753906252e+03, 4.445095703125e+03, 4.675673828125e+03, 4.915767578125e+03, 5.16622900390625e+03, 5.42794580078125e+03, 5.7009384765625e+03, 5.9845517578125e+03, 6.279623046875e+03, 6.5868203125e+03, 6.90647607421875e+03, 7.23893212890625e+03, 7.58449560546875e+03, 7.943458984375e+03, 8.316095703125e+03, 8.7026474609375e+03, 9.10351953125e+03, 9.518787109375e+03, 9.948552734375e+03, 1.039286328125e+04, 1.08517294921875e+04, 1.13250849609375e+04, 1.18127880859375e+04, 1.23146162109375e+04, 1.28302587890625e+04, 1.33593173828125e+04, 1.39012978515625e+04, 1.4455615234375e+04, 1.50215859375e+04, 1.55984365234375e+04, 1.61853037109375e+04, 1.6781234375e+04, 1.7385205078125e+04, 1.799611328125e+04, 1.86128046875e+04, 1.923406640625e+04, 1.985865625e+04, 2.0485294921875e+04, 2.1112693359375e+04, 2.1739560546875e+04, 2.2364619140625e+04, 2.2986611328125e+04, 2.360431640625e+04, 2.42165546875e+04, 2.4822205078125e+04]
+fan1.y_actual=[0e+00, 6.067862510681152e-01, 6.397482752799988e-01, 6.47385835647583e-01, 6.49165153503418e-01, 6.495808362960815e-01, 6.496798992156982e-01, 6.497074961662292e-01, 6.497225165367126e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499784588813782e-01, 6.500844359397888e-01, 6.501965522766113e-01, 6.502994894981384e-01, 6.503781676292419e-01, 6.504481434822083e-01, 6.505221724510193e-01, 6.506028175354004e-01, 6.506911516189575e-01, 6.507880687713623e-01, 6.508942842483521e-01, 6.510107517242432e-01, 6.511383056640625e-01, 6.51278018951416e-01, 6.514308452606201e-01, 6.515979170799255e-01, 6.517804265022278e-01, 6.519795656204224e-01, 6.521965265274048e-01, 6.524327397346497e-01, 6.526894569396973e-01, 6.529679894447327e-01, 6.532697081565857e-01, 6.535959839820862e-01, 6.53948187828064e-01, 6.543276309967041e-01, 6.54735803604126e-01, 6.551740169525146e-01, 6.556438803672791e-01, 6.561468839645386e-01, 6.566848158836365e-01, 6.572595834732056e-01, 6.578732132911682e-01, 6.585281491279602e-01, 6.592268943786621e-01, 6.599723696708679e-01, 6.607678532600403e-01, 6.616168618202209e-01, 6.625234484672546e-01, 6.634918451309204e-01, 6.645268201828003e-01, 6.656336188316345e-01, 6.66817843914032e-01, 6.68085515499115e-01, 6.694431900978088e-01, 6.708979606628418e-01, 6.72456681728363e-01, 6.741224527359009e-01, 6.759018301963806e-01, 6.777999401092529e-01, 6.798157691955566e-01, 6.819542646408081e-01, 6.842241883277893e-01, 6.866321563720703e-01, 6.891859173774719e-01, 6.918920278549194e-01, 6.947572231292725e-01, 6.977877020835876e-01, 7.009878158569336e-01, 7.043501138687134e-01, 7.07866907119751e-01, 7.115361094474792e-01, 7.153546214103699e-01, 7.193190455436707e-01, 7.234247922897339e-01, 7.276661992073059e-01, 7.320367693901062e-01, 7.36528754234314e-01, 7.411336898803711e-01, 7.458422780036926e-01, 7.506442666053772e-01, 7.555289268493652e-01, 7.604847550392151e-01, 7.654998898506165e-01, 7.705620527267456e-01, 7.756588459014893e-01, 7.807775139808655e-01, 7.859057188034058e-01, 7.910308837890625e-01, 7.961409091949463e-01, 8.012240529060364e-01, 8.062689304351807e-01, 8.112648129463196e-01, 8.162015676498413e-01, 8.210697770118713e-01, 8.258606791496277e-01, 8.3056640625e-01, 8.351798057556152e-01]
+fan2.y_actual=[0e+00, 6.067862510681152e-01, 6.397482752799988e-01, 6.47385835647583e-01, 6.49165153503418e-01, 6.495808362960815e-01, 6.496798992156982e-01, 6.497074961662292e-01, 6.497225165367126e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499784588813782e-01, 6.500844359397888e-01, 6.501965522766113e-01, 6.502994894981384e-01, 6.503781676292419e-01, 6.504481434822083e-01, 6.505221724510193e-01, 6.506028175354004e-01, 6.506911516189575e-01, 6.507880687713623e-01, 6.508942842483521e-01, 6.510107517242432e-01, 6.511383056640625e-01, 6.51278018951416e-01, 6.514308452606201e-01, 6.515979170799255e-01, 6.517804265022278e-01, 6.519795656204224e-01, 6.521965265274048e-01, 6.524327397346497e-01, 6.526894569396973e-01, 6.529679894447327e-01, 6.532697081565857e-01, 6.535959839820862e-01, 6.53948187828064e-01, 6.543276309967041e-01, 6.54735803604126e-01, 6.551740169525146e-01, 6.556438803672791e-01, 6.561468839645386e-01, 6.566848158836365e-01, 6.572595834732056e-01, 6.578732132911682e-01, 6.585281491279602e-01, 6.592268943786621e-01, 6.599723696708679e-01, 6.607678532600403e-01, 6.616168618202209e-01, 6.625234484672546e-01, 6.634918451309204e-01, 6.645268201828003e-01, 6.656336188316345e-01, 6.66817843914032e-01, 6.68085515499115e-01, 6.694431900978088e-01, 6.708979606628418e-01, 6.72456681728363e-01, 6.741224527359009e-01, 6.759018301963806e-01, 6.777999401092529e-01, 6.798157691955566e-01, 6.819542646408081e-01, 6.842241883277893e-01, 6.866321563720703e-01, 6.891859173774719e-01, 6.918920278549194e-01, 6.947572231292725e-01, 6.977877020835876e-01, 7.009878158569336e-01, 7.043501138687134e-01, 7.07866907119751e-01, 7.115361094474792e-01, 7.153546214103699e-01, 7.193190455436707e-01, 7.234247922897339e-01, 7.276661992073059e-01, 7.320367693901062e-01, 7.36528754234314e-01, 7.411336898803711e-01, 7.458422780036926e-01, 7.506442666053772e-01, 7.555289268493652e-01, 7.604847550392151e-01, 7.654998898506165e-01, 7.705620527267456e-01, 7.756588459014893e-01, 7.807775139808655e-01, 7.859057188034058e-01, 7.910308837890625e-01, 7.961409091949463e-01, 8.012240529060364e-01, 8.062689304351807e-01, 8.112648129463196e-01, 8.162015676498413e-01, 8.210697770118713e-01, 8.258606791496277e-01, 8.3056640625e-01, 8.351798057556152e-01]
+fan3.y_actual=[0e+00, 6.067862510681152e-01, 6.397482752799988e-01, 6.47385835647583e-01, 6.49165153503418e-01, 6.495808362960815e-01, 6.496798992156982e-01, 6.497074961662292e-01, 6.497225165367126e-01, 6.497418880462646e-01, 6.497728228569031e-01, 6.498205661773682e-01, 6.498889923095703e-01, 6.499784588813782e-01, 6.500844359397888e-01, 6.501965522766113e-01, 6.502994894981384e-01, 6.503781676292419e-01, 6.504481434822083e-01, 6.505221724510193e-01, 6.506028175354004e-01, 6.506911516189575e-01, 6.507880687713623e-01, 6.508942842483521e-01, 6.510107517242432e-01, 6.511383056640625e-01, 6.51278018951416e-01, 6.514308452606201e-01, 6.515979170799255e-01, 6.517804265022278e-01, 6.519795656204224e-01, 6.521965265274048e-01, 6.524327397346497e-01, 6.526894569396973e-01, 6.529679894447327e-01, 6.532697081565857e-01, 6.535959839820862e-01, 6.53948187828064e-01, 6.543276309967041e-01, 6.54735803604126e-01, 6.551740169525146e-01, 6.556438803672791e-01, 6.561468839645386e-01, 6.566848158836365e-01, 6.572595834732056e-01, 6.578732132911682e-01, 6.585281491279602e-01, 6.592268943786621e-01, 6.599723696708679e-01, 6.607678532600403e-01, 6.616168618202209e-01, 6.625234484672546e-01, 6.634918451309204e-01, 6.645268201828003e-01, 6.656336188316345e-01, 6.66817843914032e-01, 6.68085515499115e-01, 6.694431900978088e-01, 6.708979606628418e-01, 6.72456681728363e-01, 6.741224527359009e-01, 6.759018301963806e-01, 6.777999401092529e-01, 6.798157691955566e-01, 6.819542646408081e-01, 6.842241883277893e-01, 6.866321563720703e-01, 6.891859173774719e-01, 6.918920278549194e-01, 6.947572231292725e-01, 6.977877020835876e-01, 7.009878158569336e-01, 7.043501138687134e-01, 7.07866907119751e-01, 7.115361094474792e-01, 7.153546214103699e-01, 7.193190455436707e-01, 7.234247922897339e-01, 7.276661992073059e-01, 7.320367693901062e-01, 7.36528754234314e-01, 7.411336898803711e-01, 7.458422780036926e-01, 7.506442666053772e-01, 7.555289268493652e-01, 7.604847550392151e-01, 7.654998898506165e-01, 7.705620527267456e-01, 7.756588459014893e-01, 7.807775139808655e-01, 7.859057188034058e-01, 7.910308837890625e-01, 7.961409091949463e-01, 8.012240529060364e-01, 8.062689304351807e-01, 8.112648129463196e-01, 8.162015676498413e-01, 8.210697770118713e-01, 8.258606791496277e-01, 8.3056640625e-01, 8.351798057556152e-01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
index 860d1f9cca..82473b4d6a 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Preconfigured_Validation_ControlledFlowMachinePreconfigured.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-05
+last-generated=2024-09-19
 statistics-initialization=
 {
   "nonlinear": "1, 1, 0, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 1, 0, 1",
-  "number of continuous time states": "15",
+  "number of continuous time states": "12",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 1.278694748878479e+00, 1.549441695213318e+00, 1.606706619262695e+00, 1.618815779685974e+00, 1.621374130249023e+00, 1.621917724609375e+00, 1.622032523155212e+00, 1.622056365013123e+00, 1.622061491012573e+00, 1.622062206268311e+00, 8.752594590187073e-01, 2.08819180727005e-01, 1.861694268882275e-02, 1.363048562780016e-03, 9.01221064850688e-05, 5.623493507300736e-06, 3.133573045488431e-07, 1.13955138658639e-08, -1.244507075170986e-08, -3.359173206263222e-08, 7.495246529579163e-01, 1.323916673660278e+00, 1.535160422325134e+00, 1.598641872406006e+00, 1.616044402122498e+00, 1.620565056800842e+00, 1.621698260307312e+00, 1.621975421905518e+00, 1.622042298316956e+00, 1.622058272361755e+00, 8.75255823135376e-01, 2.087867259979248e-01, 1.861702091991901e-02, 1.363056944683181e-03, 9.015454998007044e-05, 5.652871095662704e-06, 1.145772330346517e-07, -1.114312908612192e-08, -7.113612809916958e-09, -1.83904376171995e-08, 7.470592856407123e-01, 1.323917269706726e+00, 1.535152196884155e+00, 1.598642110824585e+00, 1.616045117378235e+00, 1.620564699172974e+00, 1.621700644493103e+00, 1.621977686882019e+00, 1.622043132781982e+00, 1.622058391571045e+00, 8.752558827400208e-01, 2.087872922420502e-01, 1.861701719462872e-02, 1.363056595437229e-03, 9.021081496030092e-05, 5.571381279878438e-06, 3.292930159659688e-07, 2.395518094999716e-08, 1.249236447620206e-08, -2.810338628478348e-10, 7.457569241523743e-01, 1.323928117752075e+00, 1.535154342651367e+00, 1.598635673522949e+00, 1.616042494773865e+00, 1.620565295219421e+00, 1.62169873714447e+00, 1.621975660324097e+00, 1.622041940689087e+00, 1.622057914733887e+00, 8.752556443214417e-01, 2.087853103876114e-01, 1.861703023314476e-02, 1.363047049380839e-03, 9.02090105228126e-05, 5.116904503665864e-06, 2.555261744419113e-07, -9.187715477310121e-09, 1.041826180880889e-09, 5.638867150992155e-11, 7.461619377136304e-01, 1.323922753334042e+00, 1.535153746604919e+00, 1.598641633987427e+00, 1.616046190261841e+00, 1.620566248893738e+00, 1.621700048446655e+00, 1.621976375579834e+00, 1.622042417526245e+00, 1.622057914733887e+00, 8.752556443214417e-01, 2.087854295969009e-01, 1.861703023314476e-02, 1.363047049380839e-03, 9.020829747896641e-05, 5.109519861434819e-06, 2.547367330407724e-07, -9.473296813666821e-09, 1.042280928231776e-09, 5.547917680814862e-11]
-fan2.m_flow=[0e+00, 3.238261640071869e-01, 9.70430314540863e-01, 1.368154168128967e+00, 1.535677194595337e+00, 1.595240592956543e+00, 1.614236235618591e+00, 1.619882702827454e+00, 1.621473670005798e+00, 1.621907234191895e+00, 1.62201189994812e+00, 1.504447460174561e+00, 1.004021525382996e+00, 4.560884535312653e-01, 1.587975770235058e-01, 4.745125025510788e-02, 1.302728336304426e-02, 3.391751786693921e-03, 8.492695633322001e-04, 2.058757527265698e-04, 4.799016460310668e-05, 9.450884908437729e-02, 5.979772210121155e-01, 1.10500705242157e+00, 1.404872536659241e+00, 1.541112661361694e+00, 1.596185088157654e+00, 1.613284945487976e+00, 1.619389772415161e+00, 1.621281981468201e+00, 1.621844530105591e+00, 1.504400491714478e+00, 1.004008412361145e+00, 4.549911022186279e-01, 1.587940454483024e-01, 4.745637252926826e-02, 1.302649173885584e-02, 3.376992885023355e-03, 8.425785345025361e-04, 2.0449428120628e-04, 4.800949682248756e-05, 9.45129990577685e-02, 5.980075001716614e-01, 1.104984164237976e+00, 1.40273129940033e+00, 1.541390180587769e+00, 1.594590902328491e+00, 1.613296747207642e+00, 1.619409561157227e+00, 1.621291518211365e+00, 1.621846079826355e+00, 1.504401087760925e+00, 1.004008531570435e+00, 4.549952745437622e-01, 1.587949693202972e-01, 4.745873436331749e-02, 1.30231417715548e-02, 3.385087940841964e-03, 8.502733544446528e-04, 2.084502193611115e-04, 5.011197208659723e-05, 9.449911862611771e-02, 5.977904796600342e-01, 1.105067729949951e+00, 1.404888391494751e+00, 1.541261315345764e+00, 1.596131563186646e+00, 1.61348831653595e+00, 1.619404315948486e+00, 1.621275424957275e+00, 1.621837258338928e+00, 1.504398226737976e+00, 1.004007697105408e+00, 4.549853503704071e-01, 1.593954414129257e-01, 4.74562868475914e-02, 1.301787421107292e-02, 3.382992465049028e-03, 8.479519165121019e-04, 2.075021038763225e-04, 5.053983113612048e-05, 9.449891000986459e-02, 5.977013111114448e-01, 1.098235487937927e+00, 1.40488588809967e+00, 1.541378378868103e+00, 1.594725608825684e+00, 1.613313913345337e+00, 1.62067174911499e+00, 1.621283531188965e+00, 1.621837973594666e+00, 1.504398465156555e+00, 1.004007697105408e+00, 4.549855887889862e-01, 1.594632565975189e-01, 4.745626077055931e-02, 1.301778666675091e-02, 3.382936818525195e-03, 8.479245589114726e-04, 2.074916410492733e-04, 5.057702219346538e-05]
-fan3.m_flow=[0e+00, 5.383018851280212e-01, 1.124673366546631e+00, 1.428613781929016e+00, 1.554776668548584e+00, 1.600522994995117e+00, 1.615598440170288e+00, 1.620219945907593e+00, 1.621555685997009e+00, 1.62192690372467e+00, 1.62201988697052e+00, 1.516018867492676e+00, 1.106571674346924e+00, 6.801589727401733e-01, 3.209760189056388e-01, 9.570863097906113e-02, 2.553174272179604e-02, 6.504035554826241e-03, 1.6029680846259e-03, 3.840871795546263e-04, 8.832984894979745e-05, 1.144708171486855e-01, 7.588290572166443e-01, 1.195953845977783e+00, 1.440651178359985e+00, 1.552851438522339e+00, 1.597831010818481e+00, 1.614135384559631e+00, 1.619603157043457e+00, 1.621333599090576e+00, 1.621856451034546e+00, 1.51596999168396e+00, 1.106553554534912e+00, 6.801513433456421e-01, 3.14618974924086e-01, 9.578317403793335e-02, 2.552864514291286e-02, 6.472621113061905e-03, 1.58943550195545e-03, 3.812931827269495e-04, 8.870559395290911e-05, 1.144643723964675e-01, 7.588258385658264e-01, 1.195945739746094e+00, 1.440368175506592e+00, 1.552848935127258e+00, 1.597833037376404e+00, 1.614142894744873e+00, 1.61961829662323e+00, 1.621341705322266e+00, 1.62185800075531e+00, 1.515970468521118e+00, 1.106553792953491e+00, 6.801514029502869e-01, 3.20765495300293e-01, 9.572803974151611e-02, 2.552173845469923e-02, 6.489924155175785e-03, 1.700523658655584e-03, 5.356839974410832e-04, 2.685268700588495e-04, 1.144684702157974e-01, 7.588734030723572e-01, 1.195974469184875e+00, 1.440650939941406e+00, 1.552847623825073e+00, 1.597828030586243e+00, 1.614136695861816e+00, 1.619605660438538e+00, 1.621327996253967e+00, 1.62185001373291e+00, 1.515967726707458e+00, 1.106552720069885e+00, 6.801509261131287e-01, 3.120265305042267e-01, 9.571662545204163e-02, 2.549474872648716e-02, 7.638722658157349e-03, 5.418079090304673e-04, 3.871483786497265e-04, 9.350310574518517e-05, 1.144693046808299e-01, 7.588589191436717e-01, 1.195734977722168e+00, 1.440647125244141e+00, 1.552848219871521e+00, 1.597834587097168e+00, 1.614134788513184e+00, 1.619621396064758e+00, 1.621334433555603e+00, 1.621850609779358e+00, 1.515967965126038e+00, 1.106552720069885e+00, 6.801509261131287e-01, 3.123229742050171e-01, 9.571659564971924e-02, 2.549361065030098e-02, 7.585012353956699e-03, 5.871178000234067e-04, 3.871266380883753e-04, 9.357412636745721e-05]
-fan1.dp=[0e+00, -3.272271728515625e+02, -4.802207641601562e+02, -5.1631640625e+02, -5.241161499023438e+02, -5.25771484375e+02, -5.261235961914062e+02, -5.261979370117188e+02, -5.2621337890625e+02, -5.262166748046875e+02, -5.262171630859375e+02, -1.534480285644531e+02, -1.835040855407715e+01, -1.589661955833435e+00, -1.162726879119867e-01, -7.687701378017664e-03, -4.773136461153626e-04, -2.828497963491813e-05, -1.604013959877193e-06, -8.688948582857847e-08, -3.710738383233547e-09, -1.114098587036133e+02, -3.507066650390625e+02, -4.71408203125e+02, -5.111506958007812e+02, -5.223252563476562e+02, -5.2524755859375e+02, -5.259813232421875e+02, -5.261609497070312e+02, -5.262042846679688e+02, -5.26214599609375e+02, -1.534476623535156e+02, -1.835030364990234e+01, -1.589661121368408e+00, -1.162730380892742e-01, -7.690401282161474e-03, -4.771848907694221e-04, -2.788999699987471e-05, -1.57009344547987e-06, -8.553615771234035e-08, -4.045432433485985e-09, -1.113762588500966e+02, -3.507066345214844e+02, -4.71403076171875e+02, -5.111511535644531e+02, -5.2232568359375e+02, -5.252473754882812e+02, -5.259829711914062e+02, -5.261624145507812e+02, -5.26204833984375e+02, -5.262146606445312e+02, -1.534476623535156e+02, -1.835030555725098e+01, -1.589661121368408e+00, -1.162733733654022e-01, -7.692102808505297e-03, -4.767471691593431e-04, -2.812295861076666e-05, -1.610649633221328e-06, -9.017821867018938e-08, -4.889443516731262e-09, -1.113621520996094e+02, -3.50708740234375e+02, -4.714044494628906e+02, -5.111469116210938e+02, -5.22323974609375e+02, -5.252476806640625e+02, -5.25981689453125e+02, -5.261611328125e+02, -5.262040405273438e+02, -5.2621435546875e+02, -1.534476318359375e+02, -1.835029792785645e+01, -1.589661002159119e+00, -1.162727698683739e-01, -7.691064849495888e-03, -4.760295560117811e-04, -2.807614509947598e-05, -1.598047674633563e-06, -8.88976501300931e-08, -4.99130692332983e-09, -1.113675994873071e+02, -3.507057495117169e+02, -4.714040832519531e+02, -5.111508178710938e+02, -5.22326416015625e+02, -5.252483520507812e+02, -5.259826049804688e+02, -5.261615600585938e+02, -5.26204345703125e+02, -5.262144165039062e+02, -1.534476318359375e+02, -1.835029792785645e+01, -1.589661002159119e+00, -1.162727698683739e-01, -7.691043894737959e-03, -4.760134615935385e-04, -2.807452983688563e-05, -1.597902155481279e-06, -8.888309821486473e-08, -5.005858838558197e-09]
-fan2.dp=[0e+00, -2.52345142364502e+01, -1.883471069335938e+02, -3.741612548828125e+02, -4.716863403320312e+02, -5.089685974121094e+02, -5.211549072265625e+02, -5.248052978515625e+02, -5.25835693359375e+02, -5.2611669921875e+02, -5.261849365234375e+02, -4.525794982910156e+02, -2.015374603271484e+02, -4.337909698486328e+01, -1.023969364166257e+01, -2.871425867080688e+00, -7.835984826087952e-01, -2.039226293563837e-01, -5.105919390916824e-02, -1.237804908305407e-02, -2.88624782115221e-03, -5.830185413360596e+00, -7.148918914794922e+01, -2.442722473144531e+02, -3.947875671386719e+02, -4.751372680664062e+02, -5.089342346191406e+02, -5.205408935546875e+02, -5.244857177734375e+02, -5.257113647460938e+02, -5.260760498046875e+02, -4.525512390136719e+02, -2.015322265625e+02, -4.332138824462891e+01, -1.023952674865717e+01, -2.871739625930786e+00, -7.835502624511719e-01, -2.030390799045563e-01, -5.06574958562851e-02, -1.229462027549744e-02, -2.886939095333219e-03, -5.830454349517742e+00, -7.149927520751953e+01, -2.442765197753906e+02, -3.943334350585938e+02, -4.752013549804688e+02, -5.085535888671875e+02, -5.20548583984375e+02, -5.244984741210938e+02, -5.257176513671875e+02, -5.260770874023438e+02, -4.525515747070312e+02, -2.015322875976562e+02, -4.332161331176758e+01, -1.023955249786377e+01, -2.87188196182251e+00, -7.833504676818761e-01, -2.035215944051773e-01, -5.112040415406227e-02, -1.253239717334509e-02, -3.012860659509897e-03, -5.82955265045166e+00, -7.148043823242188e+01, -2.442918853759766e+02, -3.947911987304688e+02, -4.751701354980469e+02, -5.089208068847656e+02, -5.205912475585938e+02, -5.244905395507812e+02, -5.257070922851562e+02, -5.260712890625e+02, -4.525498657226562e+02, -2.015319366455078e+02, -4.332106399536133e+01, -1.02596435546875e+01, -2.871732711791992e+00, -7.830487489700317e-01, -2.033999115228653e-01, -5.098110437393188e-02, -1.247519440948963e-02, -3.038492985069752e-03, -5.829538345337165e+00, -7.147304534911996e+01, -2.431611328125e+02, -3.947911376953125e+02, -4.751986694335938e+02, -5.085858764648438e+02, -5.205518188476562e+02, -5.248009643554688e+02, -5.25712158203125e+02, -5.2607177734375e+02, -4.525499877929688e+02, -2.015319519042969e+02, -4.332107925415039e+01, -1.026191139221191e+01, -2.871731281280518e+00, -7.830432057380676e-01, -2.033964246511459e-01, -5.097945034503937e-02, -1.247456483542919e-02, -3.04072885774076e-03]
-fan3.dp=[0e+00, -5.863370895385742e+01, -2.530459136962891e+02, -4.082364807128906e+02, -4.834882507324219e+02, -5.123427734375e+02, -5.220342407226562e+02, -5.250232543945312e+02, -5.258887939453125e+02, -5.261294555664062e+02, -5.26189697265625e+02, -4.595809020996094e+02, -2.448302459716797e+02, -9.250206756591797e+01, -2.903958511352532e+01, -8.208965301513672e+00, -2.179324388504028e+00, -5.549679994583114e-01, -1.36764869093895e-01, -3.275911137461662e-02, -7.561873644590378e-03, -9.8441162109375e+00, -1.152030715942383e+02, -2.861203918457031e+02, -4.151375732421875e+02, -4.822903442382812e+02, -5.106210327148438e+02, -5.210895385742188e+02, -5.246238403320312e+02, -5.257448120117188e+02, -5.26083740234375e+02, -4.595512390136719e+02, -2.448222351074219e+02, -9.249997711181641e+01, -2.903905296325669e+01, -8.209949493408203e+00, -2.179113388061523e+00, -5.52104651927948e-01, -1.35576993227005e-01, -3.25201153755188e-02, -7.563303224742413e-03, -9.843556404113626e+00, -1.152106399536133e+02, -2.861275939941406e+02, -4.151300659179688e+02, -4.822887268066406e+02, -5.106224060058594e+02, -5.210943603515625e+02, -5.246336059570312e+02, -5.257501220703125e+02, -5.26084716796875e+02, -4.595515747070312e+02, -2.448223266601562e+02, -9.25e+01, -2.90390567779541e+01, -8.210522651672363e+00, -2.178419113159155e+00, -5.537098050117576e-01, -1.369628459215164e-01, -3.319802135229111e-02, -7.910600863397121e-03, -9.843910217285156e+00, -1.152151870727539e+02, -2.861302490234375e+02, -4.15137451171875e+02, -4.822879333496094e+02, -5.106194458007812e+02, -5.210906372070312e+02, -5.2462548828125e+02, -5.257411499023438e+02, -5.2607958984375e+02, -4.595498962402344e+02, -2.448218231201172e+02, -9.249986267089844e+01, -2.903903007507324e+01, -8.210043907165527e+00, -2.177353382110596e+00, -5.53350031375885e-01, -1.365481615066528e-01, -3.303346410393715e-02, -7.979290559887886e-03, -9.843980789185078e+00, -1.152158813476548e+02, -2.861275329589844e+02, -4.151350708007812e+02, -4.822879638671875e+02, -5.106210327148438e+02, -5.210934448242188e+02, -5.246286010742188e+02, -5.25745361328125e+02, -5.260799560546875e+02, -4.595500183105469e+02, -2.448218688964844e+02, -9.24998779296875e+01, -2.903903388977051e+01, -8.210038185119629e+00, -2.177330732345581e+00, -5.533382892608643e-01, -1.365432441234589e-01, -3.303169831633568e-02, -7.985386997461319e-03]
+fan1.m_flow=[0e+00, 2.449972331523895e-01, 6.487113237380981e-01, 9.730945229530334e-01, 1.29743230342865e+00, 1.621297359466553e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735000133514404e-01, 6.489943265914917e-01, 2.450784593820562e-01, 9.390714694745839e-07, 4.547473508864641e-13, 4.547473508864641e-13, 4.547473508864641e-13, 4.547473508864641e-13, 0e+00, 2.449971735477448e-01, 6.487909555435181e-01, 9.730945229530334e-01, 1.29743230342865e+00, 1.62132465839386e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735000729560852e-01, 6.489942669868469e-01, 2.450828701257686e-01, 1.052666448231321e-06, 0e+00, 0e+00, 4.547473508864641e-13, 4.547473508864641e-13, 4.547473508864641e-13, 2.449972182512264e-01, 6.486915946006775e-01, 9.730945229530334e-01, 1.29743230342865e+00, 1.621305823326111e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735000133514404e-01, 6.489943265914917e-01, 2.45089665055275e-01, 8.917404556996189e-07, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00, 2.449971437454224e-01, 6.487973928451538e-01, 9.730945229530334e-01, 1.29743230342865e+00, 1.621314883232117e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735000729560852e-01, 6.489943265914917e-01, 2.450774610042572e-01, 9.728692020871677e-07, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 2.449972331523939e-01, 6.486762166023223e-01, 9.730945229530334e-01, 1.29743230342865e+00, 1.621286630630493e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.297975301742554e+00, 9.735000133514404e-01, 6.489943265914917e-01, 2.450763881206512e-01, 8.438832992396783e-07, 4.547473508864641e-13, 4.547473508864641e-13, 4.547473508864641e-13, 0e+00, 0e+00]
+fan2.m_flow=[0e+00, 2.393334656953812e-01, 6.407404541969299e-01, 9.716281294822693e-01, 1.296018004417419e+00, 1.62020742893219e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.299389481544495e+00, 9.776223301887512e-01, 6.482908725738525e-01, 2.73545116186141e-01, 1.365258322039153e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.393160164356232e-01, 6.414535641670227e-01, 9.716281294822693e-01, 1.296018123626709e+00, 1.620219826698303e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.299389481544495e+00, 9.776239395141602e-01, 6.48283839225769e-01, 2.735590636730175e-01, 1.377291937387781e-05, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00, 2.394739389419537e-01, 6.406086087226868e-01, 9.716281294822693e-01, 1.296018004417419e+00, 1.620210886001587e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.299389481544495e+00, 9.776240587234497e-01, 6.482823491096497e-01, 2.735928595066071e-01, 1.364248146273894e-05, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 2.394212931394577e-01, 6.415619254112244e-01, 9.716281294822693e-01, 1.296018004417419e+00, 1.62021791934967e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.299389481544495e+00, 9.776228666305542e-01, 6.482891440391541e-01, 2.735248804092407e-01, 1.377036369376583e-05, 0e+00, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 2.393157482147255e-01, 6.391617059707604e-01, 9.716281294822693e-01, 1.296018123626709e+00, 1.620195984840393e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.299389481544495e+00, 9.776221513748169e-01, 6.48292064666748e-01, 2.735289335250854e-01, 1.3607370419777e-05, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00]
+fan3.m_flow=[0e+00, 2.428198009729385e-01, 6.471722722053528e-01, 9.505590796470642e-01, 1.184705257415771e+00, 1.379672527313232e+00, 1.550312876701355e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.460162162780762e+00, 1.277520179748535e+00, 1.063961863517761e+00, 7.949675321578972e-01, 2.931390106678009e-01, -3.678451321320608e-09, -5.660876922775106e-08, -1.123862602980807e-08, -5.868014341103844e-08, -1.039097696775571e-09, 2.428197264671326e-01, 6.471742391586304e-01, 9.505576491355896e-01, 1.184704065322876e+00, 1.379671573638916e+00, 1.550312042236328e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.460162162780762e+00, 1.277520179748535e+00, 1.063961863517761e+00, 7.949675321578964e-01, 2.931391000747681e-01, -1.969965524040163e-09, 1.77351466845721e-11, 4.092726157978177e-12, 4.092726157978177e-12, 4.092726157978177e-12, 2.428197860717754e-01, 6.471712589263916e-01, 9.505343437194824e-01, 1.184685349464417e+00, 1.379655480384827e+00, 1.550297737121582e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.460162162780762e+00, 1.277520179748535e+00, 1.063961863517761e+00, 7.949675321578979e-01, 2.931386530399323e-01, -3.895002009812722e-08, -1.712760422378799e-08, -9.577433957019821e-09, -6.551999831572175e-09, -3.526110958773643e-09, 2.428197115659714e-01, 6.471741199493408e-01, 9.50560986995697e-01, 1.184706687927246e+00, 1.379673838615417e+00, 1.55031406879425e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.460162162780762e+00, 1.277520179748535e+00, 1.063961863517761e+00, 7.949675321578979e-01, 2.931248843669891e-01, 1.790931491996162e-08, 6.304981070570648e-08, -1.14596332423389e-09, -1.095486368285492e-09, -1.045464159687981e-09, 2.428198307752653e-01, 6.471662521362274e-01, 9.505578279495239e-01, 1.184704184532166e+00, 1.379671692848206e+00, 1.550312161445618e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.622062921524048e+00, 1.460162162780762e+00, 1.277520179748535e+00, 1.063961863517761e+00, 7.949675321578979e-01, 2.931390702724457e-01, -6.505565579573158e-07, -9.615450835553929e-08, 4.892399374512024e-08, 2.802835297188722e-08, 1.264652382815257e-08]
+fan1.dp=[0e+00, -2.167827987670898e+01, -8.420160675048828e+01, -1.894583740234375e+02, -3.368008422851562e+02, -5.258192138671875e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652557373047e+02, -8.420481109619141e+01, -2.167852973937979e+01, -7.547650602646172e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670898e+01, -8.420250701904297e+01, -1.894583740234375e+02, -3.368008422851562e+02, -5.25835693359375e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652557373047e+02, -8.420481109619141e+01, -2.167854309082013e+01, -7.807552174199373e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.16782798767088e+01, -8.420137786865234e+01, -1.894583740234375e+02, -3.368008422851562e+02, -5.258255615234375e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652557373047e+02, -8.420481109619141e+01, -2.167856407165527e+01, -7.366124191321433e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670898e+01, -8.420257568359375e+01, -1.894583740234375e+02, -3.368008422851562e+02, -5.258294067382812e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652557373047e+02, -8.420481109619141e+01, -2.167852592468262e+01, -7.751942030154169e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -2.167827987670942e+01, -8.420120239257737e+01, -1.894583740234375e+02, -3.368008422851562e+02, -5.25813720703125e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.368131408691406e+02, -1.894652557373047e+02, -8.420481109619141e+01, -2.167852401733398e+01, -7.413870480377227e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+fan2.dp=[0e+00, -1.674428367614746e+01, -8.189199829101562e+01, -1.888500366210938e+02, -3.359997863769531e+02, -5.2509423828125e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.376150207519531e+02, -1.904632110595703e+02, -8.439985656738281e+01, -1.994442367553703e+01, -8.133044466376305e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.674271011352539e+01, -8.195774078369141e+01, -1.888500366210938e+02, -3.359997863769531e+02, -5.25103515625e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.376150207519531e+02, -1.904634399414062e+02, -8.439917755126953e+01, -1.994575309753401e+01, -8.205311605706811e-04, 1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, -1.675682830810532e+01, -8.190177917480469e+01, -1.888500366210938e+02, -3.359997863769531e+02, -5.250970458984375e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.376150207519531e+02, -1.904634552001953e+02, -8.439903259277344e+01, -1.994868087768555e+01, -8.126865141093731e-04, 0e+00, 0e+00, -1.455191522836685e-11, 0e+00, 0e+00, -1.675210762023926e+01, -8.198497772216797e+01, -1.888500366210938e+02, -3.359997863769531e+02, -5.251015625e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.376150207519531e+02, -1.904632873535156e+02, -8.439969635009766e+01, -1.994275856018066e+01, -8.203403558582067e-04, 0e+00, 0e+00, -1.455191522836685e-11, 0e+00, 0e+00, -1.67427062988285e+01, -8.173777770996003e+01, -1.888500366210938e+02, -3.359997863769531e+02, -5.250870361328125e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -3.376150207519531e+02, -1.904631805419922e+02, -8.439997863769531e+01, -1.994303894042969e+01, -8.105601882562041e-04, 1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00]
+fan3.dp=[0e+00, -2.146796417236328e+01, -8.378225708007812e+01, -1.807418212890625e+02, -2.807418212890625e+02, -3.807418212890625e+02, -4.807418212890625e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -4.263696594238281e+02, -3.263721313476562e+02, -2.263701477050781e+02, -1.263701477050779e+02, -2.637015151977539e+01, 3.635650500655174e-07, 4.640838596969881e-06, 8.718780009075999e-07, 4.807981895282865e-06, 5.084439180791378e-08, -2.146795845031738e+01, -8.378305816650391e+01, -1.807412872314453e+02, -2.807412719726562e+02, -3.807412719726562e+02, -4.807412719726562e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -4.263696594238281e+02, -3.263721313476562e+02, -2.263701477050781e+02, -1.263701553344722e+02, -2.637015533447266e+01, 1.76398316398263e-07, 2.692104317247868e-09, 2.91038304567337e-11, 2.91038304567337e-11, 2.91038304567337e-11, -2.14679641723631e+01, -8.378205871582031e+01, -1.807324371337891e+02, -2.80732421875e+02, -3.80732421875e+02, -4.80732421875e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -4.263696594238281e+02, -3.263721313476562e+02, -2.263701477050781e+02, -1.263701553344727e+02, -2.637015342712402e+01, -1.541775418445456e-07, -3.04135028272879e-08, -4.94765117764473e-10, -3.346940502524376e-10, -1.746229827404022e-10, -2.146795463562012e+01, -8.378307342529297e+01, -1.807425384521484e+02, -2.807425537109375e+02, -3.807425537109375e+02, -4.807425537109375e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -4.263696594238281e+02, -3.263721313476562e+02, -2.263701477050781e+02, -1.263701553344727e+02, -2.637015342712402e+01, -1.695429091341794e-06, -5.624096957035363e-06, -1.039297785609961e-07, -6.223854143172503e-08, -2.056185621768236e-08, -2.146796798706098e+01, -8.378108215331956e+01, -1.807413482666016e+02, -2.807413330078125e+02, -3.807413330078125e+02, -4.807413330078125e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -5.262175903320312e+02, -4.263696594238281e+02, -3.263721313476562e+02, -2.263701477050781e+02, -1.263701477050781e+02, -2.637015151977539e+01, -7.158450898714364e-06, -1.668231561779976e-06, -4.853063728660345e-08, -1.984881237149239e-08, -1.309672370553017e-10]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
index a98f7f25bd..4c04f8571f 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachine.txt
@@ -1,4 +1,4 @@
-last-generated=2023-03-21
+last-generated=2024-09-19
 statistics-initialization=
 {
   "nonlinear": "1, 0, 1, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 0, 1, 1",
-  "number of continuous time states": "11",
+  "number of continuous time states": "10",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501396393403411e-03, 4.242143128067255e-03, 4.39867889508605e-03, 4.431803245097399e-03, 4.438792821019888e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.397834090515971e-03, 6.946481298655272e-04, 9.09602313186042e-05, 6.909262083354372e-06, 4.639737198885996e-07, 3.107197699137032e-08, 7.696144166402537e-09, 1.156968210125342e-08, -4.611592885339633e-09, -1.5003934095148e-08, 2.042267937213182e-03, 3.625045297667384e-03, 4.202968906611204e-03, 4.376598633825779e-03, 4.4242013245821e-03, 4.436568357050419e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.39783781580627e-03, 6.946492358110845e-04, 9.096039138967171e-05, 6.909271178301356e-06, 4.639737198885996e-07, 3.107334123342298e-08, 7.693870429648086e-09, 1.158241502707824e-08, -4.597040970111266e-09, -1.503212843090296e-08, 2.042269567027677e-03, 3.625045297667384e-03, 4.202968906611204e-03, 4.376598633825779e-03, 4.424200858920813e-03, 4.436567891389132e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.39783781580627e-03, 6.946492358110845e-04, 9.096039138967171e-05, 6.909270723554073e-06, 4.639741746359505e-07, 3.107243173872062e-08, 7.694779924349758e-09, 1.158241502707824e-08, -4.596586222760379e-09, -1.50307641888503e-08, 2.042275387793779e-03, 3.62504506483674e-03, 4.202969372272491e-03, 4.376598633825779e-03, 4.424192011356354e-03, 4.436553455889225e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.397824544459581e-03, 6.946453358978033e-04, 9.095983841689304e-05, 6.909240710228914e-06, 4.639741746359505e-07, 3.107197699137032e-08, 7.700236892560497e-09, 1.153784978669137e-08, -4.656612873077393e-09, -1.492844603490084e-08, 2.042271662503501e-03, 3.625045297667374e-03, 4.202969372272491e-03, 4.376598633825779e-03, 4.424192011356354e-03, 4.436551127582788e-03, 4.439655225723982e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.397834556177258e-03, 6.946483044885099e-04, 9.096026042243466e-05, 6.909264811838511e-06, 4.639737198885996e-07, 3.107243173872121e-08, 7.695689419051632e-09, 1.157013684860431e-08, -4.612502380041406e-09, -1.5003934095148e-08]
-fan2.m_flow=[0e+00, 3.501242492347956e-03, 4.242110997438431e-03, 4.398672375828028e-03, 4.431801848113537e-03, 4.438792355358601e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.398072276264429e-03, 6.94765243679285e-04, 9.098378359340131e-05, 6.910980118846021e-06, 4.641105988412164e-07, 3.108107193838805e-08, 7.691596692893672e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.500302460044622e-08, 2.042017877101898e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198996275663e-03, 4.436567891389132e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.398076001554728e-03, 6.947664078325033e-04, 9.098395094042644e-05, 6.910989668540356e-06, 4.641101440938655e-07, 3.108152668573894e-08, 7.690687198191881e-09, 1.158468876383267e-08, -4.602497938321903e-09, -1.503121893620118e-08, 2.042019506916392e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198530614376e-03, 4.436567425727844e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.398076001554728e-03, 6.947663496248424e-04, 9.098394366446882e-05, 6.910989213793073e-06, 4.641105988412164e-07, 3.108152668573835e-08, 7.691141945542667e-09, 1.158423401648179e-08, -4.603862180374563e-09, -1.502985469414853e-08, 2.042025327682495e-03, 3.624944481998682e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.43655252456665e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.398062730208039e-03, 6.947625079192221e-04, 9.098339069169015e-05, 6.910958745720563e-06, 4.641119630832691e-07, 3.108107193838805e-08, 7.696598913753405e-09, 1.153921402874403e-08, -4.664343578042462e-09, -1.492799128754996e-08, 2.042021602392217e-03, 3.624944714829316e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.436550661921501e-03, 4.439654760062695e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.398072741925716e-03, 6.947654765099287e-04, 9.098381997318938e-05, 6.91098239258281e-06, 4.641110535885673e-07, 3.108107193838805e-08, 7.692506187595427e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.5003934095148e-08]
-fan3.m_flow=[0e+00, 3.501242492347956e-03, 4.242110997438431e-03, 4.398672375828028e-03, 4.431801848113537e-03, 4.438792355358601e-03, 4.440272692590952e-03, 4.440572112798691e-03, 4.44065174087882e-03, 4.440661985427141e-03, 4.440653137862682e-03, 2.398072276264429e-03, 6.94765243679285e-04, 9.098378359340131e-05, 6.910980118846021e-06, 4.641101440938655e-07, 3.108107193838805e-08, 7.691596692893672e-09, 1.157241058535874e-08, -4.619323590304703e-09, -1.500302460044622e-08, 2.042017877101898e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198996275663e-03, 4.436567891389132e-03, 4.439670126885176e-03, 4.440417978912592e-03, 4.440620075911283e-03, 4.440667573362589e-03, 2.398076001554728e-03, 6.947664078325033e-04, 9.098395094042644e-05, 6.910989668540356e-06, 4.641105988412164e-07, 3.108107193838805e-08, 7.690232450840995e-09, 1.158423401648179e-08, -4.60158844362013e-09, -1.503030944149941e-08, 2.042019506916392e-03, 3.624944481998682e-03, 4.20293677598238e-03, 4.37658978626132e-03, 4.424198530614376e-03, 4.436567425727844e-03, 4.439669661223888e-03, 4.440417978912592e-03, 4.440621472895145e-03, 4.440667107701302e-03, 2.398076001554728e-03, 6.947663496248424e-04, 9.098394366446882e-05, 6.910989668540424e-06, 4.641101440938655e-07, 3.108152668573835e-08, 7.69205144024444e-09, 1.158423401648179e-08, -4.602497938321903e-09, -1.502985469414853e-08, 2.042025327682495e-03, 3.624944481998682e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.43655252456665e-03, 4.439650103449821e-03, 4.440410528331995e-03, 4.440587013959885e-03, 4.440615884959698e-03, 2.398062730208039e-03, 6.947625079192221e-04, 9.098339069169015e-05, 6.910958745720563e-06, 4.641119630832691e-07, 3.108061719103716e-08, 7.696598913753405e-09, 1.153966877609491e-08, -4.664798325393349e-09, -1.492799128754996e-08, 2.042021602392217e-03, 3.624944714829316e-03, 4.202937241643667e-03, 4.37658978626132e-03, 4.424189683049917e-03, 4.436550661921501e-03, 4.439654760062695e-03, 4.440411925315857e-03, 4.440597258508205e-03, 4.440654534846544e-03, 2.398072741925716e-03, 6.947654765099287e-04, 9.098381997318938e-05, 6.91098239258281e-06, 4.641101440938655e-07, 3.108152668573894e-08, 7.692506187595427e-09, 1.157241058535874e-08, -4.61841409560293e-09, -1.5003934095148e-08]
-fan1.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -1.274956420898438e+03, -1.61800048828125e+02, -1.228128147125238e+01, -8.146507740020752e-01, -5.059166252613068e-02, -3.019548486918196e-03, -1.79614798980765e-04, -1.192482886835933e-05, -2.99859675578773e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -1.274958740234375e+03, -1.618003540039062e+02, -1.22813034057616e+01, -8.146522045135498e-01, -5.059175193309784e-02, -3.019551746547222e-03, -1.796161668607965e-04, -1.192410127259791e-05, -2.998858690261841e-06, -5.793948242187445e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -1.274958618164062e+03, -1.618003540039062e+02, -1.228130340576172e+01, -8.146522045135498e-01, -5.059174820780651e-02, -3.019551746547331e-03, -1.796161232050508e-04, -1.192413037642837e-05, -2.998844138346612e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -1.274951049804688e+03, -1.6179931640625e+02, -1.228122901916504e+01, -8.146474957466125e-01, -5.059144273400307e-02, -3.019541734829545e-03, -1.79611161001958e-04, -1.192682248074561e-05, -2.99788371194154e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -1.274956787109375e+03, -1.618001098632812e+02, -1.228128623962402e+01, -8.146511316299438e-01, -5.059168115258217e-02, -3.019549651071429e-03, -1.796148862922564e-04, -1.19248143164441e-05, -2.99859675578773e-06]
-fan2.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -8.403992919921875e+02, -8.571690368652344e+01, -6.476733207702605e+00, -4.296080768108368e-01, -2.667966671288013e-02, -1.592456363141529e-03, -9.489382500760257e-05, -6.218513590283692e-06, -1.35437585413456e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -8.404012451171875e+02, -8.571707153320312e+01, -6.47674465179437e+00, -4.296088218688965e-01, -2.667971514165401e-02, -1.592457992956042e-03, -9.48947126744315e-05, -6.218397174961865e-06, -1.354099367745221e-06, -5.793948242187443e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -8.404011840820312e+02, -8.571706390380859e+01, -6.476744174957275e+00, -4.296087920665741e-01, -2.667971327900832e-02, -1.592457992956099e-03, -9.489468357060105e-05, -6.218368071131408e-06, -1.354113919660449e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -8.403944702148438e+02, -8.571651458740234e+01, -6.476705074310303e+00, -4.296063184738159e-01, -2.667955122888088e-02, -1.592452870681882e-03, -9.489138028584421e-05, -6.218862836249173e-06, -1.355132553726435e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -8.40399658203125e+02, -8.571694183349609e+01, -6.476735591888428e+00, -4.296082556247711e-01, -2.667967602610588e-02, -1.592456945218146e-03, -9.489385411143303e-05, -6.21852814219892e-06, -1.354361302219331e-06]
-fan3.dp=[0e+00, -1.702916015625e+04, -2.4994810546875e+04, -2.68729375e+04, -2.7279142578125e+04, -2.736525390625e+04, -2.7383505859375e+04, -2.7387197265625e+04, -2.738818359375e+04, -2.73883046875e+04, -2.7388201171875e+04, -7.98564013671875e+03, -1.274956420898438e+03, -1.61800048828125e+02, -1.228128147125238e+01, -8.146507740020752e-01, -5.059166252613068e-02, -3.019548486918196e-03, -1.79614798980765e-04, -1.192482886835933e-05, -2.99859675578773e-06, -5.7939482421875e+03, -1.8251650390625e+04, -2.45349375e+04, -2.6603775390625e+04, -2.718563671875e+04, -2.7337833984375e+04, -2.7376072265625e+04, -2.7385294921875e+04, -2.7387791015625e+04, -2.7388376953125e+04, -7.98566552734375e+03, -1.274958740234375e+03, -1.618003540039062e+02, -1.22813034057616e+01, -8.146522045135498e-01, -5.059175193309784e-02, -3.019551746547222e-03, -1.796161668607965e-04, -1.192410127259791e-05, -2.998858690261841e-06, -5.793948242187445e+03, -1.8251650390625e+04, -2.45349375e+04, -2.66037734375e+04, -2.7185634765625e+04, -2.7337830078125e+04, -2.73760703125e+04, -2.7385294921875e+04, -2.738780859375e+04, -2.738837109375e+04, -7.9856650390625e+03, -1.274958618164062e+03, -1.618003540039062e+02, -1.228130340576172e+01, -8.146522045135498e-01, -5.059174820780651e-02, -3.019551746547331e-03, -1.796161232050508e-04, -1.192413037642837e-05, -2.998844138346612e-06, -5.79394921875e+03, -1.8251650390625e+04, -2.4534939453125e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337650390625e+04, -2.7375830078125e+04, -2.738520703125e+04, -2.73873828125e+04, -2.7387740234375e+04, -7.985576171875e+03, -1.274951049804688e+03, -1.6179931640625e+02, -1.228122901916504e+01, -8.146474957466125e-01, -5.059144273400307e-02, -3.019541734829545e-03, -1.79611161001958e-04, -1.192682248074561e-05, -2.99788371194154e-06, -5.793948242187626e+03, -1.82516503906249e+04, -2.45349375e+04, -2.66037734375e+04, -2.71855234375e+04, -2.7337625e+04, -2.7375888671875e+04, -2.738522265625e+04, -2.7387509765625e+04, -2.738821484375e+04, -7.9856435546875e+03, -1.274956787109375e+03, -1.618001098632812e+02, -1.228128623962402e+01, -8.146511316299438e-01, -5.059168115258217e-02, -3.019549651071429e-03, -1.796148862922564e-04, -1.19248143164441e-05, -2.99859675578773e-06]
+fan1.m_flow=[0e+00, 8.212513639591634e-04, 1.741650514304638e-03, 2.654215320944786e-03, 3.552448470145464e-03, 4.439007956534624e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544144565239549e-03, 2.626341767609119e-03, 1.708531519398093e-03, 7.936876500025371e-04, 4.445155354915187e-09, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.616073078475893e-04, 1.739329542033374e-03, 2.625914989039302e-03, 3.552448702976108e-03, 4.439028445631266e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544073319062591e-03, 2.626016968861222e-03, 1.707952935248613e-03, 7.950097206048626e-04, 4.32646629633382e-09, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.692166789434811e-04, 1.781726372428238e-03, 2.670510904863477e-03, 3.552761860191822e-03, 4.439015872776508e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544080769643188e-03, 2.626104978844523e-03, 1.708121853880584e-03, 7.968399440869689e-04, 4.326011548982933e-09, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.792009808123112e-04, 1.777622383087873e-03, 2.678054152056575e-03, 3.552459878847003e-03, 4.439048934727907e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.543691243976355e-03, 2.624331275001168e-03, 1.704963739030063e-03, 7.789777591824532e-04, 4.480170900933444e-09, -9.094947017729282e-13, -9.094947017729282e-13, 0e+00, 0e+00, 0e+00, 6.88844593241819e-04, 1.74653180874883e-03, 2.636096905916929e-03, 3.537761745974422e-03, 4.439015872776508e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544009057804942e-03, 2.625724067911506e-03, 1.707431743852794e-03, 7.983785471878946e-04, 4.337834980105981e-09, -9.094947017729282e-13, -9.094947017729282e-13, 0e+00, 0e+00, 0e+00]
+fan2.m_flow=[0e+00, 8.211774402298033e-04, 1.741553307510912e-03, 2.654119161888957e-03, 3.552354406565428e-03, 4.438972566276789e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544238163158298e-03, 2.626436296850443e-03, 1.708627096377313e-03, 7.937837508507052e-04, 4.604316927725449e-09, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.614743615500629e-04, 1.739170053042471e-03, 2.625773893669248e-03, 3.552350681275129e-03, 4.438993521034718e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544166916981339e-03, 2.626111498102546e-03, 1.708048512227833e-03, 7.95105646830048e-04, 4.47425918537192e-09, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00, 6.690831505693456e-04, 1.781580736860633e-03, 2.670413581654429e-03, 3.552677575498819e-03, 4.438980482518673e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544174367561936e-03, 2.626199508085847e-03, 1.708217314444482e-03, 7.969356956891716e-04, 4.473349690670148e-09, 0e+00, 0e+00, 0e+00, 9.094947017729282e-13, 4.547473508864641e-13, 6.790674524381757e-04, 1.77747942507267e-03, 2.677945885807276e-03, 3.55237745679915e-03, 4.439014475792646e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.543784841895103e-03, 2.624425804242492e-03, 1.705059432424605e-03, 7.790803792886436e-04, 4.636149242287502e-09, -4.547473508864641e-13, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 6.887112976983272e-04, 1.746388850733626e-03, 2.635951386764646e-03, 3.537645097821951e-03, 4.438980482518673e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544102655723691e-03, 2.625818829983473e-03, 1.707527320832014e-03, 7.984741241671145e-04, 4.486082616494969e-09, -4.547473508864641e-13, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00]
+fan3.m_flow=[0e+00, 8.211774402298033e-04, 1.741553307510912e-03, 2.654119161888957e-03, 3.552354406565428e-03, 4.438972566276789e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544238163158298e-03, 2.626436296850443e-03, 1.708627096377313e-03, 7.937837508507052e-04, 4.604771675076336e-09, 0e+00, 0e+00, 4.547473508864641e-13, 4.547473508864641e-13, 4.547473508864641e-13, 6.614743615500629e-04, 1.739170053042471e-03, 2.625773893669248e-03, 3.552350681275129e-03, 4.438993521034718e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544166916981339e-03, 2.626111498102546e-03, 1.708048512227833e-03, 7.95105646830048e-04, 4.47425918537192e-09, -4.547473508864641e-13, 0e+00, 0e+00, 4.547473508864641e-13, 4.547473508864641e-13, 6.690831505693456e-04, 1.781580736860633e-03, 2.670413581654429e-03, 3.552677575498819e-03, 4.438980482518673e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544174367561936e-03, 2.626199508085847e-03, 1.708217314444482e-03, 7.969356956891716e-04, 4.473349690670148e-09, 4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 0e+00, 6.790674524381757e-04, 1.77747942507267e-03, 2.677945885807276e-03, 3.55237745679915e-03, 4.439014475792646e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.543784841895103e-03, 2.624425804242492e-03, 1.705059432424605e-03, 7.790803210809827e-04, 4.636149242287502e-09, -1.364242052659392e-12, -4.547473508864641e-13, 0e+00, 0e+00, 0e+00, 6.887112976983272e-04, 1.746388850733626e-03, 2.635951386764646e-03, 3.537645097821951e-03, 4.438980482518673e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.544102655723691e-03, 2.625818829983473e-03, 1.707527320832014e-03, 7.984741241671145e-04, 4.486082616494969e-09, 0e+00, 0e+00, 0e+00, 4.547473508864641e-13, 4.547473508864641e-13]
+fan1.dp=[0e+00, -1.44235009765625e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.7367912109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609374995e+03, -7.985351607203484e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347045898438e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736816015625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.44234960937499e+03, -7.826812565326691e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.44234716796874e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368005859375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609375e+03, -7.826698943972588e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347412109375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368412109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349365234375e+03, -8.048722520470619e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347534179708e+03, -4.381102539062462e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736800390625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349731445312e+03, -7.851012982428074e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+fan2.dp=[0e+00, -9.952142944335938e+02, -4.38095751953125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.7367912109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952137451171834e+02, -4.211097955703735e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -9.952111206054688e+02, -4.38095703125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736816015625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952137451171792e+02, -4.127490799874067e-03, 1.455191522836685e-11, 0e+00, 0e+00, 0e+00, 0e+00, -9.95211242675773e+02, -4.3809580078125e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368005859375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952138061523438e+02, -4.127430729568005e-03, 0e+00, 0e+00, 0e+00, -2.91038304567337e-11, -1.455191522836685e-11, -9.952114868164062e+02, -4.3809580078125e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368412109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952134399414062e+02, -4.244516137987375e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -9.952116699218966e+02, -4.38095751953121e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736800390625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.38095654296875e+03, -9.952138061523438e+02, -4.140253178775311e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+fan3.dp=[0e+00, -1.44235009765625e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.7367912109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609374995e+03, -7.985351607203484e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347045898438e+03, -4.38110205078125e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736816015625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.44234960937499e+03, -7.826812565326691e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.44234716796874e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368005859375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349609375e+03, -7.826698943972588e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347412109375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368412109375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349365234375e+03, -8.048722520470619e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442347534179708e+03, -4.381102539062462e+03, -9.8586650390625e+03, -1.7527736328125e+04, -2.736800390625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.8586650390625e+03, -4.3811015625e+03, -1.442349731445312e+03, -7.851012982428074e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
index ff52992b6d..fd2db94a5d 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt
@@ -1,4 +1,4 @@
-last-generated=2023-03-21
+last-generated=2024-09-19
 statistics-initialization=
 {
   "nonlinear": "1, 1, 0, 1",
@@ -8,13 +8,13 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1, 1, 0, 1",
-  "number of continuous time states": "15",
+  "number of continuous time states": "12",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+02]
-fan1.m_flow=[0e+00, 3.501603612676263e-03, 4.242093302309513e-03, 4.398667253553867e-03, 4.431773908436298e-03, 4.438776522874832e-03, 4.440257791429758e-03, 4.440571181476116e-03, 4.440637771040201e-03, 4.44065174087882e-03, 4.440654534846544e-03, 2.39775120280683e-03, 6.946184439584613e-04, 9.096858411794528e-05, 6.906999260536361e-06, 4.578628249873873e-07, 2.846309143933468e-08, 1.680746208876363e-09, 9.777068044058979e-11, 5.911715561524034e-12, 4.547473508864641e-13, 2.042529406026006e-03, 3.625055309385061e-03, 4.202966578304768e-03, 4.376600962132215e-03, 4.424192477017641e-03, 4.436557181179523e-03, 4.439658485352993e-03, 4.440417047590017e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397748408839107e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906991529831362e-06, 4.579219421430025e-07, 2.849401425919496e-08, 1.675289240665734e-09, 9.595169103704393e-11, 5.911715561524034e-12, 1.364242052659392e-12, 2.042528940364707e-03, 3.625062061473727e-03, 4.202965181320906e-03, 4.376600962132215e-03, 4.424193874001503e-03, 4.436555318534374e-03, 4.439657088369131e-03, 4.44041658192873e-03, 4.440597724169493e-03, 4.4406414963305e-03, 2.397748176008463e-03, 6.946173962205648e-04, 9.096862049773335e-05, 6.906990165589377e-06, 4.579223968903534e-07, 2.849446900654526e-08, 1.674834493314909e-09, 9.640643838793039e-11, 5.911715561524034e-12, 1.364242052659392e-12, 2.042528241872787e-03, 3.625059965997934e-03, 4.202966578304768e-03, 4.376600962132215e-03, 4.424191545695066e-03, 4.436556249856949e-03, 4.439657554030418e-03, 4.44041658192873e-03, 4.440599121153355e-03, 4.440642427653074e-03, 2.397748176008463e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906990165589377e-06, 4.579219421430025e-07, 2.849446900654584e-08, 1.674834493314847e-09, 9.5042196335271e-11, 5.002220859751105e-12, 0e+00, 2.042529173195382e-03, 3.625056939199557e-03, 4.202965646982193e-03, 4.376601427793503e-03, 4.424193874001503e-03, 4.436558112502098e-03, 4.439661279320717e-03, 4.440418444573879e-03, 4.440600052475929e-03, 4.440642427653074e-03, 2.397748408839107e-03, 6.946174544282258e-04, 9.096862777369097e-05, 6.906990620336728e-06, 4.579223968903534e-07, 2.849446900654584e-08, 1.674834493314847e-09, 9.595169103704393e-11, 5.911715561524034e-12, 0e+00]
-fan2.m_flow=[0e+00, 8.94938304554671e-04, 2.659900346770883e-03, 3.744737710803747e-03, 4.20454191043973e-03, 4.367383196949959e-03, 4.419264383614063e-03, 4.434681963175535e-03, 4.439042415469885e-03, 4.440231248736382e-03, 4.440545570105314e-03, 4.118423443287611e-03, 2.755253575742245e-03, 1.314270193688571e-03, 4.79498819913714e-04, 1.478829653933644e-04, 4.136235656915233e-05, 1.089678426069437e-05, 2.760351435426855e-06, 6.803561518609058e-07, 1.643602445255965e-07, 2.817567437887192e-04, 1.649774960242212e-03, 3.029943211004138e-03, 3.847507759928703e-03, 4.22018812969327e-03, 4.365534987300634e-03, 4.416652023792267e-03, 4.433353897184134e-03, 4.438519012182951e-03, 4.440050106495619e-03, 4.118283744901419e-03, 2.755215158686042e-03, 1.314259367063642e-03, 4.794959386344976e-04, 1.478819758631289e-04, 4.136218194616958e-05, 1.089681973098777e-05, 2.760192728601396e-06, 6.803948053857312e-07, 1.644980329729151e-07, 2.817567437887156e-04, 1.64977484382689e-03, 3.029949264600873e-03, 3.847504034638405e-03, 4.220184404402971e-03, 4.365536384284496e-03, 4.416650161147118e-03, 4.43335110321641e-03, 4.438509233295918e-03, 4.440042190253735e-03, 4.118281416594982e-03, 2.755214227363467e-03, 1.314259134232998e-03, 4.794958513230085e-04, 1.478819467592984e-04, 4.136217830819032e-05, 1.089681882149323e-05, 2.760191364359343e-06, 6.803943506383803e-07, 1.644957592361607e-07, 2.817555505316705e-04, 1.649772166274488e-03, 3.029946936294436e-03, 3.847504034638405e-03, 4.220190457999706e-03, 4.365535452961922e-03, 4.416650626808405e-03, 4.433352500200272e-03, 4.438517615199089e-03, 4.440048709511757e-03, 4.118283744901419e-03, 2.755215158686042e-03, 1.314259367063642e-03, 4.794959095306695e-04, 1.478819613112137e-04, 4.136218194616958e-05, 1.089682064048247e-05, 2.760192273854045e-06, 6.803948053857312e-07, 1.644957592361607e-07, 2.817579079419473e-04, 1.649776124395415e-03, 3.029946936294436e-03, 3.847504267469049e-03, 4.220184870064259e-03, 4.365535452961922e-03, 4.416664596647024e-03, 4.433366004377604e-03, 4.438529722392559e-03, 4.440051503479481e-03, 4.118284210562706e-03, 2.755215391516685e-03, 1.314259367063642e-03, 4.794959386344999e-04, 1.478819758631289e-04, 4.136218194616958e-05, 1.089682154997718e-05, 2.760191819106694e-06, 6.803948053857312e-07, 1.644957592361607e-07]
-fan3.m_flow=[0e+00, 1.450190087780356e-03, 3.080722643062472e-03, 3.911587875336409e-03, 4.256732761859894e-03, 4.381781443953514e-03, 4.422977566719055e-03, 4.435604438185692e-03, 4.439265932887793e-03, 4.440284334123135e-03, 4.440558142960072e-03, 4.149960819631815e-03, 3.034249879419804e-03, 1.892999745905399e-03, 8.64098488818852e-04, 2.621285384520888e-04, 7.09153973730281e-05, 1.824533683247859e-05, 4.546296622720547e-06, 1.107147909351625e-06, 2.650272108439822e-07, 3.240082587581128e-04, 2.085338812321424e-03, 3.275965107604861e-03, 3.94449895247817e-03, 4.251337610185146e-03, 4.374356009066105e-03, 4.418967291712761e-03, 4.433934111148119e-03, 4.438660107553005e-03, 4.440083634108305e-03, 4.149817395955324e-03, 3.034196794033051e-03, 1.89297751057893e-03, 8.640842279419263e-04, 2.621245512273163e-04, 7.09145751898177e-05, 1.824535320338327e-05, 4.545952378975926e-06, 1.107211119233398e-06, 2.652700459293555e-07, 3.240090736653612e-04, 2.085291082039475e-03, 3.275923663750291e-03, 3.944504074752331e-03, 4.25132317468524e-03, 4.374359734356403e-03, 4.418967291712761e-03, 4.43393224850297e-03, 4.438652656972408e-03, 4.440077114850283e-03, 4.149815067648888e-03, 3.034195629879832e-03, 1.892976928502321e-03, 8.640838786959648e-04, 2.621244639158249e-04, 7.091454608598645e-05, 1.824535502237295e-05, 4.545948286249768e-06, 1.107211119233398e-06, 2.652673174452502e-07, 3.240096848458052e-04, 2.086654538288713e-03, 3.275966737419367e-03, 3.944503609091043e-03, 4.251360893249512e-03, 4.374357406049967e-03, 4.418967291712761e-03, 4.433933179825544e-03, 4.438659176230431e-03, 4.44008270278573e-03, 4.149816930294037e-03, 3.034196561202407e-03, 1.892977394163609e-03, 8.640841697342694e-04, 2.621245512273163e-04, 7.091456791386008e-05, 1.824535684136208e-05, 4.545951014733873e-06, 1.107211119233398e-06, 2.652686816873029e-07, 3.240084915887708e-04, 2.085314365103827e-03, 3.2759930472821e-03, 3.944506868720055e-03, 4.251324106007814e-03, 4.374356009066105e-03, 4.418975207954645e-03, 4.433942958712578e-03, 4.438669420778751e-03, 4.440085031092167e-03, 4.149817861616611e-03, 3.034196794033051e-03, 1.89297751057893e-03, 8.640842861495912e-04, 2.621245803311467e-04, 7.09145751898177e-05, 1.824536229833029e-05, 4.54594919574447e-06, 1.107211119233398e-06, 2.652673174452502e-07]
-fan1.dp=[0e+00, -1.702959765625e+04, -2.499368359375e+04, -2.6872744140625e+04, -2.727878125e+04, -2.7365052734375e+04, -2.7383322265625e+04, -2.7387189453125e+04, -2.7388005859375e+04, -2.73881796875e+04, -2.7388216796875e+04, -7.98508837890625e+03, -1.274895263671875e+03, -1.618077697753906e+02, -1.227932453155512e+01, -8.13438892364502e-01, -5.041713640093803e-02, -2.984184306114897e-03, -1.707292831270024e-04, -9.510666131973267e-06, -5.186739144846797e-07, -5.7944150390625e+03, -1.825154296875e+04, -2.45347578125e+04, -2.6603802734375e+04, -2.718553125e+04, -2.7337697265625e+04, -2.7375927734375e+04, -2.738528515625e+04, -2.738753125e+04, -2.7388064453125e+04, -7.9850693359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644031e+01, -8.134448528289795e-01, -5.041838064789772e-02, -2.984314691275358e-03, -1.70696948771365e-04, -9.512295946478844e-06, -5.198817234486341e-07, -5.794407714843695e+03, -1.8251611328125e+04, -2.4534744140625e+04, -2.66038046875e+04, -2.7185546875e+04, -2.733767578125e+04, -2.7375912109375e+04, -2.738527734375e+04, -2.7387513671875e+04, -2.7388056640625e+04, -7.985068359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227930927276611e+01, -8.134449124336243e-01, -5.041839554905789e-02, -2.98431678675126e-03, -1.706966722849756e-04, -9.512295946478844e-06, -5.198671715334058e-07, -5.7944033203125e+03, -1.825158984375e+04, -2.45347578125e+04, -2.66038046875e+04, -2.7185517578125e+04, -2.733768359375e+04, -2.7375921875e+04, -2.738528125e+04, -2.738753125e+04, -2.7388064453125e+04, -7.98506884765625e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644043e+01, -8.134449124336243e-01, -5.041839182376862e-02, -2.98431608825922e-03, -1.706967741483822e-04, -9.512295946478844e-06, -5.198671715334058e-07, -5.794409667968876e+03, -1.82515566406249e+04, -2.4534748046875e+04, -2.6603806640625e+04, -2.7185544921875e+04, -2.733770703125e+04, -2.737596484375e+04, -2.7385302734375e+04, -2.738754296875e+04, -2.7388064453125e+04, -7.9850693359375e+03, -1.274893798828125e+03, -1.618075866699219e+02, -1.227931022644043e+01, -8.13444972038269e-01, -5.041839927434921e-02, -2.984317252412438e-03, -1.706966431811452e-04, -9.512295946478844e-06, -5.198671715334058e-07]
-fan2.dp=[0e+00, -1.237156127929688e+03, -9.827734375e+03, -1.947737109375e+04, -2.455348046875e+04, -2.6491966796875e+04, -2.7125037109375e+04, -2.73146015625e+04, -2.7368337890625e+04, -2.7382994140625e+04, -2.7386869140625e+04, -2.3556548828125e+04, -1.05424462890625e+04, -2.428752197265625e+03, -5.125163574218735e+02, -1.404957580566406e+02, -3.881412506103516e+01, -1.021537399291989e+01, -2.587551832199097e+00, -6.37761116027832e-01, -1.540694832801819e-01, -2.771497192382812e+02, -3.782196533203125e+03, -1.2751853515625e+04, -2.0560908203125e+04, -2.473651171875e+04, -2.6469544921875e+04, -2.7092974609375e+04, -2.7298248046875e+04, -2.7361880859375e+04, -2.7380759765625e+04, -2.3554953125e+04, -1.054215234375e+04, -2.42871435546875e+03, -5.125125122070284e+02, -1.404947967529297e+02, -3.881396102905273e+01, -1.0215407371521e+01, -2.587402582168579e+00, -6.377968788146973e-01, -1.541981846094131e-01, -2.771497192382776e+02, -3.782195556640625e+03, -1.27519052734375e+04, -2.0560869140625e+04, -2.473646875e+04, -2.6469564453125e+04, -2.7092951171875e+04, -2.7298212890625e+04, -2.736176171875e+04, -2.7380666015625e+04, -2.3554923828125e+04, -1.0542146484375e+04, -2.42871337890625e+03, -5.12512451171875e+02, -1.404947662353516e+02, -3.881395339965778e+01, -1.021540737152115e+01, -2.587401151657104e+00, -6.37796938419342e-01, -1.541965454816818e-01, -2.771484375e+02, -3.782183349609375e+03, -1.2751884765625e+04, -2.0560869140625e+04, -2.47365390625e+04, -2.6469552734375e+04, -2.70929609375e+04, -2.7298232421875e+04, -2.73618671875e+04, -2.738074609375e+04, -2.355494921875e+04, -1.054215234375e+04, -2.42871435546875e+03, -5.125125122070312e+02, -1.404947967529297e+02, -3.881395721435547e+01, -1.0215407371521e+01, -2.587401866912842e+00, -6.37796938419342e-01, -1.541971862316132e-01, -2.771509399414181e+02, -3.782201416015565e+03, -1.2751884765625e+04, -2.056087109375e+04, -2.4736474609375e+04, -2.6469552734375e+04, -2.7093130859375e+04, -2.7298392578125e+04, -2.7362015625e+04, -2.738077734375e+04, -2.3554958984375e+04, -1.0542154296875e+04, -2.428714599609375e+03, -5.125125122070312e+02, -1.404947967529297e+02, -3.881396102905273e+01, -1.021540832519531e+01, -2.587401390075684e+00, -6.377969980239868e-01, -1.541963815689087e-01]
-fan3.dp=[0e+00, -3.08101904296875e+03, -1.3182939453125e+04, -2.12513984375e+04, -2.5165326171875e+04, -2.6666720703125e+04, -2.7170654296875e+04, -2.732596875e+04, -2.737109375e+04, -2.7383650390625e+04, -2.7387025390625e+04, -2.3918861328125e+04, -1.27860341796875e+04, -4.97652197265625e+03, -1.616467285156246e+03, -4.679700317382812e+02, -1.260967102050781e+02, -3.243273162841788e+01, -8.081270217895508e+00, -1.96800434589386e+00, -4.710982441902161e-01, -5.800882568359375e+02, -6.0406630859375e+03, -1.49067607421875e+04, -2.16105078125e+04, -2.5102802734375e+04, -2.657660546875e+04, -2.7121384765625e+04, -2.7305388671875e+04, -2.736362109375e+04, -2.7381173828125e+04, -2.391720703125e+04, -1.27855869140625e+04, -4.976404296875e+03, -1.616437622070304e+03, -4.679626770019531e+02, -1.260954742431641e+02, -3.243271255493164e+01, -8.080656051635742e+00, -1.968116402626038e+00, -4.715293049812317e-01, -5.800897827148358e+02, -6.04057177734375e+03, -1.4906724609375e+04, -2.16104921875e+04, -2.5102765625e+04, -2.657664453125e+04, -2.7121384765625e+04, -2.7305369140625e+04, -2.73635390625e+04, -2.738109765625e+04, -2.3917177734375e+04, -1.27855771484375e+04, -4.97640185546875e+03, -1.616436889648438e+03, -4.679624938964844e+02, -1.2609543609619e+02, -3.243270874023486e+01, -8.080648422241211e+00, -1.968116164207458e+00, -4.715237021446228e-01, -5.800908813476562e+02, -6.04061181640625e+03, -1.49066943359375e+04, -2.1610484375e+04, -2.5102833984375e+04, -2.6576634765625e+04, -2.7121384765625e+04, -2.7305380859375e+04, -2.7363611328125e+04, -2.73811640625e+04, -2.3917203125e+04, -1.27855859375e+04, -4.976404296875e+03, -1.6164375e+03, -4.67962646484375e+02, -1.260954742431641e+02, -3.243271636962891e+01, -8.080652236938477e+00, -1.968116521835327e+00, -4.715259075164795e-01, -5.800886840820579e+02, -6.040645507812425e+03, -1.49067509765625e+04, -2.161050390625e+04, -2.5102775390625e+04, -2.657660546875e+04, -2.712148046875e+04, -2.73055e+04, -2.7363732421875e+04, -2.738119140625e+04, -2.3917212890625e+04, -1.2785587890625e+04, -4.97640478515625e+03, -1.616437744140625e+03, -4.679627075195312e+02, -1.260954895019531e+02, -3.243272018432617e+01, -8.08065128326416e+00, -1.968116879463196e+00, -4.71523255109787e-01]
+fan1.m_flow=[0e+00, 7.789250812493265e-04, 1.776216551661491e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.439061041921377e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.77577999420464e-03, 7.789205410517728e-04, 4.557477950584143e-09, -2.100932761095464e-10, -2.360138751100767e-10, -9.640643838793039e-11, -9.276845958083868e-11, -7.275957614183426e-12, 7.789033115841448e-04, 1.776701305061579e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.439010750502348e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.775305485352874e-03, 7.789459777995895e-04, 4.344201443018392e-09, 1.33240973809734e-10, 5.911715561524034e-12, -5.911715561524034e-12, -1.000444171950221e-10, -4.729372449219227e-11, 7.789356750436078e-04, 1.77672179415822e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.439043346792459e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.774952979758382e-03, 7.789121591486037e-04, 4.405137588037178e-09, -6.821210263296984e-12, -5.002220859751127e-12, -1.364242052659392e-12, 1.364242052659392e-12, 4.547473508864641e-13, 7.788957445882261e-04, 1.776550430804491e-03, 2.663751598447561e-03, 3.553576767444611e-03, 4.439032170921564e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.774792443029583e-03, 7.789544179104269e-04, 4.372850526124239e-09, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.788413786329428e-04, 1.776125631295136e-03, 2.664240309968591e-03, 3.552448004484177e-03, 4.439017735421658e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.55244823731482e-03, 2.664240775629878e-03, 1.774734817445278e-03, 7.789487135596573e-04, 4.32510205428116e-09, -5.911715561524034e-12, -1.114131009671837e-10, -4.774847184307873e-11, -6.230038707144558e-11, 4.547473508864641e-13]
+fan2.m_flow=[0e+00, 7.73672538343817e-04, 1.771697076037526e-03, 2.659700810909271e-03, 3.547913627699018e-03, 4.435682203620672e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.556982614099979e-03, 2.668775152415037e-03, 1.780320657417178e-03, 7.841926417313492e-04, 6.88778527546674e-08, -7.003109203651547e-11, -1.082298695109788e-10, -3.910827217623591e-11, -3.319655661471188e-11, -7.73070496506989e-12, 7.736074039712548e-04, 1.772171119228005e-03, 2.659706631675363e-03, 3.547913627699018e-03, 4.435617011040449e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.556982614099979e-03, 2.668775152415037e-03, 1.77985813934356e-03, 7.842188933864187e-04, 7.004837243584916e-08, -5.379661160986871e-10, 2.728484105318785e-12, -1.182343112304807e-11, -1.800799509510398e-10, -8.731149137020111e-11, 7.736678235232781e-04, 1.772187300957739e-03, 2.659704769030213e-03, 3.547913627699018e-03, 4.435665439814329e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.556982614099979e-03, 2.668775152415037e-03, 1.779514830559492e-03, 7.841969490982592e-04, 6.888240022817627e-08, -1.045918907038857e-11, -5.456968210637678e-12, -3.637978807091713e-12, 9.094947017729282e-13, 4.547473508864641e-13, 7.735848776064813e-04, 1.772014773450792e-03, 2.659295918419957e-03, 3.548465436324477e-03, 4.435678012669086e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.556982614099979e-03, 2.668775152415037e-03, 1.779358834028244e-03, 7.842256454750896e-04, 7.013295544311404e-08, 4.547473508864641e-13, 0e+00, 4.547473508864641e-13, 0e+00, 0e+00, 7.735465187579492e-04, 1.771604409441343e-03, 2.659705933183432e-03, 3.547913627699018e-03, 4.43563237786293e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 4.440655466169119e-03, 3.556982614099979e-03, 2.668775152415037e-03, 1.779303071089089e-03, 7.842188933864236e-04, 7.004791768849827e-08, -6.821210263296962e-12, -1.045918907038867e-10, -4.547473508864641e-11, -5.95719029661268e-11, -4.547473508864641e-13]
+fan3.m_flow=[0e+00, 5.538010009331629e-05, 1.115518098231405e-04, 1.67592559591867e-04, 2.234351850347593e-04, 2.790141734294593e-04, 3.342647396493703e-04, 3.891229571308941e-04, 4.435260780155659e-04, 4.974125185981393e-04, 5.507224122993648e-04, 6.033969693817198e-04, 6.55379903037101e-04, 7.066165562719107e-04, 7.570546003989874e-04, 7.086810655891895e-04, 6.574757862836123e-04, 6.055228295736014e-04, 5.528784240595996e-04, 4.995958879590034e-04, 4.457361064851284e-04, 4.307391063775867e-04, 4.847529053222388e-04, 5.382040399126709e-04, 5.910336622036994e-04, 6.431847577914596e-04, 6.946022040210664e-04, 7.452332065440714e-04, 7.950271246954801e-04, 8.439358207397163e-04, 8.9191400911659e-04, 9.389190236106515e-04, 9.849115740507841e-04, 1.029855571687222e-03, 1.049950835295021e-03, 1.005495898425579e-03, 9.599762270227075e-04, 9.134272113442421e-04, 8.658868027850986e-04, 8.173972601071e-04, 7.679998525418341e-04, 7.234540535137058e-04, 7.736160769127309e-04, 8.229130180552602e-04, 8.712986600585282e-04, 9.18729230761528e-04, 9.651639848016202e-04, 1.010565320029855e-03, 1.054899068549275e-03, 1.098134089261293e-03, 1.14024430513382e-03, 1.181204686872661e-03, 1.220998237840831e-03, 1.259609241969883e-03, 1.260928343981504e-03, 1.222358550876379e-03, 1.182606094516813e-03, 1.141685410402716e-03, 1.099621644243598e-03, 1.056421780958772e-03, 1.012129825539887e-03, 9.667577687650919e-04, 9.964839555323124e-04, 1.041154842823744e-03, 1.084736431948841e-03, 1.127200666815042e-03, 1.168523100204766e-03, 1.208682544529438e-03, 1.247665146365762e-03, 1.285453094169497e-03, 1.322048716247082e-03, 1.357447821646929e-03, 1.391646219417453e-03, 1.424655318260193e-03, 1.415639068000019e-03, 1.38230191078037e-03, 1.347753219306469e-03, 1.312045496888459e-03, 1.275119255296886e-03, 1.236997195519507e-03, 1.197694567963481e-03, 1.157203339971602e-03, 1.169431372545659e-03, 1.209565554745495e-03, 1.248521264642477e-03, 1.2862867442891e-03, 1.322854892350733e-03, 1.358223613351583e-03, 1.392395352013409e-03, 1.425378839485347e-03, 1.45718501880765e-03, 1.487833564169705e-03, 1.517349504865706e-03, 1.545762177556753e-03, 1.53127929661423e-03, 1.50230317376554e-03, 1.472207484766841e-03, 1.440962310880423e-03, 1.408547861501575e-03, 1.374951330944896e-03, 1.340175163932145e-03]
+fan1.dp=[0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.73685625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.44234936523437e+03, -8.053509518504143e-03, 2.91038304567337e-11, 1.455191522836737e-11, 0e+00, 0e+00, 0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.73679453125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234365e+03, -7.991662248969078e-03, 1.746229827404022e-10, 0e+00, 0e+00, 2.91038304567337e-11, 1.455191522836685e-11, -1.442349243164053e+03, -4.3811025390625e+03, -9.8586650390625e+03, -1.7527734375e+04, -2.7368345703125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234375e+03, -7.836634293198586e-03, 1.455191522836616e-11, 0e+00, 0e+00, 0e+00, 0e+00, -1.442349365234375e+03, -4.38110302734375e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.7368208984375e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234375e+03, -7.806069683283567e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.442349365234396e+03, -4.381103027343712e+03, -9.858666015625e+03, -1.7527736328125e+04, -2.736803125e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.7527736328125e+04, -9.858666015625e+03, -4.38110302734375e+03, -1.442349365234375e+03, -7.889444939792156e-03, 0e+00, -1.455191522836685e-11, 0e+00, 0e+00, 0e+00]
+fan2.dp=[0e+00, -9.852951049804688e+02, -4.3601220703125e+03, -9.8257880859375e+03, -1.7483939453125e+04, -2.7327783203125e+04, -2.73882265625e+04, -2.7388228515625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.75715859375e+04, -9.8915595703125e+03, -4.40173779296875e+03, -1.005242919921871e+03, -6.33091926574707e-02, 6.894519901834428e-05, 1.039934868458662e-04, 3.755571378860623e-05, 3.179640043526888e-05, 6.962727638892829e-06, -9.851715087890625e+02, -4.3624560546875e+03, -9.8258310546875e+03, -1.7483939453125e+04, -2.7326982421875e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.75715859375e+04, -9.8915595703125e+03, -4.3994501953125e+03, -1.005294067382804e+03, -6.437917798757553e-02, 4.865380469709635e-04, -2.594460966065526e-06, 1.080108631867915e-05, 1.650342019274831e-04, 7.963721873238683e-05, -9.852865600585856e+02, -4.3625361328125e+03, -9.82581640625e+03, -1.7483939453125e+04, -2.732757421875e+04, -2.7388228515625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.75715859375e+04, -9.8915595703125e+03, -4.39775244140625e+03, -1.005250671386719e+03, -6.331014633178711e-02, 9.56752046477042e-06, 5.340712959878225e-06, 3.215958713553846e-06, -2.024753484874964e-07, 1.406442606821656e-07, -9.851287231445312e+02, -4.36168701171875e+03, -9.8227841796875e+03, -1.7489498046875e+04, -2.732772265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.75715859375e+04, -9.8915595703125e+03, -4.39698095703125e+03, -1.005307250976562e+03, -6.445713341236115e-02, -6.984919309616089e-09, -4.365574568510056e-10, 0e+00, 0e+00, 2.91038304567337e-11, -9.850542602539277e+02, -4.35966601562496e+03, -9.825826171875e+03, -1.7483939453125e+04, -2.732716796875e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -2.73882265625e+04, -1.75715859375e+04, -9.8915595703125e+03, -4.396705078125e+03, -1.005294189453125e+03, -6.43789991736412e-02, 6.573711289092898e-06, 9.811729250941426e-05, 4.313993849791586e-05, 5.593879905063659e-05, 8.116476237773895e-07]
+fan3.dp=[0e+00, -9.848467254638672e+01, -1.984827575683594e+02, -2.984827575683594e+02, -3.984827575683594e+02, -4.984827575683594e+02, -5.984827880859375e+02, -6.984827880859376e+02, -7.984827880859375e+02, -8.984827880859375e+02, -9.984827880859375e+02, -1.098482788085938e+03, -1.198482788085938e+03, -1.298482788085938e+03, -1.398482788085937e+03, -1.302523315429688e+03, -1.202523315429688e+03, -1.102523315429687e+03, -1.002523254394531e+03, -9.025232543945312e+02, -8.025232543945312e+02, -7.748972778320312e+02, -8.748972778320312e+02, -9.748972778320312e+02, -1.074897338867188e+03, -1.174897338867188e+03, -1.274897338867188e+03, -1.374897338867188e+03, -1.474897338867188e+03, -1.574897338867188e+03, -1.674897338867188e+03, -1.774897338867188e+03, -1.874897338867188e+03, -1.974897338867188e+03, -2.02038232421875e+03, -1.92038232421875e+03, -1.82038232421875e+03, -1.72038232421875e+03, -1.62038232421875e+03, -1.52038232421875e+03, -1.42038232421875e+03, -1.331685424804688e+03, -1.431685424804688e+03, -1.531685424804688e+03, -1.631685424804688e+03, -1.731685424804688e+03, -1.831685424804688e+03, -1.931685424804688e+03, -2.031685424804688e+03, -2.131685546875e+03, -2.231685546875e+03, -2.331685546875e+03, -2.431685546875e+03, -2.531685546875e+03, -2.53513623046875e+03, -2.43513623046875e+03, -2.335136230468749e+03, -2.235136230468751e+03, -2.13513623046875e+03, -2.035136108398438e+03, -1.935136108398438e+03, -1.835136108398438e+03, -1.9004208984375e+03, -2.0004208984375e+03, -2.1004208984375e+03, -2.2004208984375e+03, -2.3004208984375e+03, -2.4004208984375e+03, -2.500420898437501e+03, -2.600420898437499e+03, -2.7004208984375e+03, -2.8004208984375e+03, -2.9004208984375e+03, -3.0004208984375e+03, -2.972726806640625e+03, -2.872726806640625e+03, -2.772726806640625e+03, -2.672726806640625e+03, -2.572726806640625e+03, -2.472726806640625e+03, -2.372726806640625e+03, -2.272726806640624e+03, -2.302650878906249e+03, -2.40265087890625e+03, -2.50265087890625e+03, -2.60265087890625e+03, -2.70265087890625e+03, -2.80265087890625e+03, -2.90265087890625e+03, -3.00265087890625e+03, -3.10265087890625e+03, -3.20265087890625e+03, -3.30265087890625e+03, -3.40265087890625e+03, -3.351179443359375e+03, -3.251179443359375e+03, -3.151179443359375e+03, -3.051179443359375e+03, -2.951179443359375e+03, -2.851179443359375e+03, -2.751179443359375e+03]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
index 671a5d27cf..0ec168773e 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_PressureCurve.txt
@@ -1,4 +1,4 @@
-last-generated=2023-05-01
+last-generated=2024-08-26
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,7 +8,7 @@ statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "1",
-  "number of continuous time states": "2",
+  "number of continuous time states": "1",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
index 806384f990..99f96dc0b4 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Movers_Validation_Pump_y_stratos.txt
@@ -1,24 +1,24 @@
-last-generated=2020-08-17
+last-generated=2024-09-19
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "20",
+  "number of continuous time states": "10",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-pump1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105801582336426e+01, 1.110439014434814e+01, 1.111040306091309e+01, 1.111104297637939e+01, 1.111110496520996e+01, 1.111110973358154e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
-pump2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.108942699432373e+01, 1.129776096343994e+01, 1.150609397888184e+01, 1.171442699432373e+01, 1.192276096343994e+01, 1.213109397888184e+01, 1.233942699432373e+01, 1.254776096343994e+01, 1.275609397888184e+01, 1.296442699432373e+01, 1.317276096343994e+01, 1.338109397888184e+01, 1.358942699432373e+01, 1.379776096343994e+01, 1.400609397888184e+01, 1.421442699432373e+01, 1.442276096343994e+01, 1.463109397888184e+01, 1.483942699432373e+01, 1.504776096343994e+01, 1.522468376159668e+01, 1.527105712890625e+01, 1.527706909179688e+01, 1.527770900726318e+01, 1.527777099609375e+01, 1.527777671813965e+01, 1.527777862548828e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01]
-pump3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.089427471160889e+00, 6.297760486602783e+00, 6.506093978881836e+00, 6.714427471160889e+00, 6.922760486602783e+00, 7.131093978881836e+00, 7.339427471160889e+00, 7.547760486602783e+00, 7.756093978881836e+00, 7.964427471160889e+00, 8.172760963439941e+00, 8.381093978881836e+00, 8.58942699432373e+00, 8.797760963439941e+00, 9.006093978881836e+00, 9.21442699432373e+00, 9.422760963439941e+00, 9.631093978881836e+00, 9.83942699432373e+00, 1.004776096343994e+01, 1.025609397888184e+01, 1.046442699432373e+01, 1.067276096343994e+01, 1.088109397888184e+01, 1.105801582336426e+01, 1.110439014434814e+01, 1.111040306091309e+01, 1.111104297637939e+01, 1.111110496520996e+01, 1.111110973358154e+01, 1.111111164093018e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
-pump4.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.422760486602783e+00, 4.631093978881836e+00, 4.839427471160889e+00, 5.047760486602783e+00, 5.256093978881836e+00, 5.464427471160889e+00, 5.672760486602783e+00, 5.881093978881836e+00, 6.058016777038574e+00, 6.104390144348145e+00, 6.110403060913086e+00, 6.111042499542236e+00, 6.111104488372803e+00, 6.111110687255859e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00]
-pump5.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.530119270086288e-02, 2.593111097812653e-01, 4.64754194021225e-01, 6.727915406227112e-01, 8.810967803001404e-01, 1.089427590370178e+00, 1.297760725021362e+00, 1.506093978881836e+00, 1.714427351951599e+00, 1.922760605812073e+00, 2.131093978881836e+00, 2.33942723274231e+00, 2.547760725021362e+00, 2.756093978881836e+00, 2.96442723274231e+00, 3.172760725021362e+00, 3.381093978881836e+00, 3.58942723274231e+00, 3.797760725021362e+00, 4.006093978881836e+00, 4.214427471160889e+00, 4.391349315643311e+00, 4.437723159790039e+00, 4.443736553192139e+00, 4.444375991821289e+00, 4.444437980651855e+00, 4.444443702697754e+00, 4.444444179534912e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00]
-forcedPump1.dp=[7.83562578125e+04, 9.90089765625e+04, 1.00647609375e+05, 1.00770484375e+05, 1.0077965625e+05, 1.0078034375e+05, 1.00780390625e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007768984375e+05, 1.007680078125e+05, 1.007576015625e+05, 1.007466875e+05, 1.00735515625e+05, 1.0072421875e+05, 1.00712953125e+05, 1.007018515625e+05, 1.006910390625e+05, 1.006806640625e+05, 1.006708671875e+05, 1.006617734375e+05, 1.006535234375e+05, 1.006462578125e+05, 1.00640109375e+05, 1.006352109375e+05, 1.0063134375e+05, 1.0062796875e+05, 1.00624546875e+05, 1.00620578125e+05, 1.00615515625e+05, 1.00608859375e+05, 1.006000859375e+05, 1.005886640625e+05, 1.005740703125e+05, 1.00555796875e+05, 1.005333125e+05, 1.005061015625e+05, 1.00473640625e+05, 1.004353984375e+05, 1.00390828125e+05, 1.003189453125e+05, 1.002041640625e+05, 1.000486484375e+05, 9.98545390625e+04, 9.96240078125e+04, 9.93592109375e+04, 9.9062296875e+04, 9.87354296875e+04, 9.8380765625e+04, 9.800046875e+04, 9.75966875e+04, 9.71715625e+04, 9.67250625e+04, 9.62545234375e+04, 9.5757390625e+04, 9.52311015625e+04, 9.46731015625e+04, 9.40808359375e+04, 9.345175e+04, 9.27832890625e+04, 9.2072890625e+04, 9.13180078125e+04, 9.06401015625e+04, 9.0456375e+04, 9.043234375e+04, 9.04297890625e+04, 9.04295390625e+04, 9.0429515625e+04, 9.04295078125e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04]
-forcedPump2.dp=[7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.835315625e+04, 7.83452421875e+04, 7.83359609375e+04, 7.83262109375e+04, 7.8316265625e+04, 7.83062890625e+04, 7.82964296875e+04, 7.828684375e+04, 7.82776875e+04, 7.82691171875e+04, 7.82612890625e+04, 7.82543515625e+04, 7.824846875e+04, 7.8243796875e+04, 7.824025e+04, 7.8237234375e+04, 7.823415625e+04, 7.82304296875e+04, 7.82254609375e+04, 7.82186640625e+04, 7.82094375e+04, 7.81971953125e+04, 7.818134375e+04, 7.8161296875e+04, 7.81364609375e+04, 7.810625e+04, 7.80700625e+04, 7.80201171875e+04, 7.7929359375e+04, 7.779740625e+04, 7.76266875e+04, 7.74196640625e+04, 7.71787734375e+04, 7.69064609375e+04, 7.66051875e+04, 7.62773828125e+04, 7.59255078125e+04, 7.5551984375e+04, 7.51570390625e+04, 7.473771875e+04, 7.4291140625e+04, 7.3814390625e+04, 7.33045859375e+04, 7.2758828125e+04, 7.2174203125e+04, 7.15478203125e+04, 7.08767890625e+04, 7.01574765625e+04, 6.9383515625e+04, 6.855575e+04, 6.767634375e+04, 6.67474453125e+04, 6.577121875e+04, 6.47498125e+04, 6.3685390625e+04, 6.257675390625e+04, 6.1419390625e+04, 6.021051953125e+04, 5.89473671875e+04, 5.762715625e+04, 5.6247109375e+04, 5.48053046875e+04, 5.33065625e+04, 5.174723828125e+04, 5.012122265625e+04, 4.84224140625e+04, 4.664469921875e+04, 4.4778953125e+04, 4.28016875e+04, 4.073221875e+04, 3.85990703125e+04, 3.64307578125e+04, 3.42558046875e+04, 3.242482421875e+04, 3.19496953125e+04, 3.188827734375e+04, 3.1881744140625e+04, 3.1881109375e+04, 3.1881060546875e+04, 3.1881041015625e+04, 3.188104296875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04]
-forcedPump3.dp=[7.83562578125e+04, 4.512932421875e+04, 4.3014140625e+04, 4.2858265625e+04, 4.2846640625e+04, 4.28457734375e+04, 4.28457109375e+04, 4.2845703125e+04, 4.284570703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.284337890625e+04, 4.283737890625e+04, 4.283029296875e+04, 4.28228984375e+04, 4.281548046875e+04, 4.28082578125e+04, 4.280144140625e+04, 4.27952421875e+04, 4.27898671875e+04, 4.27855234375e+04, 4.278239453125e+04, 4.278004296875e+04, 4.277765625e+04, 4.27744375e+04, 4.27695859375e+04, 4.27623046875e+04, 4.27517890625e+04, 4.273723828125e+04, 4.271786328125e+04, 4.26928515625e+04, 4.26557109375e+04, 4.25791640625e+04, 4.246258984375e+04, 4.230929296875e+04, 4.212258203125e+04, 4.1905765625e+04, 4.166216015625e+04, 4.139506640625e+04, 4.110669921875e+04, 4.07941484375e+04, 4.045346875e+04, 4.008073828125e+04, 3.967204296875e+04, 3.922345703125e+04, 3.873106640625e+04, 3.818964453125e+04, 3.759371875e+04, 3.694563671875e+04, 3.62483203125e+04, 3.55046875e+04, 3.471760546875e+04, 3.3885296875e+04, 3.3002796875e+04, 3.20663515625e+04, 3.1072205078125e+04, 3.00169296875e+04, 2.8903662109375e+04, 2.7728056640625e+04, 2.6481849609375e+04, 2.515678125e+04, 2.3734591796875e+04, 2.221242578125e+04, 2.0627994140625e+04, 1.926232421875e+04, 1.8904478515625e+04, 1.8858134765625e+04, 1.8853208984375e+04, 1.8852728515625e+04, 1.88526875e+04, 1.8852677734375e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.8852681640625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04]
-forcedPump4.dp=[7.83562578125e+04, 1.21382234375e+05, 1.249705625e+05, 1.25240546875e+05, 1.252607109375e+05, 1.2526221875e+05, 1.25262328125e+05, 1.2526234375e+05, 1.252623359375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.25258453125e+05, 1.25248609375e+05, 1.252371328125e+05, 1.2522509375e+05, 1.252127421875e+05, 1.2520021875e+05, 1.251876484375e+05, 1.251751484375e+05, 1.251628515625e+05, 1.251508671875e+05, 1.251393203125e+05, 1.2512834375e+05, 1.251180546875e+05, 1.251085703125e+05, 1.251000234375e+05, 1.250925234375e+05, 1.250862109375e+05, 1.2508115625e+05, 1.25077015625e+05, 1.250732890625e+05, 1.250695234375e+05, 1.250652421875e+05, 1.250599765625e+05, 1.250532578125e+05, 1.25044625e+05, 1.25033609375e+05, 1.250197421875e+05, 1.25002546875e+05, 1.249815703125e+05, 1.249604296875e+05, 1.2495434375e+05, 1.249535390625e+05, 1.24953453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05]
-forcedPump5.dp=[7.83562578125e+04, 1.21476435546875e+04, 9.51540625e+03, 9.3317724609375e+03, 9.318134765625e+03, 9.3171171875e+03, 9.317044921875e+03, 9.3170341796875e+03, 9.317037109375e+03, 9.3170341796875e+03, 9.317033203125e+03, 9.3158857421875e+03, 9.3128330078125e+03, 9.3093193359375e+03, 9.306072265625e+03, 9.30358203125e+03, 9.3021455078125e+03, 9.3006884765625e+03, 9.29749609375e+03, 9.2908525390625e+03, 9.2789912109375e+03, 9.2408076171875e+03, 9.164931640625e+03, 9.0584609375e+03, 8.928126953125e+03, 8.772828125e+03, 8.5843662109375e+03, 8.3542978515625e+03, 8.07286181640625e+03, 7.7413671875e+03, 7.36500390625e+03, 6.9387421875e+03, 6.53136962890625e+03, 6.4175234375e+03, 6.40255615234375e+03, 6.40096044921875e+03, 6.40080615234375e+03, 6.40079248046875e+03, 6.40079052734375e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03]
-pump1.P=[4.36944091796875e+02, 6.206221313476562e+02, 6.360929565429688e+02, 6.372581176757812e+02, 6.373451538085938e+02, 6.373516845703125e+02, 6.373521118164062e+02, 6.373521728515625e+02, 6.373521728515625e+02, 6.373521728515625e+02, 6.373522338867188e+02, 6.426599731445312e+02, 6.554689331054688e+02, 6.6954248046875e+02, 6.83611328125e+02, 6.97579345703125e+02, 7.11495361328125e+02, 7.2542333984375e+02, 7.394284057617188e+02, 7.535760498046875e+02, 7.679315795898438e+02, 7.82560546875e+02, 7.975281982421875e+02, 8.129000854492188e+02, 8.287415771484375e+02, 8.451179809570312e+02, 8.620972290039062e+02, 8.79808349609375e+02, 8.982250366210938e+02, 9.17248779296875e+02, 9.367811279296875e+02, 9.567235107421875e+02, 9.769774169921875e+02, 9.974443969726562e+02, 1.01802587890625e+03, 1.038623413085938e+03, 1.059138427734375e+03, 1.079472412109375e+03, 1.099526977539062e+03, 1.119203491210938e+03, 1.138403442382812e+03, 1.15702880859375e+03, 1.175201293945312e+03, 1.193089233398438e+03, 1.210715209960938e+03, 1.228101806640625e+03, 1.245271728515625e+03, 1.262247436523438e+03, 1.279051635742188e+03, 1.295706909179688e+03, 1.31223583984375e+03, 1.328661010742188e+03, 1.345005004882812e+03, 1.36129150390625e+03, 1.377591186523438e+03, 1.393895751953125e+03, 1.4101474609375e+03, 1.426288818359375e+03, 1.44226220703125e+03, 1.458010131835938e+03, 1.473474731445312e+03, 1.488598754882812e+03, 1.503324340820312e+03, 1.517593994140625e+03, 1.529311401367188e+03, 1.5323212890625e+03, 1.5327099609375e+03, 1.532751342773438e+03, 1.532755249023438e+03, 1.532755615234375e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03]
-pump2.P=[4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.410687561035156e+02, 4.510078125e+02, 4.619131774902344e+02, 4.728125e+02, 4.836459350585938e+02, 4.94466064453125e+02, 5.053371276855469e+02, 5.163244018554688e+02, 5.274932250976562e+02, 5.389091186523438e+02, 5.506373901367188e+02, 5.627434692382812e+02, 5.752927856445312e+02, 5.883507690429688e+02, 6.020260620117188e+02, 6.163313598632812e+02, 6.311682739257812e+02, 6.464382934570312e+02, 6.620429077148438e+02, 6.778836059570312e+02, 6.938619384765625e+02, 7.098792724609375e+02, 7.258372802734375e+02, 7.416372680664062e+02, 7.571808471679688e+02, 7.723694458007812e+02, 7.871046142578125e+02, 8.013530883789062e+02, 8.153215942382812e+02, 8.290548095703125e+02, 8.425753784179688e+02, 8.559059448242188e+02, 8.690690307617188e+02, 8.820872802734375e+02, 8.949832763671875e+02, 9.077796630859375e+02, 9.204989624023438e+02, 9.331644897460938e+02, 9.4583837890625e+02, 9.585100708007812e+02, 9.711220092773438e+02, 9.836165771484375e+02, 9.959361572265625e+02, 1.008023193359375e+03, 1.019820068359375e+03, 1.031269287109375e+03, 1.042313110351562e+03, 1.05290673828125e+03, 1.063102294921875e+03, 1.072906860351562e+03, 1.082311401367188e+03, 1.091307006835938e+03, 1.099884643554688e+03, 1.108035400390625e+03, 1.115750366210938e+03, 1.123005981445312e+03, 1.129784912109375e+03, 1.136087524414062e+03, 1.141914184570312e+03, 1.147265380859375e+03, 1.152141357421875e+03, 1.15654296875e+03, 1.160464111328125e+03, 1.163878173828125e+03, 1.166755249023438e+03, 1.16906591796875e+03, 1.170780395507812e+03, 1.171843139648438e+03, 1.172058715820312e+03, 1.171569213867188e+03, 1.17059326171875e+03, 1.169349487304688e+03, 1.16805615234375e+03, 1.167082153320312e+03, 1.166863647460938e+03, 1.166836791992188e+03, 1.166833862304688e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03]
-pump3.P=[4.36944091796875e+02, 1.909869232177734e+02, 1.777183532714844e+02, 1.767532043457031e+02, 1.766812896728516e+02, 1.766759185791016e+02, 1.76675537109375e+02, 1.766754913330078e+02, 1.766755065917969e+02, 1.766754913330078e+02, 1.766754760742188e+02, 1.789274749755859e+02, 1.843316955566406e+02, 1.902439880371094e+02, 1.961623840332031e+02, 2.020842895507812e+02, 2.080681610107422e+02, 2.141787872314453e+02, 2.204814758300781e+02, 2.270416564941406e+02, 2.339247131347656e+02, 2.412034301757812e+02, 2.489526977539062e+02, 2.570982360839844e+02, 2.655415954589844e+02, 2.741841735839844e+02, 2.829275512695312e+02, 2.916731872558594e+02, 3.003225402832031e+02, 3.087771606445312e+02, 3.169385070800781e+02, 3.247470703125e+02, 3.323451843261719e+02, 3.397773742675781e+02, 3.470662231445312e+02, 3.542343139648438e+02, 3.613042907714844e+02, 3.682987365722656e+02, 3.75240234375e+02, 3.821669311523438e+02, 3.890924987792969e+02, 3.959611511230469e+02, 4.0271533203125e+02, 4.092973937988281e+02, 4.156497802734375e+02, 4.217148742675781e+02, 4.274548950195312e+02, 4.329044799804688e+02, 4.380598449707031e+02, 4.429120178222656e+02, 4.474520568847656e+02, 4.516707763671875e+02, 4.55546875e+02, 4.590706787109375e+02, 4.622424926757812e+02, 4.650627136230469e+02, 4.675318603515625e+02, 4.696452331542969e+02, 4.713772277832031e+02, 4.726981811523438e+02, 4.735784912109375e+02, 4.739219970703125e+02, 4.737006225585938e+02, 4.731275939941406e+02, 4.725277709960938e+02, 4.72371337890625e+02, 4.723513793945312e+02, 4.723492736816406e+02, 4.723490600585938e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02]
-pump4.P=[4.36944091796875e+02, 8.424577026367188e+02, 8.800897216796875e+02, 8.829432983398438e+02, 8.831565551757812e+02, 8.831724853515625e+02, 8.831736450195312e+02, 8.831737670898438e+02, 8.831737670898438e+02, 8.831737670898438e+02, 8.83173828125e+02, 8.897735595703125e+02, 9.057191162109375e+02, 9.232597045898438e+02, 9.408016967773438e+02, 9.5820947265625e+02, 9.755277099609375e+02, 9.928200073242188e+02, 1.010151428222656e+03, 1.027587524414062e+03, 1.045193603515625e+03, 1.06303515625e+03, 1.081177490234375e+03, 1.09968603515625e+03, 1.118626220703125e+03, 1.1380634765625e+03, 1.158063110351562e+03, 1.178690673828125e+03, 1.200027587890625e+03, 1.222202880859375e+03, 1.245151489257812e+03, 1.26877490234375e+03, 1.292974487304688e+03, 1.317651733398438e+03, 1.342708251953125e+03, 1.36804541015625e+03, 1.393564819335938e+03, 1.419167846679688e+03, 1.444756103515625e+03, 1.470231079101562e+03, 1.49170263671875e+03, 1.4972978515625e+03, 1.498022216796875e+03, 1.498099243164062e+03, 1.498106689453125e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03]
-pump5.P=[4.36944091796875e+02, 2.66718692779541e+01, 1.84908275604248e+01, 1.795815086364746e+01, 1.791879844665527e+01, 1.791586303710938e+01, 1.79156551361084e+01, 1.791562271118164e+01, 1.791563034057617e+01, 1.791562461853027e+01, 1.791562080383301e+01, 1.840224456787109e+01, 1.955545234680176e+01, 2.08275203704834e+01, 2.216099166870117e+01, 2.360690307617188e+01, 2.523238945007324e+01, 2.703916931152344e+01, 2.893294906616211e+01, 3.081521606445312e+01, 3.258761978149414e+01, 3.423546981811523e+01, 3.581338500976562e+01, 3.734397125244141e+01, 3.885184860229492e+01, 4.034844207763672e+01, 4.178400039672852e+01, 4.310113525390625e+01, 4.427668380737305e+01, 4.531203079223633e+01, 4.619688415527344e+01, 4.69188346862793e+01, 4.740321731567383e+01, 4.751062393188477e+01, 4.752394104003906e+01, 4.752534866333008e+01, 4.752548599243164e+01, 4.752549743652344e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01]
+pump1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07708328962326e-01, 4.160416722297668e-01, 6.243749856948853e-01, 8.327083587646484e-01, 1.041041612625122e+00, 1.249374985694885e+00, 1.457708358764648e+00, 1.666041612625122e+00, 1.874374985694885e+00, 2.082708358764648e+00, 2.291041612625122e+00, 2.499375104904175e+00, 2.707708358764648e+00, 2.916041612625122e+00, 3.124375104904175e+00, 3.332708358764648e+00, 3.541041612625122e+00, 3.749375104904175e+00, 3.957708358764648e+00, 4.166041851043701e+00, 4.374374866485596e+00, 4.582708358764648e+00, 4.791041851043701e+00, 4.999374866485596e+00, 5.207708358764648e+00, 5.416041851043701e+00, 5.624374866485596e+00, 5.832708358764648e+00, 6.041041851043701e+00, 6.249374866485596e+00, 6.457708358764648e+00, 6.666041851043701e+00, 6.874374866485596e+00, 7.082708358764648e+00, 7.291041851043701e+00, 7.499374866485596e+00, 7.707708358764648e+00, 7.916041851043701e+00, 8.124375343322754e+00, 8.332708358764648e+00, 8.541041374206543e+00, 8.749375343322754e+00, 8.957708358764648e+00, 9.166041374206543e+00, 9.374375343322754e+00, 9.582708358764648e+00, 9.791041374206543e+00, 9.999375343322754e+00, 1.020770835876465e+01, 1.041604137420654e+01, 1.062437534332275e+01, 1.083270835876465e+01, 1.104104137420654e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+pump2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07708328962326e-01, 4.160416722297668e-01, 6.243749856948853e-01, 8.327083587646484e-01, 1.041041612625122e+00, 1.249374985694885e+00, 1.457708358764648e+00, 1.666041612625122e+00, 1.874374985694885e+00, 2.082708358764648e+00, 2.291041612625122e+00, 2.499375104904175e+00, 2.707708358764648e+00, 2.916041612625122e+00, 3.124375104904175e+00, 3.332708358764648e+00, 3.541041612625122e+00, 3.749375104904175e+00, 3.957708358764648e+00, 4.166041851043701e+00, 4.374374866485596e+00, 4.582708358764648e+00, 4.791041851043701e+00, 4.999374866485596e+00, 5.207708358764648e+00, 5.416041851043701e+00, 5.624374866485596e+00, 5.832708358764648e+00, 6.041041851043701e+00, 6.249374866485596e+00, 6.457708358764648e+00, 6.666041851043701e+00, 6.874374866485596e+00, 7.082708358764648e+00, 7.291041851043701e+00, 7.499374866485596e+00, 7.707708358764648e+00, 7.916041851043701e+00, 8.124375343322754e+00, 8.332708358764648e+00, 8.541041374206543e+00, 8.749375343322754e+00, 8.957708358764648e+00, 9.166041374206543e+00, 9.374375343322754e+00, 9.582708358764648e+00, 9.791041374206543e+00, 9.999375343322754e+00, 1.020770835876465e+01, 1.041604137420654e+01, 1.062437534332275e+01, 1.083270835876465e+01, 1.104104137420654e+01, 1.124937534332275e+01, 1.145770835876465e+01, 1.166604137420654e+01, 1.187437534332275e+01, 1.208270835876465e+01, 1.229104137420654e+01, 1.249937534332275e+01, 1.270770835876465e+01, 1.291604137420654e+01, 1.312437534332275e+01, 1.333270835876465e+01, 1.354104137420654e+01, 1.374937534332275e+01, 1.395770835876465e+01, 1.416604137420654e+01, 1.437437534332275e+01, 1.458270835876465e+01, 1.479104137420654e+01, 1.499937534332275e+01, 1.520770835876465e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01, 1.527777767181396e+01]
+pump3.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07708328962326e-01, 4.160416722297668e-01, 6.243749856948853e-01, 8.327083587646484e-01, 1.041041612625122e+00, 1.249374985694885e+00, 1.457708358764648e+00, 1.666041612625122e+00, 1.874374985694885e+00, 2.082708358764648e+00, 2.291041612625122e+00, 2.499375104904175e+00, 2.707708358764648e+00, 2.916041612625122e+00, 3.124375104904175e+00, 3.332708358764648e+00, 3.541041612625122e+00, 3.749375104904175e+00, 3.957708358764648e+00, 4.166041851043701e+00, 4.374374866485596e+00, 4.582708358764648e+00, 4.791041851043701e+00, 4.999374866485596e+00, 5.207708358764648e+00, 5.416041851043701e+00, 5.624374866485596e+00, 5.832708358764648e+00, 6.041041851043701e+00, 6.249374866485596e+00, 6.457708358764648e+00, 6.666041851043701e+00, 6.874374866485596e+00, 7.082708358764648e+00, 7.291041851043701e+00, 7.499374866485596e+00, 7.707708358764648e+00, 7.916041851043701e+00, 8.124375343322754e+00, 8.332708358764648e+00, 8.541041374206543e+00, 8.749375343322754e+00, 8.957708358764648e+00, 9.166041374206543e+00, 9.374375343322754e+00, 9.582708358764648e+00, 9.791041374206543e+00, 9.999375343322754e+00, 1.020770835876465e+01, 1.041604137420654e+01, 1.062437534332275e+01, 1.083270835876465e+01, 1.104104137420654e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01, 1.111111068725586e+01]
+pump4.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07708328962326e-01, 4.160416722297668e-01, 6.243749856948853e-01, 8.327083587646484e-01, 1.041041612625122e+00, 1.249374985694885e+00, 1.457708358764648e+00, 1.666041612625122e+00, 1.874374985694885e+00, 2.082708358764648e+00, 2.291041612625122e+00, 2.499375104904175e+00, 2.707708358764648e+00, 2.916041612625122e+00, 3.124375104904175e+00, 3.332708358764648e+00, 3.541041612625122e+00, 3.749375104904175e+00, 3.957708358764648e+00, 4.166041851043701e+00, 4.374374866485596e+00, 4.582708358764648e+00, 4.791041851043701e+00, 4.999374866485596e+00, 5.207708358764648e+00, 5.416041851043701e+00, 5.624374866485596e+00, 5.832708358764648e+00, 6.041041851043701e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00, 6.111111164093018e+00]
+pump5.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07708328962326e-01, 4.160416722297668e-01, 6.243749856948853e-01, 8.327083587646484e-01, 1.041041612625122e+00, 1.249374985694885e+00, 1.457708358764648e+00, 1.666041612625122e+00, 1.874374985694885e+00, 2.082708358764648e+00, 2.291041612625122e+00, 2.499375104904175e+00, 2.707708358764648e+00, 2.916041612625122e+00, 3.124375104904175e+00, 3.332708358764648e+00, 3.541041612625122e+00, 3.749375104904175e+00, 3.957708358764648e+00, 4.166041851043701e+00, 4.374374866485596e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00, 4.44444465637207e+00]
+forcedPump1.dp=[7.83562578125e+04, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.007803984375e+05, 1.00770546875e+05, 1.00760109375e+05, 1.007492578125e+05, 1.00738125e+05, 1.0072684375e+05, 1.007155625e+05, 1.0070440625e+05, 1.00693515625e+05, 1.0068303125e+05, 1.006730859375e+05, 1.006638125e+05, 1.00655359375e+05, 1.006478515625e+05, 1.006414296875e+05, 1.006362265625e+05, 1.006321796875e+05, 1.00628734375e+05, 1.00625375e+05, 1.00621578125e+05, 1.006168203125e+05, 1.00610578125e+05, 1.006023359375e+05, 1.00591578125e+05, 1.005777734375e+05, 1.005603984375e+05, 1.005389375e+05, 1.005128671875e+05, 1.00481671875e+05, 1.00444828125e+05, 1.004018046875e+05, 1.00339546875e+05, 1.002345390625e+05, 1.000882890625e+05, 9.99029453125e+04, 9.96806875e+04, 9.94236484375e+04, 9.91340078125e+04, 9.881390625e+04, 9.84655078125e+04, 9.809096875e+04, 9.76924453125e+04, 9.727209375e+04, 9.68308125e+04, 9.63660859375e+04, 9.5875359375e+04, 9.53560625e+04, 9.480565625e+04, 9.4221578125e+04, 9.36012734375e+04, 9.29421875e+04, 9.22417578125e+04, 9.14974375e+04, 9.07066640625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04, 9.0429515625e+04]
+forcedPump2.dp=[7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83562578125e+04, 7.83475078125e+04, 7.83381953125e+04, 7.83285078125e+04, 7.83185859375e+04, 7.83086015625e+04, 7.82986953125e+04, 7.828903125e+04, 7.8279765625e+04, 7.8271046875e+04, 7.826303125e+04, 7.8255875e+04, 7.8249734375e+04, 7.8244765625e+04, 7.8241e+04, 7.82379140625e+04, 7.823490625e+04, 7.82313828125e+04, 7.82267578125e+04, 7.82204375e+04, 7.8211828125e+04, 7.82003359375e+04, 7.81853828125e+04, 7.8166359375e+04, 7.81426875e+04, 7.81137734375e+04, 7.807903125e+04, 7.80350390625e+04, 7.7954203125e+04, 7.783159375e+04, 7.76696640625e+04, 7.74708515625e+04, 7.7237609375e+04, 7.6972375e+04, 7.6677609375e+04, 7.635575e+04, 7.600925e+04, 7.5640546875e+04, 7.5250828125e+04, 7.48374296875e+04, 7.43974375e+04, 7.39279609375e+04, 7.342609375e+04, 7.28889375e+04, 7.23136015625e+04, 7.1697171875e+04, 7.10367734375e+04, 7.03293046875e+04, 6.9568140625e+04, 6.87526796875e+04, 6.7885078125e+04, 6.69674765625e+04, 6.60020546875e+04, 6.499094921875e+04, 6.3936328125e+04, 6.283848046875e+04, 6.16926796875e+04, 6.049601953125e+04, 5.924571875e+04, 5.79390078125e+04, 5.657310546875e+04, 5.514537109375e+04, 5.365982421875e+04, 5.211511328125e+04, 5.05051328125e+04, 4.882377734375e+04, 4.70649296875e+04, 4.52219453125e+04, 4.327017578125e+04, 4.1219578125e+04, 3.909867578125e+04, 3.693598828125e+04, 3.476003515625e+04, 3.2599337890625e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04, 3.1881044921875e+04]
+forcedPump3.dp=[7.83562578125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.2845703125e+04, 4.28391015625e+04, 4.2832e+04, 4.282462890625e+04, 4.28171953125e+04, 4.280990625e+04, 4.28029765625e+04, 4.279661328125e+04, 4.279103125e+04, 4.27864296875e+04, 4.278301953125e+04, 4.27805625e+04, 4.27782578125e+04, 4.277530078125e+04, 4.277090234375e+04, 4.276425390625e+04, 4.275455859375e+04, 4.274101953125e+04, 4.27228359375e+04, 4.269920703125e+04, 4.266741015625e+04, 4.26006328125e+04, 4.249305859375e+04, 4.234799609375e+04, 4.216875e+04, 4.19586328125e+04, 4.1720953125e+04, 4.145901953125e+04, 4.11756796875e+04, 4.08691015625e+04, 4.05353046875e+04, 4.01703671875e+04, 3.9770375e+04, 3.933140234375e+04, 3.884953515625e+04, 3.832027734375e+04, 3.773687890625e+04, 3.710065234375e+04, 3.641451171875e+04, 3.5681375e+04, 3.490415625e+04, 3.40829375e+04, 3.32124296875e+04, 3.228884765625e+04, 3.13084375e+04, 3.02674453125e+04, 2.9167474609375e+04, 2.8007083984375e+04, 2.6778009765625e+04, 2.5471994140625e+04, 2.40751015625e+04, 2.25729140625e+04, 2.099950390625e+04, 1.939344140625e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04, 1.88526796875e+04]
+forcedPump4.dp=[7.83562578125e+04, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.2526234375e+05, 1.252514140625e+05, 1.25239890625e+05, 1.25227921875e+05, 1.252156328125e+05, 1.252031328125e+05, 1.251905625e+05, 1.251780390625e+05, 1.251656796875e+05, 1.25153609375e+05, 1.251419609375e+05, 1.251308359375e+05, 1.25120375e+05, 1.251106953125e+05, 1.25101921875e+05, 1.250941640625e+05, 1.250875625e+05, 1.250822265625e+05, 1.25077921875e+05, 1.25074140625e+05, 1.250704296875e+05, 1.250663046875e+05, 1.250613125e+05, 1.250549765625e+05, 1.25046828125e+05, 1.2503640625e+05, 1.250232421875e+05, 1.25006859375e+05, 1.249868046875e+05, 1.2496259375e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05, 1.249534453125e+05]
+forcedPump5.dp=[7.83562578125e+04, 3.4825e+04, 9.31703515625e+03, 9.317033203125e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.3170341796875e+03, 9.313712890625e+03, 9.310140625e+03, 9.3067763671875e+03, 9.3040693359375e+03, 9.30241796875e+03, 9.301119140625e+03, 9.298482421875e+03, 9.29279296875e+03, 9.2823369140625e+03, 9.2532958984375e+03, 9.1855419921875e+03, 9.0855439453125e+03, 8.96034375e+03, 8.8115458984375e+03, 8.63153515625e+03, 8.4119072265625e+03, 8.14291748046875e+03, 7.82249169921875e+03, 7.4565234375e+03, 7.0426416015625e+03, 6.57236376953125e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03, 6.4007900390625e+03]
+pump1.P=[4.36944091796875e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.373522338867188e+02, 6.518983764648438e+02, 6.662240600585938e+02, 6.8035009765625e+02, 6.94341796875e+02, 7.082646484375e+02, 7.2218408203125e+02, 7.361654052734375e+02, 7.502740478515625e+02, 7.645755004882812e+02, 7.791351318359375e+02, 7.94018310546875e+02, 8.092904663085938e+02, 8.250170288085938e+02, 8.41263427734375e+02, 8.58094970703125e+02, 8.7562841796875e+02, 8.938900146484375e+02, 9.127815551757812e+02, 9.322045288085938e+02, 9.520604858398438e+02, 9.722507934570312e+02, 9.926770629882812e+02, 1.013240783691406e+03, 1.033843383789062e+03, 1.05438623046875e+03, 1.074771118164062e+03, 1.0948994140625e+03, 1.114672485351562e+03, 1.133991943359375e+03, 1.152759155273438e+03, 1.171006958007812e+03, 1.188958984375e+03, 1.206643798828125e+03, 1.224083984375e+03, 1.241302124023438e+03, 1.258320922851562e+03, 1.275162963867188e+03, 1.291850830078125e+03, 1.308406982421875e+03, 1.324854248046875e+03, 1.341215087890625e+03, 1.35751220703125e+03, 1.373803100585938e+03, 1.390111572265625e+03, 1.406380737304688e+03, 1.422552856445312e+03, 1.438570434570312e+03, 1.454375732421875e+03, 1.469911376953125e+03, 1.485119506835938e+03, 1.49994287109375e+03, 1.514323486328125e+03, 1.5282041015625e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03, 1.532755737304688e+03]
+pump2.P=[4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.36944091796875e+02, 4.48239013671875e+02, 4.59342529296875e+02, 4.70285400390625e+02, 4.81133056640625e+02, 4.919508972167969e+02, 5.028043518066406e+02, 5.137587890625e+02, 5.24879638671875e+02, 5.362322998046875e+02, 5.478822021484375e+02, 5.598947143554688e+02, 5.723352661132812e+02, 5.852692260742188e+02, 5.987902221679688e+02, 6.129579467773438e+02, 6.2768017578125e+02, 6.428583374023438e+02, 6.5839404296875e+02, 6.74188720703125e+02, 6.901438598632812e+02, 7.061609497070312e+02, 7.221414794921875e+02, 7.379869384765625e+02, 7.53598876953125e+02, 7.688787231445312e+02, 7.837279663085938e+02, 7.980728149414062e+02, 8.120991821289062e+02, 8.258850708007812e+02, 8.394530029296875e+02, 8.5282568359375e+02, 8.66025634765625e+02, 8.790755004882812e+02, 8.919978637695312e+02, 9.048153686523438e+02, 9.175505981445312e+02, 9.3022607421875e+02, 9.428929443359375e+02, 9.555703125e+02, 9.682012329101562e+02, 9.807281494140625e+02, 9.93093505859375e+02, 1.005239685058594e+03, 1.017109130859375e+03, 1.028644165039062e+03, 1.039787353515625e+03, 1.050483764648438e+03, 1.060768920898438e+03, 1.0706650390625e+03, 1.080163330078125e+03, 1.089254638671875e+03, 1.09793017578125e+03, 1.106180908203125e+03, 1.113997802734375e+03, 1.12136328125e+03, 1.1282529296875e+03, 1.134666137695312e+03, 1.140603393554688e+03, 1.14606494140625e+03, 1.15105126953125e+03, 1.155562866210938e+03, 1.159597534179688e+03, 1.163132080078125e+03, 1.166136474609375e+03, 1.168581420898438e+03, 1.17043701171875e+03, 1.1716689453125e+03, 1.172079467773438e+03, 1.171734252929688e+03, 1.170851806640625e+03, 1.169650756835938e+03, 1.168349487304688e+03, 1.167166625976562e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03, 1.166833618164062e+03]
+pump3.P=[4.36944091796875e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.766754760742188e+02, 1.828286590576172e+02, 1.888505706787109e+02, 1.947877502441406e+02, 2.007055816650391e+02, 2.066694793701172e+02, 2.127448577880859e+02, 2.189971008300781e+02, 2.254916534423828e+02, 2.322938842773438e+02, 2.394708557128906e+02, 2.471139831542969e+02, 2.551762847900391e+02, 2.635592346191406e+02, 2.721643371582031e+02, 2.808930969238281e+02, 2.8964697265625e+02, 2.983274841308594e+02, 3.068360900878906e+02, 3.150743408203125e+02, 3.229562377929688e+02, 3.305961303710938e+02, 3.380648498535156e+02, 3.453849792480469e+02, 3.525791015625e+02, 3.596698608398438e+02, 3.666798095703125e+02, 3.73631591796875e+02, 3.805564270019531e+02, 3.874869995117188e+02, 3.943740234375e+02, 4.011598815917969e+02, 4.077870483398438e+02, 4.141979370117188e+02, 4.203348999023438e+02, 4.261480712890625e+02, 4.316647033691406e+02, 4.368891906738281e+02, 4.418125915527344e+02, 4.464259338378906e+02, 4.5072021484375e+02, 4.546780700683594e+02, 4.582836608886719e+02, 4.615372009277344e+02, 4.644390563964844e+02, 4.669896240234375e+02, 4.691873168945312e+02, 4.710105285644531e+02, 4.724295959472656e+02, 4.734148864746094e+02, 4.738998107910156e+02, 4.737913818359375e+02, 4.732805480957031e+02, 4.725857849121094e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02, 4.723490295410156e+02]
+pump4.P=[4.36944091796875e+02, 8.831737670898438e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 8.83173828125e+02, 9.012719116210938e+02, 9.1912255859375e+02, 9.367355346679688e+02, 9.5417626953125e+02, 9.715101928710938e+02, 9.88802734375e+02, 1.006119262695312e+03, 1.023525207519531e+03, 1.0410859375e+03, 1.058866943359375e+03, 1.07693359375e+03, 1.095351318359375e+03, 1.114185424804688e+03, 1.133501342773438e+03, 1.153364624023438e+03, 1.173840576171875e+03, 1.194998413085938e+03, 1.216980102539062e+03, 1.239757934570312e+03, 1.2632333984375e+03, 1.287307861328125e+03, 1.311882934570312e+03, 1.336860229492188e+03, 1.362140991210938e+03, 1.387626831054688e+03, 1.41321923828125e+03, 1.438819702148438e+03, 1.464329833984375e+03, 1.48965087890625e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03, 1.498107421875e+03]
+pump5.P=[4.36944091796875e+02, 1.294649200439453e+02, 1.791562652587891e+01, 1.791562080383301e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.791562271118164e+01, 1.92354907989502e+01, 2.052424049377441e+01, 2.184317779541016e+01, 2.325771141052246e+01, 2.483569717407227e+01, 2.660817909240723e+01, 2.849053573608398e+01, 3.03842601776123e+01, 3.219084167480469e+01, 3.385981750488281e+01, 3.545196151733398e+01, 3.699152374267578e+01, 3.850166320800781e+01, 4.000419235229492e+01, 4.145905685424805e+01, 4.280867004394531e+01, 4.401583099365234e+01, 4.508454132080078e+01, 4.600571441650391e+01, 4.676579284667969e+01, 4.736185455322266e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01, 4.75255012512207e+01]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EnthalpyFlowRate.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
index 1e4abb6517..9fe299098d 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EnthalpyFlowRate.txt
@@ -6,7 +6,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
 senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 5.544634375e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04, 6.55917421875e+04]
 senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, -1.354271833564624e-10, -1.311834126900897e+03, -2.623668253801017e+03, -3.935506306744313e+03, -5.247336507655061e+03, -6.55917431640625e+03, -7.871012613438706e+03, -9.182843058461989e+03, -1.049468135559429e+04, -1.180651033579246e+04, -1.31183486328125e+04, -1.443018692984495e+04, -1.5742016886587e+04, -1.70538551837255e+04, -1.836568611703004e+04, -1.96775234375e+04, -2.098936271107012e+04, -2.23011916912745e+04, -2.361302901185051e+04, -2.492485994515504e+04, -2.6236697265625e+04, -2.754853653921994e+04, -2.886036551939949e+04, -3.01722047931005e+04, -3.148403377328004e+04, -3.279587109375e+04, -3.410771036734495e+04, -3.541954130064951e+04, -3.673138057435051e+04, -3.804320760140506e+04, -3.9355046875e+04, -4.066688614859495e+04, -4.197871708189949e+04, -4.329055244935049e+04, -4.460238338265505e+04, -4.591422265625e+04, -4.722605802359495e+04, -4.853788895689951e+04, -4.984972823060049e+04, -5.116155916390505e+04, -5.247339453125e+04, -5.378523380484495e+04, -5.509706473814951e+04, -5.640890401185051e+04, -5.772073103890505e+04, -5.90325703125e+04, -6.034440958609494e+04, -6.165624051939949e+04, -6.296807588685049e+04, -6.427990682015505e+04, -6.55917421875e+04]
 cheEqu.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EntropyFlowRate.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EntropyFlowRate.txt
index 5e3cc2c170..1dc97877f6 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EntropyFlowRate.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_EntropyFlowRate.txt
@@ -6,6 +6,6 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
 senS_flow.S_flow=[9.535915374755859e+01, 9.34519730372094e+01, 9.154478469746876e+01, 8.963760360819531e+01, 8.773042327676708e+01, 8.582323455810547e+01, 8.391605346883232e+01, 8.200887237956037e+01, 8.010169280597437e+01, 7.819450408732062e+01, 7.628732299804688e+01, 7.438014190877313e+01, 7.247295319011938e+01, 7.056577361653336e+01, 6.865859101156698e+01, 6.675140380859375e+01, 6.484422423501505e+01, 6.293704163004625e+01, 6.102985824177386e+01, 5.912267182212599e+01, 5.721549224853516e+01, 5.530830886025919e+01, 5.340112625529039e+01, 5.149394286701799e+01, 4.958675644737013e+01, 4.76795768737793e+01, 4.577239348550332e+01, 4.386521391190036e+01, 4.195802446090236e+01, 4.005084488729941e+01, 3.814366149902344e+01, 3.623647811074746e+01, 3.432929853714452e+01, 3.24221090861465e+01, 3.051492760520097e+01, 2.860774612426758e+01, 2.670056464332812e+01, 2.479338125505215e+01, 2.288619371139064e+01, 2.097901223044511e+01, 1.907183074951172e+01, 1.716464926857226e+01, 1.525746683396454e+01, 1.335027929029697e+01, 1.144309685569229e+01, 9.535915374755859e+00, 7.628733416983782e+00, 5.721551459211716e+00, 3.814363677127092e+00, 1.907181838563546e+00, -3.14685370860282e-13, -3.246330819886722e+00, -6.492661639774959e+00, -9.739002540986739e+00, -1.298532327968114e+01, -1.623166465759277e+01, -1.947800508184226e+01, -2.272432677413318e+01, -2.597066719864511e+01, -2.921698889093606e+01, -3.246332931518555e+01, -3.570967164675941e+01, -3.895598952438948e+01, -4.220233185625001e+01, -4.544865354855309e+01, -4.869499588012695e+01, -5.194133439705206e+01, -5.518765608933089e+01, -5.84339984211672e+01, -6.168031629879723e+01, -6.492665863037109e+01, -6.817299714729616e+01, -7.141932265424801e+01, -7.466566117143554e+01, -7.791197904908988e+01, -8.11583251953125e+01, -8.440466371223761e+01, -8.765098921918946e+01, -9.089732773637699e+01, -9.414364561403131e+01, -9.738999176025391e+01, -1.00636330277179e+02, -1.038826481547848e+02, -1.071289943012699e+02, -1.103753121788757e+02, -1.136216506958008e+02, -1.168679968420234e+02, -1.201143147196777e+02, -1.233606532368652e+02, -1.266069787438171e+02, -1.298533172607422e+02, -1.330996634069648e+02, -1.363459736552731e+02, -1.395923198017582e+02, -1.428386453086615e+02, -1.460849761962891e+02, -1.493313223425116e+02, -1.52577647849512e+02, -1.55823978737402e+02, -1.590703042444024e+02, -1.62316650390625e+02]
 senS.s=[9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 9.535915374755859e+01, 1.288379058837891e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02, 1.62316650390625e+02]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
index cb7c45aced..d22c6545ff 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_Sensors_Examples_MoistAirEnthalpyFlowRate.txt
@@ -7,7 +7,7 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6e+01]
-senM_flow.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
+senMasFlo.m_flow=[1e+00, 9.800000198682163e-01, 9.599999801317882e-01, 9.399999960263539e-01, 9.200000198682181e-01, 8.999999761581421e-01, 8.799999920527108e-01, 8.600000079472923e-01, 8.399999801317788e-01, 8.199999960263665e-01, 8.00000011920929e-01, 7.79999968210894e-01, 7.599999841054343e-01, 7.400000158945657e-01, 7.200000158946351e-01, 6.99999988079071e-01, 6.800000198681517e-01, 6.600000198681959e-01, 6.399999920527331e-01, 6.199999920527772e-01, 6.000000238418579e-01, 5.799999960262938e-01, 5.599999960263381e-01, 5.400000278155198e-01, 5.199999682109193e-01, 5e-01, 4.800000019867583e-01, 4.600000337756495e-01, 4.399999721846254e-01, 4.199999741714786e-01, 4.000000059604645e-01, 3.800000079472228e-01, 3.600000397361141e-01, 3.399999781450899e-01, 3.199999801319429e-01, 3.00000011920929e-01, 2.800000139076874e-01, 2.600000158944457e-01, 2.399999692044879e-01, 2.1999998609236e-01, 2.000000029802322e-01, 1.800000198681045e-01, 1.600000218549101e-01, 1.399999751649524e-01, 1.199999846022203e-01, 1.000000014901161e-01, 8.000001092743132e-02, 6.000002409006062e-02, 3.9999973674789e-02, 1.999998683740042e-02, -2.442490654175344e-15, -1.999998683740042e-02, -3.9999973674789e-02, -6.000002409006062e-02, -7.999994735038643e-02, -1.000000014901161e-01, -1.200000481792654e-01, -1.39999975164548e-01, -1.600000218553142e-01, -1.799999562909882e-01, -2.000000029802322e-01, -2.200000496694763e-01, -2.399999692040838e-01, -2.600000158948497e-01, -2.799999503305237e-01, -3.00000011920929e-01, -3.200000437090118e-01, -3.399999781446858e-01, -3.600000397365184e-01, -3.799999443700592e-01, -4.000000059604645e-01, -4.200000377485471e-01, -4.39999972184221e-01, -4.600000337760537e-01, -4.799999384099737e-01, -5e-01, -5.200000317880829e-01, -5.399999960260792e-01, -5.60000027815779e-01, -5.799999324491305e-01, -6.000000238418579e-01, -6.200000556299408e-01, -6.399999602632921e-01, -6.600000516572576e-01, -6.799999562909882e-01, -6.99999988079071e-01, -7.200000794710408e-01, -7.399999841051502e-01, -7.600000158948498e-01, -7.799999205289592e-01, -8.00000011920929e-01, -8.200000437090118e-01, -8.399999483427424e-01, -8.600000397367079e-01, -8.799999443700592e-01, -8.999999761581421e-01, -9.200000675508695e-01, -9.39999972184221e-01, -9.600000039739208e-01, -9.799999682119171e-01, -1e+00]
 senH.h_out=[4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.53009453125e+04, 4.55739020320944e+04, 4.638314323649716e+04, 4.770003328759537e+04, 4.947847941700046e+04, 5.165823828125e+04, 5.416740132741474e+04, 5.692696123229725e+04, 5.985485536801724e+04, 6.286964463659879e+04, 6.58943984375e+04, 6.885979644416763e+04, 7.170635583162136e+04, 7.438590950821755e+04, 7.686219705122702e+04, 7.9110984375e+04, 8.111924692218594e+04, 8.288395100394984e+04, 8.441054082820399e+04, 8.57111453501494e+04, 8.68028203125e+04, 8.770584578296855e+04, 8.844216320418548e+04, 8.903411784236219e+04, 8.95034051685978e+04, 8.987034375e+04, 9.015335217293694e+04, 9.036869506866517e+04, 9.053035954636488e+04, 9.065010129428524e+04, 9.07376328125e+04, 9.080076575563052e+04, 9.084571870052771e+04, 9.087730471963712e+04, 9.089921088981738e+04, 9.09141953125e+04, 9.092432033256644e+04, 9.093101561784738e+04, 9.093544531692071e+04, 9.093839843124166e+04, 9.09403515625e+04, 9.094159375238413e+04, 9.094236718670526e+04, 9.09428046878477e+04, 9.09430312495033e+04, 9.09431796875e+04, 9.094327343779802e+04, 9.094336718745033e+04, 9.094342968759935e+04, 9.094346875e+04, 9.09434375e+04]
 senH_flow.H_flow=[4.53009453125e+04, 4.439492581725182e+04, 4.348890632200365e+04, 4.258288664674635e+04, 4.167687123775716e+04, 4.07708515625e+04, 3.986483188724284e+04, 3.895881221198626e+04, 3.805279325676374e+04, 3.714677358151055e+04, 3.62407578125e+04, 3.533473813724256e+04, 3.442871846198626e+04, 3.352269950676374e+04, 3.261667911147481e+04, 3.1710662109375e+04, 3.080464315415019e+04, 2.989862275886011e+04, 2.899260575676489e+04, 2.808658536147481e+04, 2.718056640625e+04, 2.627454940415019e+04, 2.536852900886011e+04, 2.446251005364299e+04, 2.35564916114686e+04, 2.265047265625e+04, 2.17444537010314e+04, 2.083843669892538e+04, 1.993241486357461e+04, 1.902639590834981e+04, 1.812037890625e+04, 1.721435995102519e+04, 1.63083409958128e+04, 1.540232013700591e+04, 1.44963021583467e+04, 1.3590283203125e+04, 1.26842652244658e+04, 1.177824724580039e+04, 1.087222541044961e+04, 9.9662074317842e+03, 9.060189453125e+03, 8.1541704979033e+03, 7.248152519240991e+03, 6.342131172165259e+03, 5.436112705223257e+03, 4.5300947265625e+03, 3.624076259620493e+03, 2.718057792680043e+03, 1.812036689741837e+03, 9.060183448711126e+02, -1.663878756996695e-10, -1.818868594578488e+03, -3.637737189156975e+03, -5.45661168779616e+03, -7.27547437838747e+03, -9.0943486328125e+03, -1.091322337552501e+04, -1.273208655435146e+04, -1.455096032064852e+04, -1.636982349948741e+04, -1.8188697265625e+04, -2.000757298488759e+04, -2.182643518717019e+04, -2.364530895346723e+04, -2.546417310883757e+04, -2.7283046875e+04, -2.910192064116243e+04, -3.092078479653277e+04, -3.273965856282983e+04, -3.455852271823741e+04, -3.637739453125e+04, -3.819627025051257e+04, -4.001513440592017e+04, -4.183400621910465e+04, -4.365287037448741e+04, -4.547174609375e+04, -4.729061790681226e+04, -4.910948206217019e+04, -5.092835778157983e+04, -5.274721803073743e+04, -5.456609375e+04, -5.638496946926259e+04, -5.820382971842017e+04, -6.002270543782981e+04, -6.184156959323741e+04, -6.366044140625e+04, -6.547931712551259e+04, -6.729817737467019e+04, -6.911705700032981e+04, -7.093591724948741e+04, -7.27547890625e+04, -7.457366868801259e+04, -7.639252893717019e+04, -7.821140075032983e+04, -8.003026881198741e+04, -8.1849140625e+04, -8.366801243801258e+04, -8.548688049967017e+04, -8.730575231282981e+04, -8.912461256198741e+04, -9.09434921875e+04]
 senHSen_flow.H_flow=[1.991880078125e+04, 1.952042384395515e+04, 1.912204885978453e+04, 1.872367184333969e+04, 1.8325296938319e+04, 1.7926919921875e+04, 1.752854485855444e+04, 1.713016784210914e+04, 1.673179309538776e+04, 1.633341607894568e+04, 1.59350400390625e+04, 1.553666399918009e+04, 1.513828795929819e+04, 1.473991223601431e+04, 1.434153587953178e+04, 1.394316015625e+04, 1.354478443296511e+04, 1.314640807648363e+04, 1.274803235320231e+04, 1.234965599671928e+04, 1.19512802734375e+04, 1.155290455015261e+04, 1.115452819367114e+04, 1.075615247038981e+04, 1.035777611390678e+04, 9.959400390625e+03, 9.561024667340111e+03, 9.162648944055221e+03, 8.764271954376067e+03, 8.365896231094284e+03, 7.96752001953125e+03, 7.569144296247913e+03, 7.170768572964578e+03, 6.772391583285422e+03, 6.374015860002085e+03, 5.97564013671875e+03, 5.577264413433863e+03, 5.178888690148974e+03, 4.780511700472922e+03, 4.382135977189585e+03, 3.983760009765625e+03, 3.585384286481514e+03, 3.187008563197401e+03, 2.788631573519797e+03, 2.390255850236462e+03, 1.991880004882812e+03, 1.593504281599087e+03, 1.195128558315365e+03, 7.967515076022185e+02, 3.983757538012063e+02, -7.271008795051159e-11, -7.887034780512495e+02, -1.577406956102887e+03, -2.366113063428368e+03, -3.154813912237654e+03, -3.94352001953125e+03, -4.732226126824856e+03, -5.520927219755707e+03, -6.309632838834928e+03, -7.098333931768894e+03, -7.8870400390625e+03, -8.675746146349897e+03, -9.464447239286967e+03, -1.025315334664432e+04, -1.104185443957519e+04, -1.18305595703125e+04, -1.261926567761231e+04, -1.340796677054318e+04, -1.419667287790054e+04, -1.498537397082519e+04, -1.5774080078125e+04, -1.656278520887472e+04, -1.735148727835567e+04, -1.814019240915674e+04, -1.892889447862527e+04, -1.9717599609375e+04, -2.05063066932249e+04, -2.129500680960567e+04, -2.208371389351933e+04, -2.287241400990011e+04, -2.3661119140625e+04, -2.44498262244749e+04, -2.523852634085567e+04, -2.602723342476933e+04, -2.68159335411501e+04, -2.7604640625e+04, -2.83933457557249e+04, -2.918204782521826e+04, -2.997075295601933e+04, -3.07594530724001e+04, -3.154816015625e+04, -3.233686528699973e+04, -3.312556540336809e+04, -3.391427444038192e+04, -3.470297455675027e+04, -3.54916796875e+04, -3.628038481824972e+04, -3.706908884084325e+04, -3.785779397163191e+04, -3.864649408800027e+04, -3.943519921875e+04]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
index 10944bb9a5..ae201e8ba2 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_SolarCollectors_Examples_FlatPlateWithTank.txt
@@ -1,13 +1,13 @@
-last-generated=2022-11-08
+last-generated=2024-09-11
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "27",
+  "number of continuous time states": "26",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-solCol.vol[9].T=[2.931499938964844e+02, 2.900629272460938e+02, 2.877203979492188e+02, 2.859428100585938e+02, 2.845939331054688e+02, 2.835704040527344e+02, 2.827937316894531e+02, 2.822043762207031e+02, 2.817571411132812e+02, 2.814163513183594e+02, 2.8114208984375e+02, 2.809026794433594e+02, 2.806832885742188e+02, 2.804817199707031e+02, 2.802967529296875e+02, 2.801225891113281e+02, 2.79954833984375e+02, 2.797897644042969e+02, 2.796004638671875e+02, 2.793493041992188e+02, 2.79038330078125e+02, 2.787031860351562e+02, 2.783942565917969e+02, 2.781409301757812e+02, 2.779561157226562e+02, 2.778418273925781e+02, 2.778038330078125e+02, 2.778733520507812e+02, 2.780486755371094e+02, 2.782908935546875e+02, 2.785687866210938e+02, 2.78858642578125e+02, 2.792615051269531e+02, 2.805138854980469e+02, 2.835814208984375e+02, 2.882759399414062e+02, 2.940949401855469e+02, 3.004354248046875e+02, 3.060648803710938e+02, 3.110046081542969e+02, 3.154242553710938e+02, 3.194291076660156e+02, 3.230775146484375e+02, 3.263189392089844e+02, 3.290465698242188e+02, 3.311254577636719e+02, 3.325139465332031e+02, 3.331651000976562e+02, 3.337565002441406e+02, 3.345018920898438e+02, 3.353103637695312e+02, 3.361017456054688e+02, 3.368486022949219e+02, 3.375422058105469e+02, 3.381776428222656e+02, 3.387407836914062e+02, 3.3920849609375e+02, 3.396051025390625e+02, 3.402178344726562e+02, 3.410386962890625e+02, 3.419458312988281e+02, 3.422506408691406e+02, 3.413891906738281e+02, 3.391668090820312e+02, 3.3592578125e+02, 3.319978942871094e+02, 3.265749816894531e+02, 3.191446533203125e+02, 3.125486755371093e+02, 3.063607177734376e+02, 3.011817321777344e+02, 2.971195983886719e+02, 2.9400732421875e+02, 2.916497192382812e+02, 2.898714599609375e+02, 2.885225830078125e+02, 2.874781188964844e+02, 2.866558227539062e+02, 2.860004272460938e+02, 2.85473876953125e+02, 2.85052978515625e+02, 2.847308044433594e+02, 2.844947509765625e+02, 2.843211975097656e+02, 2.841745910644531e+02, 2.839880065917969e+02, 2.837235107421875e+02, 2.833993835449219e+02, 2.830771179199219e+02, 2.82839111328125e+02, 2.827196044921875e+02, 2.826866760253906e+02, 2.826582946777344e+02, 2.825627746582031e+02, 2.82395263671875e+02, 2.82167724609375e+02, 2.819009704589844e+02, 2.816179504394531e+02, 2.813319702148438e+02, 2.810522766113281e+02, 2.807857055664062e+02]
-tan.vol[1].T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.931499328613281e+02, 2.931620483398438e+02, 2.93262939453125e+02, 2.934447326660156e+02, 2.936917724609375e+02, 2.939987182617188e+02, 2.943608093261719e+02, 2.947727355957031e+02, 2.952274780273438e+02, 2.957154541015625e+02, 2.962251892089844e+02, 2.967441101074219e+02, 2.972650146484375e+02, 2.977891540527344e+02, 2.983185424804688e+02, 2.988533935546875e+02, 2.993930969238281e+02, 2.999367370605469e+02, 3.004832763671875e+02, 3.010315551757812e+02, 3.015801086425781e+02, 3.021272277832031e+02, 3.026738891601562e+02, 3.032244567871094e+02, 3.037817077636719e+02, 3.043416442871094e+02, 3.048887023925781e+02, 3.054004516601562e+02, 3.058567199707031e+02, 3.062453002929688e+02, 3.065537414550781e+02, 3.067567138671875e+02, 3.068155822753906e+02, 3.068081970214844e+02, 3.068006591796875e+02, 3.067930297851562e+02, 3.067853698730469e+02, 3.067776489257812e+02, 3.067698974609375e+02, 3.067620544433594e+02, 3.067542114257812e+02, 3.067462768554688e+02, 3.067383117675781e+02, 3.067303161621094e+02, 3.067222290039062e+02, 3.06714111328125e+02, 3.067059631347656e+02, 3.0669775390625e+02, 3.066895141601562e+02, 3.066812133789062e+02, 3.066728515625e+02, 3.066644592285156e+02, 3.06656005859375e+02, 3.066475219726562e+02, 3.066390075683594e+02, 3.066304321289062e+02, 3.066217956542969e+02, 3.066131286621094e+02, 3.066044311523438e+02, 3.065956726074219e+02, 3.065868530273438e+02, 3.065780334472656e+02, 3.065691528320312e+02, 3.065602111816406e+02, 3.065512390136719e+02]
-TIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.839380187988281e+02, 2.884224243164062e+02, 2.937932739257812e+02, 2.977874145507812e+02, 3.010062561035156e+02, 3.036961059570312e+02, 3.060345764160156e+02, 3.081170043945312e+02, 3.099974060058594e+02, 3.116703186035156e+02, 3.131018676757812e+02, 3.142438049316406e+02, 3.150852966308594e+02, 3.156084594726562e+02, 3.161047058105469e+02, 3.166689147949219e+02, 3.172629089355469e+02, 3.178521118164062e+02, 3.184245910644531e+02, 3.189764404296875e+02, 3.195054321289062e+02, 3.2000537109375e+02, 3.204661865234375e+02, 3.20896728515625e+02, 3.214170227050781e+02, 3.220265502929688e+02, 3.226753845214844e+02, 3.230802001953125e+02, 3.229997253417969e+02, 3.22328857421875e+02, 3.211746215820312e+02, 3.196449279785156e+02, 3.173287963867188e+02, 3.138272705078125e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02, 3.109995727539062e+02]
+solCol.vol[9].T=[2.931499938964844e+02, 2.900629272460938e+02, 2.877203979492188e+02, 2.859428100585938e+02, 2.845939636230469e+02, 2.835704040527344e+02, 2.827937316894531e+02, 2.822043762207031e+02, 2.817571411132812e+02, 2.814163818359375e+02, 2.811421508789062e+02, 2.809027099609375e+02, 2.806833190917969e+02, 2.804817199707031e+02, 2.802967529296875e+02, 2.801225891113281e+02, 2.79954833984375e+02, 2.797897644042969e+02, 2.796004638671875e+02, 2.793493041992188e+02, 2.79038330078125e+02, 2.787031555175781e+02, 2.783942565917969e+02, 2.781408996582031e+02, 2.779561157226562e+02, 2.778418273925781e+02, 2.778038330078125e+02, 2.778733215332031e+02, 2.780486755371094e+02, 2.782904357910156e+02, 2.785363159179688e+02, 2.787610778808594e+02, 2.791799011230469e+02, 2.80542236328125e+02, 2.837084350585938e+02, 2.883846130371094e+02, 2.941502990722656e+02, 3.004484252929688e+02, 3.060688171386719e+02, 3.110108947753906e+02, 3.154287414550781e+02, 3.194315490722656e+02, 3.230828857421875e+02, 3.263236389160156e+02, 3.290491333007812e+02, 3.311295471191406e+02, 3.325180969238281e+02, 3.331680603027344e+02, 3.337601928710938e+02, 3.345064392089844e+02, 3.353147583007812e+02, 3.361058044433594e+02, 3.368529357910156e+02, 3.375470275878906e+02, 3.381827087402344e+02, 3.387459716796875e+02, 3.392138366699219e+02, 3.396104431152344e+02, 3.402226257324219e+02, 3.410429382324219e+02, 3.419505004882812e+02, 3.422555847167969e+02, 3.413929443359375e+02, 3.391701049804688e+02, 3.359303283691406e+02, 3.320021362304688e+02, 3.265783081054688e+02, 3.191483459472656e+02, 3.125220642089843e+02, 3.063405456542969e+02, 3.011663818359376e+02, 2.971079711914062e+02, 2.939985046386719e+02, 2.916430358886719e+02, 2.898663940429688e+02, 2.885187377929688e+02, 2.874752197265625e+02, 2.866536254882812e+02, 2.859987487792969e+02, 2.854726257324219e+02, 2.85052001953125e+02, 2.847300720214844e+02, 2.844941711425781e+02, 2.843207702636719e+02, 2.841742248535156e+02, 2.839877014160156e+02, 2.837232971191406e+02, 2.833992614746094e+02, 2.830769958496094e+02, 2.828390502929688e+02, 2.827195434570312e+02, 2.826866455078125e+02, 2.826582336425781e+02, 2.82562744140625e+02, 2.823952331542969e+02, 2.821676940917969e+02, 2.819009704589844e+02, 2.81617919921875e+02, 2.813319702148438e+02, 2.810522766113281e+02, 2.807856750488281e+02]
+tan.vol[1].T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.931499328613281e+02, 2.931627502441406e+02, 2.932638854980469e+02, 2.934457397460938e+02, 2.936928405761719e+02, 2.939998168945312e+02, 2.943619384765625e+02, 2.947739562988281e+02, 2.952287292480469e+02, 2.957167358398438e+02, 2.962265319824219e+02, 2.967454833984375e+02, 2.972664489746094e+02, 2.977906188964844e+02, 2.983200378417969e+02, 2.988549499511719e+02, 2.993947143554688e+02, 2.999383850097656e+02, 3.004849853515625e+02, 3.010333251953125e+02, 3.015819702148438e+02, 3.02129150390625e+02, 3.026758422851562e+02, 3.032264709472656e+02, 3.037837524414062e+02, 3.0434375e+02, 3.048908386230469e+02, 3.054026184082031e+02, 3.058589172363281e+02, 3.0624755859375e+02, 3.065560302734375e+02, 3.067590026855469e+02, 3.068187255859375e+02, 3.068113403320312e+02, 3.068038024902344e+02, 3.067961730957031e+02, 3.067885131835938e+02, 3.067807922363281e+02, 3.067730102539062e+02, 3.067651977539062e+02, 3.0675732421875e+02, 3.067494201660156e+02, 3.06741455078125e+02, 3.067334289550781e+02, 3.067253723144531e+02, 3.067172546386719e+02, 3.067090759277344e+02, 3.067008666992188e+02, 3.06692626953125e+02, 3.06684326171875e+02, 3.066759643554688e+02, 3.066675720214844e+02, 3.066591186523438e+02, 3.06650634765625e+02, 3.066421203613281e+02, 3.06633544921875e+02, 3.066249084472656e+02, 3.066162414550781e+02, 3.066075134277344e+02, 3.065987548828125e+02, 3.065899658203125e+02, 3.065811157226562e+02, 3.065722351074219e+02, 3.065633239746094e+02, 3.065543518066406e+02]
+TIn.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.840592651367188e+02, 2.885270690917969e+02, 2.938324584960938e+02, 2.977955627441406e+02, 3.010087280273438e+02, 3.036997680664062e+02, 3.060372924804688e+02, 3.081186218261719e+02, 3.100004272460938e+02, 3.116730041503906e+02, 3.131035766601562e+02, 3.142461853027344e+02, 3.150877075195312e+02, 3.156103820800781e+02, 3.1610693359375e+02, 3.166715393066406e+02, 3.172655029296875e+02, 3.178545532226562e+02, 3.184271850585938e+02, 3.18979248046875e+02, 3.195083923339844e+02, 3.200083923339844e+02, 3.204692993164062e+02, 3.2089990234375e+02, 3.214199523925781e+02, 3.22029296875e+02, 3.226783142089844e+02, 3.230832824707031e+02, 3.230023803710938e+02, 3.223313293457031e+02, 3.211776428222656e+02, 3.196479187011719e+02, 3.173314514160156e+02, 3.138302001953125e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02, 3.107058715820312e+02]
 pumCon.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos b/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
index c314b2e090..1c99575d2e 100644
--- a/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
+++ b/IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
@@ -5,6 +5,50 @@ clear
 
 convertClear();
 
+// Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1926
+convertModifiers("IBPSA.Fluid.Movers.FlowControlled_dp",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+convertModifiers("IBPSA.Fluid.Movers.FlowControlled_m_flow",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+convertModifiers("IBPSA.Fluid.Movers.SpeedControlled_y",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+convertModifiers("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+convertModifiers("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+convertModifiers("IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y",
+                 {"use_inputFilter"}, {"use_riseTime"}, true);
+
+convertModifiers("IBPSA.Fluid.Actuators.Dampers.Exponential",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Dampers.MixingBox",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Dampers.MixingBoxMinimumFlow",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Dampers.PressureIndependent",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayTable",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayButterfly",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayLinear",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayPolynomial",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayPressureIndependent",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayQuickOpening",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayTable",
+                 {"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
+
+
 // Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1885
 convertModifiers("IBPSA.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield",
                 {"dynFil"}, fill("",0), true);
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
index 0203618e90..124736cb85 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mos
@@ -1,2 +1,2 @@
 simulateModel("IBPSA.Fluid.Actuators.Valves.Validation.ThreeWayValveParameterization", method="CVode", tolerance=1e-06, resultFile="ThreeWayValveParameterization");
-createPlot(id=1, position={37, 30, 958, 513}, y={"senM_flowOpPoi.m_flow", "senM_flowKv.m_flow", "senM_flowCv.m_flow", "senM_flowAv.m_flow"}, range={0.0, 1.0, 0.18, 0.44}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={37, 30, 958, 513}, y={"senMasFloOpPoi.m_flow", "senMasFloKv.m_flow", "senMasFloCv.m_flow", "senMasFloAv.m_flow"}, range={0.0, 1.0, 0.18, 0.44}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
index 50144f8bb7..891c578f31 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mos
@@ -1,2 +1,2 @@
 simulateModel("IBPSA.Fluid.Actuators.Valves.Validation.TwoWayValveParameterization", method="CVode", tolerance=1e-6, stopTime=1.0, resultFile="TwoWayValveParameterization");
-createPlot(id=1, position={15, 10, 873, 609}, y={"valOPPoi.m_flow", "valKv.m_flow", "valCv.m_flow", "valAv.m_flow"}, range={0.0, 1.0, -0.05, 0.45}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={15, 10, 873, 609}, y={"valOpePoi.m_flow", "valKv.m_flow", "valCv.m_flow", "valAv.m_flow"}, range={0.0, 1.0, -0.05, 0.45}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
index 73ce0341ce..2473e25027 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
@@ -1,5 +1,5 @@
 simulateModel("IBPSA.Fluid.Sensors.Examples.EnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EnthalpyFlowRate");
-createPlot(id=5, position={15, 13, 1032, 1035}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
+createPlot(id=5, position={15, 13, 1032, 1035}, y={"senMasFlo.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1032, 256}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 70000.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1032, 255}, y={"senH_flow.H_flow"}, range={0.0, 62.0, -80000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1032, 256}, y={"cheEqu.y"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, subPlot=4, colors={{28,108,200}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
index de3e9ddf34..927bee4f74 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
@@ -1,7 +1,7 @@
 simulateModel("IBPSA.Fluid.Sensors.Examples.EntropyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="EntropyFlowRate");
 createPlot(id = 5,
  position = {15, 13, 645, 498},
- y = {"senM_flow.m_flow"},
+ y = {"senMasFlo.m_flow"},
  range = {0, 1, 2, (-2.0)},
  autoscale = true,
  autoerase = true,
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
index 5f5b6d90d2..773d958b80 100644
--- a/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
+++ b/IBPSA/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
@@ -1,5 +1,5 @@
 simulateModel("IBPSA.Fluid.Sensors.Examples.MoistAirEnthalpyFlowRate", method="CVode", tolerance=1e-6, stopTime=60, resultFile="MoistAirEnthalpyFlowRate");
-createPlot(id=5, position={15, 13, 1175, 1116}, y={"senM_flow.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
+createPlot(id=5, position={15, 13, 1175, 1116}, y={"senMasFlo.m_flow"}, range={0.0, 62.0, -1.5, 1.5}, grid=true, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1175, 276}, y={"senH.h_out"}, range={0.0, 62.0, 40000.0, 100000.0}, grid=true, subPlot=2, colors={{28,108,200}});
 createPlot(id=5, position={15, 13, 1175, 276}, y={"senH_flow.H_flow", "senHSen_flow.H_flow", "senHLat_flow.H_flow"}, range={0.0, 62.0, -100000.0, 60000.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=5, position={15, 13, 1175, 276}, y={"senH_flow.H_flow", "pro.y", "add.y"}, range={0.0, 62.0, -100000.0, 60000.0}, grid=true, subPlot=4, colors={{28,108,200}, {238,46,47}, {0,140,72}});