From f4fac7b5e0d0d79c133e10b3bb81eaa2981b3331 Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Mon, 13 May 2024 10:22:38 +0200
Subject: [PATCH 01/12] group safety control parameters according to dialog
 enable

---
 .../ModularReversible/Controls/Safety/Data/Generic.mo | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
index 15df85ee00..66fbcc164d 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
@@ -7,6 +7,11 @@ record Generic "Generic record definition for safety control blocks"
   parameter Modelica.Units.SI.Time minOnTime
     "Mimimum on-time" annotation (Dialog(group=
           "On/Off Control", enable=use_minOnTime));
+  parameter Real ySetRed(unit="1")
+    "Reduced relative compressor speed to allow longer on-time"
+        annotation (
+          Dialog(group="On/Off Control",
+          enable=use_minOnTime));
   parameter Boolean use_minOffTime
     "=false to ignore minimum off time"
     annotation (Dialog(group="On/Off Control"),
@@ -21,11 +26,7 @@ record Generic "Generic record definition for safety control blocks"
   parameter Integer maxCycRat "Maximum cycle rate"
     annotation (Dialog(group="On/Off Control",
     enable=use_maxCycRat));
-  parameter Real ySetRed(unit="1")
-    "Reduced relative compressor speed to allow longer on-time"
-        annotation (
-          Dialog(group="On/Off Control",
-          enable=use_minOnTime));
+
   parameter Boolean onOffMea_start=true
     "Start value for the on-off signal of the device, true for on"
     annotation (

From 1bb7734235850e99036d75f1847767763d98b49e Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Mon, 13 May 2024 10:26:48 +0200
Subject: [PATCH 02/12] add name to contributor list

---
 IBPSA/package.mo | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IBPSA/package.mo b/IBPSA/package.mo
index e776a051d5..e349000bd7 100644
--- a/IBPSA/package.mo
+++ b/IBPSA/package.mo
@@ -333,6 +333,9 @@ Kathryn Hinkelman, University of Colorado Boulder, USA
 <li>
 Michael Wetter, Lawrence Berkeley National Laboratory, Berkeley, CA, USA
 </li>
+<li>
+Fabian Wuellhorst, RWTH Aachen University, Germany
+</li>
 </ul>
 </html>"));
   end Acknowledgements;

From b4fd3e8a9419bbcb55d1c95c30e9012ed19f6218 Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Mon, 13 May 2024 10:28:34 +0200
Subject: [PATCH 03/12] Change over- to undersizing and update documentation of
 the example

---
 .../Examples/AirToWater2D_OneRoomRadiator.mo    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index a03b6a0674..2300507740 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -21,7 +21,7 @@ model AirToWater2D_OneRoomRadiator
     dpCon_nominal(displayUnit="Pa") = 2000,
     dpEva_nominal(displayUnit="Pa") = 200,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    QCoo_flow_nominal=-20000,
+    QCoo_flow_nominal=-10000,
     TConHea_nominal=rad.TRad_nominal,
     TEvaHea_nominal=283.15,
     TConCoo_nominal=oneRooRadHeaPumCtr.TRadMinSup,
@@ -87,6 +87,16 @@ equation
   heat pump model. Please check the associated documentation for
   further information.
 </p>
+<p>
+  Furthermore, this example is useful to understand the different sizing options.
+  The selected value of <code>QCoo_flow_nominal</code> leads to
+  conflicting scaling factors for heating and cooling operation. This triggers a warning.
+  Using the default <code>QCoo_flow_nominal</code>, the warning disappears. 
+  Increasing (or decreasing) it, the number of on-off switches will increase (or decrease)
+  in cooling operation due to the low inertia of the system. 
+  In real air-to-water systems, thermal energy storage would be used to 
+  decrease cycling if the device is oversized.
+</p>  
 <p>
   Please check the documentation of
   <a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator\">
@@ -95,6 +105,11 @@ equation
 </p>
 </html>", revisions="<html>
 <ul>
+<li>
+  <i>May 5, 2024</i> by Fabian Wuellhorst:<br/>
+  Updated documentation and changed default value (see issue <a href=
+  \"https://github.com/ibpsa/modelica-ibpsa/issues/1876\">#1576</a>)
+</li>
 <li>
   <i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
   First implementation (see issue <a href=

From 23166aec556bbee839adcdfb26ebfd92768bbe3b Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Wed, 15 May 2024 08:22:22 +0200
Subject: [PATCH 04/12] remove scaling warning and enable minimal off time as
 usual in heat pumps

---
 .../Examples/AirToWater2D_OneRoomRadiator.mo       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index 2300507740..015d0f4f2a 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -21,7 +21,6 @@ model AirToWater2D_OneRoomRadiator
     dpCon_nominal(displayUnit="Pa") = 2000,
     dpEva_nominal(displayUnit="Pa") = 200,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    QCoo_flow_nominal=-10000,
     TConHea_nominal=rad.TRad_nominal,
     TEvaHea_nominal=283.15,
     TConCoo_nominal=oneRooRadHeaPumCtr.TRadMinSup,
@@ -35,7 +34,8 @@ model AirToWater2D_OneRoomRadiator
     redeclare
       IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021
       safCtrPar(
-      use_minOnTime=false,
+      use_minOnTime=true,
+      minOnTime=300,
       use_minOffTime=true,
       minOffTime=300,
       use_maxCycRat=true)) "Reversible heat pump based on 2D table data"
@@ -87,16 +87,6 @@ equation
   heat pump model. Please check the associated documentation for
   further information.
 </p>
-<p>
-  Furthermore, this example is useful to understand the different sizing options.
-  The selected value of <code>QCoo_flow_nominal</code> leads to
-  conflicting scaling factors for heating and cooling operation. This triggers a warning.
-  Using the default <code>QCoo_flow_nominal</code>, the warning disappears. 
-  Increasing (or decreasing) it, the number of on-off switches will increase (or decrease)
-  in cooling operation due to the low inertia of the system. 
-  In real air-to-water systems, thermal energy storage would be used to 
-  decrease cycling if the device is oversized.
-</p>  
 <p>
   Please check the documentation of
   <a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator\">

From a193f8899388f6204fe8646899161a8c8b066714 Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Wed, 15 May 2024 08:50:49 +0200
Subject: [PATCH 05/12] use better start value, full path

---
 .../Examples/BaseClasses/PartialOneRoomRadiator.mo        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index c10fc9b0f1..34eac632aa 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -71,11 +71,11 @@ partial model PartialOneRoomRadiator
 
 //----------------------------------------------------------------------------//
 
-  Movers.FlowControlled_m_flow pumHeaPum(
+  IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
     redeclare package Medium = MediumWat,
     nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mCon_flow_nominal,
-    m_flow_start=0.85,
+    m_flow_start=mCon_flow_nominal,
     T_start=TRadSup_nominal,
     use_inputFilter=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
@@ -109,9 +109,9 @@ partial model PartialOneRoomRadiator
 
 //--------------------------------------------------------------------------------------//
 
-  Movers.FlowControlled_m_flow pumHeaPumSou(
+  IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPumSou(
     redeclare package Medium = MediumWat,
-    m_flow_start=0.85,
+    m_flow_start=mEva_flow_nominal,
     m_flow_nominal=mEva_flow_nominal,
     use_inputFilter=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)

From 2de18c220020abccd139684f845d2b41c201e7bd Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Wed, 15 May 2024 08:51:26 +0200
Subject: [PATCH 06/12] Specify mover data in all examples to avoid warnings

---
 .../Examples/AirToWater2D_OneRoomRadiator.mo               | 7 +++++--
 .../Examples/CarnotWithLosses_OneRoomRadiator.mo           | 6 +++++-
 .../ModularReversible/Examples/Modular_OneRoomRadiator.mo  | 7 +++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index 015d0f4f2a..7a8a2eb9f9 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -7,9 +7,12 @@ model AirToWater2D_OneRoomRadiator
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPumSou(redeclare package Medium = MediumAir),
+    pumHeaPumSou(redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+                 redeclare package Medium = MediumAir),
     sou(use_T_in=true,
-        redeclare package Medium = MediumAir));
+        redeclare package Medium = MediumAir),
+    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
+        per));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D
     heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
index 72813dfcc0..4205274c0c 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
@@ -5,7 +5,11 @@ model CarnotWithLosses_OneRoomRadiator
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1),
-    booToReaPumEva(realTrue=heaPum.mEva_flow_nominal));
+    booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
+    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
+        per),
+    pumHeaPumSou(redeclare
+        IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
   extends Modelica.Icons.Example;
 
   parameter Real perHeaLos=0.1
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
index becdab5877..d4df408754 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
@@ -5,9 +5,12 @@ model Modular_OneRoomRadiator
     IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator(
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
-    pumHeaPumSou(redeclare package Medium = MediumAir),
+    pumHeaPumSou(redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+                 redeclare package Medium = MediumAir),
     sou(redeclare package Medium = MediumAir),
-    booToReaPumEva(realTrue=heaPum.mEva_flow_nominal));
+    booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
+    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
+        per));
   extends Modelica.Icons.Example;
 
   IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum(

From 8e28bb4c73a35edd36917625dc4f9d7ae87609b7 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 15 May 2024 06:14:58 -0700
Subject: [PATCH 07/12] Reformatted files

---
 .../Examples/AirToWater2D_OneRoomRadiator.mo  | 11 +++++-----
 .../BaseClasses/PartialOneRoomRadiator.mo     |  9 ++++----
 .../CarnotWithLosses_OneRoomRadiator.mo       | 13 +++++------
 .../Examples/Modular_OneRoomRadiator.mo       | 22 +++++++++----------
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index 7a8a2eb9f9..a60ddd5dd0 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -7,12 +7,13 @@ model AirToWater2D_OneRoomRadiator
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPumSou(redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
-                 redeclare package Medium = MediumAir),
+    pumHeaPumSou(
+      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      redeclare package Medium = MediumAir),
     sou(use_T_in=true,
-        redeclare package Medium = MediumAir),
-    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
-        per));
+      redeclare package Medium = MediumAir),
+    pumHeaPum(
+      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D
     heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index 34eac632aa..1f90e489d2 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -97,8 +97,8 @@ partial model PartialOneRoomRadiator
 //------------------------------------------------------------------------------------//
 
   IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
-        Modelica.Utilities.Files.loadResource(
-        "modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
+    Modelica.Utilities.Files.loadResource(
+      "modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
     "Weather data reader"
     annotation (Placement(transformation(extent={{-220,40},{-200,60}})));
   IBPSA.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
@@ -119,8 +119,9 @@ partial model PartialOneRoomRadiator
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-30,-180})));
-  Modelica.Blocks.Math.BooleanToReal booToReaPumCon(realTrue=mCon_flow_nominal,
-      y(start=0)) "Pump signal" annotation (Placement(transformation(
+  Modelica.Blocks.Math.BooleanToReal booToReaPumCon(
+    realTrue=mCon_flow_nominal,
+    y(start=0)) "Pump signal" annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=180,
         origin={-110,-110})));
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
index 4205274c0c..409d97549f 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
@@ -6,10 +6,10 @@ model CarnotWithLosses_OneRoomRadiator
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
-        per),
-    pumHeaPumSou(redeclare
-        IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPum(
+      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per),
+    pumHeaPumSou(
+      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
   extends Modelica.Icons.Example;
 
   parameter Real perHeaLos=0.1
@@ -35,10 +35,9 @@ model CarnotWithLosses_OneRoomRadiator
     TConCoo_nominal=oneRooRadHeaPumCtr.TRadMinSup,
     TEvaCoo_nominal=sou.T + 10,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    redeclare IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021
-      safCtrPar,
+    redeclare IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 safCtrPar,
     etaCarnot_nominal=0.4)
-              "Reversible heat pump with losses and Carnot approach"
+      "Reversible heat pump with losses and Carnot approach"
     annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
   Modelica.Blocks.Sources.Constant temAmbBas(final k(
       final unit="K",
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
index d4df408754..fd7453a9a0 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
@@ -5,12 +5,13 @@ model Modular_OneRoomRadiator
     IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator(
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
-    pumHeaPumSou(redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
-                 redeclare package Medium = MediumAir),
+    pumHeaPumSou(
+      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      redeclare package Medium = MediumAir),
     sou(redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6
-        per));
+    pumHeaPum(
+      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
   extends Modelica.Icons.Example;
 
   IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum(
@@ -37,32 +38,31 @@ model Modular_OneRoomRadiator
     use_evaCap=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     redeclare model RefrigerantCycleHeatPumpHeating =
-        IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.ConstantCarnotEffectiveness
-        (
+      IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.ConstantCarnotEffectiveness(
         redeclare
           IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Frosting.NoFrosting
           iceFacCal,
         TAppCon_nominal=0,
         TAppEva_nominal=0),
     redeclare model RefrigerantCycleHeatPumpCooling =
-        IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D (
+      IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D(
         redeclare
           IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Frosting.NoFrosting
           iceFacCal,
         mCon_flow_nominal=heaPum.mCon_flow_nominal,
         mEva_flow_nominal=heaPum.mEva_flow_nominal,
         datTab=IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08()),
-    redeclare IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021
-      safCtrPar(
+    redeclare IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 safCtrPar(
       use_TConOutHea=true,
       use_TEvaOutHea=false,
       use_antFre=true,
       TAntFre=275.15),
     QCoo_flow_nominal=-Q_flow_nominal*0.5)
-                       "Modular reversible heat pump"
+      "Modular reversible heat pump"
     annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
 
-  Modelica.Blocks.Sources.Constant temAmbBas(final k(
+  Modelica.Blocks.Sources.Constant temAmbBas(
+    final k(
       final unit="K",
       displayUnit="degC") = 291.15)
     "Ambient temperature in basement of building" annotation (Placement(

From ee37aea8e5754005db91eedb7b8336b6bbc8b29b Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Wed, 15 May 2024 16:06:16 +0200
Subject: [PATCH 08/12] update conservative default to 1 %

---
 .../Examples/CarnotWithLosses_OneRoomRadiator.mo                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
index 409d97549f..0dbf085a45 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
@@ -12,7 +12,7 @@ model CarnotWithLosses_OneRoomRadiator
       redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
   extends Modelica.Icons.Example;
 
-  parameter Real perHeaLos=0.1
+  parameter Real perHeaLos=0.01
     "Percentage of heat losses in the heat exchangers to the nominal heating output";
   IBPSA.Fluid.HeatPumps.ModularReversible.CarnotWithLosses heaPum(
     redeclare package MediumCon = MediumWat,

From e7c2d92310fd84444d6abdc19e3c44b5ebbbbaeb Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Thu, 16 May 2024 07:57:14 +0200
Subject: [PATCH 09/12] make movers replaceable, use preconfigured movers in
 all but LargeScaleWaterToWater_OneRoomRadiator.mo, add better dp_nominal

---
 .../Examples/AirToWater2D_OneRoomRadiator.mo  |  5 ++-
 .../BaseClasses/PartialOneRoomRadiator.mo     | 33 ++++++++++---------
 .../CarnotWithLosses_OneRoomRadiator.mo       |  6 ++--
 .../LargeScaleWaterToWater_OneRoomRadiator.mo |  4 +--
 .../Examples/Modular_OneRoomRadiator.mo       |  5 ++-
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index a60ddd5dd0..7ee93245fd 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -8,12 +8,11 @@ model AirToWater2D_OneRoomRadiator
     sin(nPorts=1, redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
     pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      dp_nominal=heaPum.dpEva_nominal,
       redeclare package Medium = MediumAir),
     sou(use_T_in=true,
       redeclare package Medium = MediumAir),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D
     heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index 1f90e489d2..0453fbe4bc 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -71,18 +71,18 @@ partial model PartialOneRoomRadiator
 
 //----------------------------------------------------------------------------//
 
-  IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
-    redeclare package Medium = MediumWat,
-    nominalValuesDefineDefaultPressureCurve=true,
-    m_flow_nominal=mCon_flow_nominal,
-    m_flow_start=mCon_flow_nominal,
-    T_start=TRadSup_nominal,
-    use_inputFilter=false,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPum
+    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
+      redeclare package Medium = MediumWat,
+      m_flow_nominal=mCon_flow_nominal,
+      m_flow_start=mCon_flow_nominal,
+      T_start=TRadSup_nominal,
+      use_inputFilter=false,
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-70,-110})));
+        origin={-70,-110})), choicesAllMatching=true);
 //----------------------------------------------------------------------------//
 
   IBPSA.Fluid.Sensors.TemperatureTwoPort temRet(
@@ -109,16 +109,17 @@ partial model PartialOneRoomRadiator
 
 //--------------------------------------------------------------------------------------//
 
-  IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPumSou(
-    redeclare package Medium = MediumWat,
-    m_flow_start=mEva_flow_nominal,
-    m_flow_nominal=mEva_flow_nominal,
-    use_inputFilter=false,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPumSou
+    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
+      redeclare package Medium = MediumWat,
+      m_flow_start=mEva_flow_nominal,
+      m_flow_nominal=mEva_flow_nominal,
+      use_inputFilter=false,
+      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-30,-180})));
+        origin={-30,-180})), choicesAllMatching=true);
   Modelica.Blocks.Math.BooleanToReal booToReaPumCon(
     realTrue=mCon_flow_nominal,
     y(start=0)) "Pump signal" annotation (Placement(transformation(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
index 0dbf085a45..21ad2f4051 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
@@ -6,10 +6,8 @@ model CarnotWithLosses_OneRoomRadiator
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per),
-    pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPumSou(dp_nominal=heaPum.dpEva_nominal),
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
   extends Modelica.Icons.Example;
 
   parameter Real perHeaLos=0.01
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
index acb5244586..ef7172d75f 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
@@ -11,9 +11,9 @@ model LargeScaleWaterToWater_OneRoomRadiator
     Q_flow_nominal=200000,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
+    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPumSou(
       redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per),
-    pumHeaPumSou(
+    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
       redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.LargeScaleWaterToWater heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
index fd7453a9a0..008edc1107 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
@@ -6,12 +6,11 @@ model Modular_OneRoomRadiator
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
     pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      dp_nominal=heaPum.dpEva_nominal,
       redeclare package Medium = MediumAir),
     sou(redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
   extends Modelica.Icons.Example;
 
   IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum(

From 373f68c11e180dbf0885ad0e6139c89e91b36e5e Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Thu, 16 May 2024 08:28:11 +0200
Subject: [PATCH 10/12] remove replaceable again, as preconfigured models work
 without the scaling factor

---
 .../BaseClasses/PartialOneRoomRadiator.mo     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index 0453fbe4bc..a46d8f1b12 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -71,18 +71,17 @@ partial model PartialOneRoomRadiator
 
 //----------------------------------------------------------------------------//
 
-  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPum
-    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
-      redeclare package Medium = MediumWat,
-      m_flow_nominal=mCon_flow_nominal,
-      m_flow_start=mCon_flow_nominal,
-      T_start=TRadSup_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPum(
+    redeclare package Medium = MediumWat,
+    m_flow_nominal=mCon_flow_nominal,
+    m_flow_start=mCon_flow_nominal,
+    T_start=TRadSup_nominal,
+    use_inputFilter=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-70,-110})), choicesAllMatching=true);
+        origin={-70,-110})));
 //----------------------------------------------------------------------------//
 
   IBPSA.Fluid.Sensors.TemperatureTwoPort temRet(
@@ -109,17 +108,16 @@ partial model PartialOneRoomRadiator
 
 //--------------------------------------------------------------------------------------//
 
-  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPumSou
-    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
-      redeclare package Medium = MediumWat,
-      m_flow_start=mEva_flow_nominal,
-      m_flow_nominal=mEva_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPumSou(
+    redeclare package Medium = MediumWat,
+    m_flow_start=mEva_flow_nominal,
+    m_flow_nominal=mEva_flow_nominal,
+    use_inputFilter=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-30,-180})), choicesAllMatching=true);
+        origin={-30,-180})));
   Modelica.Blocks.Math.BooleanToReal booToReaPumCon(
     realTrue=mCon_flow_nominal,
     y(start=0)) "Pump signal" annotation (Placement(transformation(

From 9d3395cc0b1decd66ed84bb4413d8953ad06b0e0 Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Thu, 16 May 2024 08:28:44 +0200
Subject: [PATCH 11/12] Adjust LargeScaleWaterToWater_OneRoomRadiator.mo
 example to trigger cooling operation and change sizing for better cooling
 operation

---
 .../LargeScaleWaterToWater_OneRoomRadiator.mo | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
index ef7172d75f..f914d3e5f3 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
@@ -11,15 +11,15 @@ model LargeScaleWaterToWater_OneRoomRadiator
     Q_flow_nominal=200000,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per),
-    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per));
+    pumHeaPumSou(dp_nominal=150000),
+    pumHeaPum(dp_nominal=150000),
+    sou(use_T_in=true));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.LargeScaleWaterToWater heaPum(
     allowDifferentDeviceIdentifiers=true,
     QHea_flow_nominal=Q_flow_nominal,
     use_intSafCtr=true,
+    QCoo_flow_nominal=-Q_flow_nominal/2,
     TConHea_nominal=TRadSup_nominal,
     dpCon_nominal(displayUnit="Pa"),
     TEvaHea_nominal=sou.T,
@@ -28,7 +28,7 @@ model LargeScaleWaterToWater_OneRoomRadiator
     redeclare IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021
       safCtrPar,
     TConCoo_nominal=oneRooRadHeaPumCtr.TRadMinSup,
-    TEvaCoo_nominal=sou.T + 10,
+    TEvaCoo_nominal=sou.T + 30,
     redeclare
       IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.WAMAK_WaterToWater_220kW
       datTabHea,
@@ -37,6 +37,16 @@ model LargeScaleWaterToWater_OneRoomRadiator
       datTabCoo)
     "Large scale water to water heat pump"
     annotation (Placement(transformation(extent={{20,-160},{0,-140}})));
+  Modelica.Blocks.Sources.Pulse TAirSouSte(
+    amplitude=20,
+    width=10,
+    period=86400,
+    offset=283.15,
+    startTime=86400/2) if witCoo "Air source temperature step for cooling phase"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-150,-200})));
 equation
   connect(heaPum.port_b2, sin.ports[1]) annotation (Line(points={{20,-156},{38,
           -156},{38,-200},{60,-200}},               color={0,127,255}));
@@ -47,11 +57,13 @@ equation
   connect(heaPum.port_a1, temRet.port_b) annotation (Line(points={{20,-144},{60,
           -144},{60,-30}},                color={0,127,255}));
   connect(oneRooRadHeaPumCtr.ySet, heaPum.ySet) annotation (Line(
-        points={{-139.167,-66.6667},{26,-66.6667},{26,-148},{21.2,-148}},
+        points={{-139.167,-66.6667},{26,-66.6667},{26,-148.1},{21.1,-148.1}},
                                                                         color={
           0,0,127}));
   connect(oneRooRadHeaPumCtr.hea, heaPum.hea) annotation (Line(points={{
-          -139.167,-75},{32,-75},{32,-151.9},{21.1,-151.9}}, color={255,0,255}));
+          -139.167,-75},{32,-75},{32,-152.1},{21.1,-152.1}}, color={255,0,255}));
+  connect(TAirSouSte.y, sou.T_in) annotation (Line(points={{-139,-200},{-92,-200},
+          {-92,-196},{-82,-196}}, color={0,0,127}));
   annotation (
      __Dymola_Commands(file=
      "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos"
@@ -76,23 +88,14 @@ equation
 </p>
 <p>
   Furthermore, this example demonstrates the warnings which
-  are raised if the table data boundary conditions
-  (e.g. <code>mEva_flow_nominal</code>) deviates from
-  the parameter in use.
+  are raised if two devices are combined with different sizes, leading
+  to different scaling factors for heating and cooling operation.
+  If the default <code>QCoo_flow_nominal</code> is used (leading to 
+  the same scaling factors), the mass flow rates will differ.
+  Setting the parameter <code>allowDifferentDeviceIdentifiers</code> to false,
+  an additional warning is raised, indicating that the table data for cooling and 
+  heating operation do not originate from the same real device.
 </p>
-<p>
-  To fix this issue, the user has to either
-</p>
-<ol>
-<li>
-Check the assumption of using a different mass flow rate, or
-</li>
-<li>
-adjust the mass flow rates in the hydraulic system.
-If the deviation is too big, the system would also not
-work in reality.
-</li>
-</ol>
 <p>
   Please check the documentation of
   <a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator\">

From 77387b768451df49e7c5c70b49e17542bdc07959 Mon Sep 17 00:00:00 2001
From: "fabian.wuellhorst" <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Thu, 16 May 2024 08:46:29 +0200
Subject: [PATCH 12/12] update reference results

---
 ...sible_Examples_AirToWater2D_OneRoomRadiator.txt | 14 +++++++-------
 ...e_Examples_CarnotWithLosses_OneRoomRadiator.txt | 14 +++++++-------
 ...ples_LargeScaleWaterToWater_OneRoomRadiator.txt | 10 +++++-----
 ...Reversible_Examples_Modular_OneRoomRadiator.txt | 10 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
index bfb896337b..762941580c 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-04-05
+last-generated=2024-05-16
 statistics-initialization=
 {
-  "nonlinear": "5",
+  "nonlinear": "5, 1, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -13,8 +13,8 @@ statistics-simulation=
 }
 time=[0e+00, 8.64e+04]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.926033325195312e+02, 2.872522888183594e+02, 2.843255920410156e+02, 2.830516357421875e+02, 2.830834350585938e+02, 2.840511474609375e+02, 2.855954895019531e+02, 2.874035949707031e+02, 2.892296447753906e+02, 2.909036865234375e+02, 2.923200988769531e+02, 2.934297180175781e+02, 2.942312316894531e+02, 2.94718505859375e+02, 2.949186096191406e+02, 2.948959655761719e+02, 2.947318115234375e+02, 2.945033569335938e+02, 2.942562866210938e+02, 2.940098266601562e+02, 2.937659606933594e+02, 2.935326232910156e+02, 2.933324279785156e+02, 2.931742248535156e+02, 2.930597229003906e+02, 2.929862976074219e+02, 2.92948486328125e+02, 2.929392395019531e+02, 2.929511413574219e+02, 2.929819946289062e+02, 2.9304736328125e+02, 2.931455078125e+02, 2.932619934082031e+02, 2.95337158203125e+02, 2.91863037109375e+02, 2.889075622558594e+02, 2.879933166503906e+02, 2.879576110839844e+02, 2.885299377441406e+02, 2.894993286132812e+02, 2.906561584472656e+02, 2.918134460449219e+02, 2.928501892089844e+02, 2.937132873535156e+02, 2.943753356933594e+02, 2.948340454101562e+02, 2.951058044433594e+02, 2.936390075683594e+02, 2.905563049316406e+02, 2.898985290527344e+02, 2.969421691894531e+02, 2.982145385742188e+02, 2.969007568359375e+02, 2.9586865234375e+02, 2.957721862792969e+02, 2.964328308105469e+02, 2.961033325195312e+02, 2.964817199707031e+02, 2.962136535644531e+02, 2.967939147949219e+02, 2.895108642578125e+02, 2.869914245605469e+02, 2.880871887207031e+02, 2.903818054199219e+02, 2.924213256835938e+02, 2.939820251464844e+02, 2.950420837402344e+02, 2.937520446777344e+02, 2.91023193359375e+02, 2.903825988769531e+02, 2.908605041503906e+02, 2.914776000976562e+02, 2.920478820800781e+02, 2.925188903808594e+02, 2.92880859375e+02, 2.904564514160156e+02, 2.898051452636719e+02, 2.896869506835938e+02, 2.8989697265625e+02, 2.903399658203125e+02, 2.909920654296875e+02, 2.917592468261719e+02, 2.925074157714844e+02, 2.931015014648438e+02, 2.934812316894531e+02, 2.936657104492188e+02, 2.937119140625e+02, 2.936983947753906e+02, 2.93686767578125e+02, 2.936873474121094e+02, 2.936801147460938e+02, 2.936278076171875e+02, 2.935116882324219e+02, 2.93352294921875e+02, 2.931781616210938e+02, 2.9302197265625e+02, 2.929166870117188e+02, 2.928741760253906e+02, 2.928791809082031e+02, 2.929024658203125e+02]
-temSup.T=[3.231499938964844e+02, 3.077750244140625e+02, 3.032532958984375e+02, 3.008515014648438e+02, 3.007150573730469e+02, 3.022294921875e+02, 3.0476806640625e+02, 3.077801818847656e+02, 3.10835205078125e+02, 3.136318664550781e+02, 3.159881591796875e+02, 3.178195190429688e+02, 3.191369934082031e+02, 3.199721069335938e+02, 3.203636474609375e+02, 3.203819274902344e+02, 3.201214599609375e+02, 3.196859130859375e+02, 3.191718139648438e+02, 3.186519775390625e+02, 3.181693115234375e+02, 3.177525634765625e+02, 3.174044189453125e+02, 3.171282043457031e+02, 3.169266357421875e+02, 3.16795654296875e+02, 3.167262878417969e+02, 3.167067565917969e+02, 3.167243347167969e+02, 3.167667236328125e+02, 3.168233337402344e+02, 3.168904418945312e+02, 3.169649658203125e+02, 3.170366821289062e+02, 3.105123291015625e+02, 3.020681457519532e+02, 3.016174926757812e+02, 3.013186340332031e+02, 3.019622497558594e+02, 3.032532348632812e+02, 3.048776245117188e+02, 3.065632934570312e+02, 3.080992431640625e+02, 3.093459167480469e+02, 3.10241943359375e+02, 3.107803039550781e+02, 3.109878234863281e+02, 3.109124145507812e+02, 3.027403259277344e+02, 3.003905029296875e+02, 3.009697875976562e+02, 2.999203796386719e+02, 2.95762939453125e+02, 2.908880920410156e+02, 2.912205505371094e+02, 2.930174255371094e+02, 2.942494812011719e+02, 2.926022338867188e+02, 2.90913330078125e+02, 2.929292907714844e+02, 2.944043884277344e+02, 2.931101379394531e+02, 2.948089904785156e+02, 2.995331726074219e+02, 3.03382568359375e+02, 3.062330017089844e+02, 3.081670837402344e+02, 3.09275390625e+02, 3.014527587890624e+02, 2.991961669921872e+02, 3.005628356933594e+02, 3.01798828125e+02, 3.029331359863281e+02, 3.039216003417969e+02, 3.047164611816406e+02, 3.053066711425781e+02, 3.052481079101562e+02, 3.051769409179688e+02, 3.056052551269531e+02, 3.064048461914062e+02, 3.074102172851562e+02, 3.08495849609375e+02, 3.095609130859375e+02, 3.105038757324219e+02, 3.112375183105469e+02, 3.117138366699219e+02, 3.119453125e+02, 3.119857788085938e+02, 3.119064331054688e+02, 3.117743530273438e+02, 3.116290893554688e+02, 3.114809875488281e+02, 3.113238220214844e+02, 3.111494445800781e+02, 3.10966796875e+02, 3.107968444824219e+02, 3.106620788574219e+02, 3.105809326171875e+02, 3.105616455078125e+02, 3.105956115722656e+02, 3.106625061035156e+02]
-temRet.T=[3.231499938964844e+02, 3.073617553710938e+02, 3.001542053222656e+02, 2.967890014648438e+02, 2.956324462890625e+02, 2.961911315917969e+02, 2.979186706542969e+02, 3.003033142089844e+02, 3.029208984375e+02, 3.054548950195312e+02, 3.076963195800781e+02, 3.09528564453125e+02, 3.109138488769531e+02, 3.1187451171875e+02, 3.124266357421875e+02, 3.126146545410156e+02, 3.125149536132812e+02, 3.12220947265625e+02, 3.118261108398438e+02, 3.114026489257812e+02, 3.1099365234375e+02, 3.1062158203125e+02, 3.102966918945312e+02, 3.100271301269531e+02, 3.098198852539062e+02, 3.096749877929688e+02, 3.095870971679688e+02, 3.095473327636719e+02, 3.095452880859375e+02, 3.095701904296875e+02, 3.096129760742188e+02, 3.096741333007812e+02, 3.097535705566406e+02, 3.098418579101562e+02, 3.103954467773437e+02, 3.018142700195313e+02, 2.985885620117188e+02, 2.977550048828125e+02, 2.97902099609375e+02, 2.987794799804688e+02, 3.001025085449219e+02, 3.016065673828125e+02, 3.030706787109375e+02, 3.043369445800781e+02, 3.053251342773438e+02, 3.060082092285156e+02, 3.063941040039062e+02, 3.065143127441406e+02, 3.02521484375e+02, 2.975261535644531e+02, 2.979172668457031e+02, 2.998483276367188e+02, 2.989877014160156e+02, 2.9360791015625e+02, 2.928910827636719e+02, 2.930652465820312e+02, 2.942861022949219e+02, 2.926826171875e+02, 2.937168884277344e+02, 2.929844055175781e+02, 2.944454956054688e+02, 2.930396118164062e+02, 2.908272705078125e+02, 2.951307983398438e+02, 2.988049621582031e+02, 3.016731262207031e+02, 3.037516784667969e+02, 3.050814819335938e+02, 3.012733459472656e+02, 2.969272766113282e+02, 2.975655822753906e+02, 2.985931701660156e+02, 2.995910034179688e+02, 3.004962463378906e+02, 3.012486572265625e+02, 3.018264465332031e+02, 3.013383178710938e+02, 3.00915283203125e+02, 3.010100708007812e+02, 3.015115356445312e+02, 3.022716979980469e+02, 3.031847229003906e+02, 3.041560363769531e+02, 3.050748291015625e+02, 3.058319702148438e+02, 3.0635595703125e+02, 3.066426391601562e+02, 3.067361450195312e+02, 3.067062683105469e+02, 3.066236572265625e+02, 3.065291137695312e+02, 3.064309387207031e+02, 3.063165893554688e+02, 3.061706237792969e+02, 3.059992370605469e+02, 3.05823486328125e+02, 3.056691589355469e+02, 3.055611572265625e+02, 3.055142517089844e+02, 3.055234375e+02, 3.055684814453125e+02]
-heaPum.refCyc.sigBus.hea=[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, 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, 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, 1e+00, 1e+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, 0e+00, 9.999999999998329e-01, 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]
-heaPum.refCyc.sigBus.onOffMea=[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, 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, 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, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 9.999999999998329e-01, 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]
+vol.T=[2.931499938964844e+02, 2.926033935546875e+02, 2.872524108886719e+02, 2.843258056640625e+02, 2.830519104003906e+02, 2.83083740234375e+02, 2.840514526367188e+02, 2.855957641601562e+02, 2.874038391113281e+02, 2.892298278808594e+02, 2.9090380859375e+02, 2.923201904296875e+02, 2.934297485351562e+02, 2.942312316894531e+02, 2.947184753417969e+02, 2.949185485839844e+02, 2.948959045410156e+02, 2.947317504882812e+02, 2.945032958984375e+02, 2.942562561035156e+02, 2.94009765625e+02, 2.937659301757812e+02, 2.935325927734375e+02, 2.933323974609375e+02, 2.931742248535156e+02, 2.930597534179688e+02, 2.92986328125e+02, 2.92948486328125e+02, 2.929392700195312e+02, 2.929511413574219e+02, 2.929819946289062e+02, 2.930473937988281e+02, 2.931455078125e+02, 2.932619934082031e+02, 2.95337158203125e+02, 2.918630981445312e+02, 2.889076843261719e+02, 2.879935302734375e+02, 2.879578552246094e+02, 2.885302124023438e+02, 2.894996032714844e+02, 2.906563720703125e+02, 2.918136596679688e+02, 2.92850341796875e+02, 2.9371337890625e+02, 2.943753967285156e+02, 2.948340454101562e+02, 2.951057739257812e+02, 2.936395874023438e+02, 2.905567321777344e+02, 2.89898681640625e+02, 2.969423217773438e+02, 2.982201232910156e+02, 2.971582946777344e+02, 2.957817077636719e+02, 2.953205871582031e+02, 2.956290283203125e+02, 2.957839050292969e+02, 2.965179138183594e+02, 2.962041625976562e+02, 2.95908203125e+02, 2.892634582519531e+02, 2.89460693359375e+02, 2.907708435058594e+02, 2.920342102050781e+02, 2.930659790039062e+02, 2.938263244628906e+02, 2.943195190429688e+02, 2.945741271972656e+02, 2.946325073242188e+02, 2.945428771972656e+02, 2.94353271484375e+02, 2.940932312011719e+02, 2.937789611816406e+02, 2.934469909667969e+02, 2.931387634277344e+02, 2.901953430175781e+02, 2.891919250488281e+02, 2.888753662109375e+02, 2.89016357421875e+02, 2.89490478515625e+02, 2.902431030273438e+02, 2.911509704589844e+02, 2.920552978515625e+02, 2.928020324707031e+02, 2.933180541992188e+02, 2.936148681640625e+02, 2.937462768554688e+02, 2.937909240722656e+02, 2.938128662109375e+02, 2.938264465332031e+02, 2.938162841796875e+02, 2.937498474121094e+02, 2.936128234863281e+02, 2.93429443359375e+02, 2.932311706542969e+02, 2.930529174804688e+02, 2.929289855957031e+02, 2.928719787597656e+02, 2.928667297363281e+02, 2.928837585449219e+02]
+temSup.T=[3.231499938964844e+02, 3.077752380371094e+02, 3.03253662109375e+02, 3.008519897460938e+02, 3.00715576171875e+02, 3.0222998046875e+02, 3.047685546875e+02, 3.077805786132812e+02, 3.108355102539062e+02, 3.13632080078125e+02, 3.159883117675781e+02, 3.17819580078125e+02, 3.191369934082031e+02, 3.199720458984375e+02, 3.203635559082031e+02, 3.203818054199219e+02, 3.201213684082031e+02, 3.19685791015625e+02, 3.191717224121094e+02, 3.186518859863281e+02, 3.181692504882812e+02, 3.177525024414062e+02, 3.174043884277344e+02, 3.171282043457031e+02, 3.169266357421875e+02, 3.16795654296875e+02, 3.167262878417969e+02, 3.16706787109375e+02, 3.16724365234375e+02, 3.167667541503906e+02, 3.168233642578125e+02, 3.168904418945312e+02, 3.169649963378906e+02, 3.170367126464844e+02, 3.10512451171875e+02, 3.020683898925782e+02, 3.016178283691406e+02, 3.013190612792969e+02, 3.019627380371094e+02, 3.032537231445312e+02, 3.048780517578125e+02, 3.065636291503906e+02, 3.080995178222656e+02, 3.093460998535156e+02, 3.102420349121094e+02, 3.107803039550781e+02, 3.109878234863281e+02, 3.10912353515625e+02, 3.027415466308594e+02, 3.003910217285156e+02, 3.009700317382812e+02, 2.99920654296875e+02, 2.962229614257812e+02, 2.918811340332031e+02, 2.903460693359375e+02, 2.904966125488284e+02, 2.927999572753906e+02, 2.925941162109375e+02, 2.940507507324219e+02, 2.921875915527344e+02, 2.922546691894531e+02, 2.969202880859375e+02, 3.003319702148438e+02, 3.027405090332031e+02, 3.046290893554688e+02, 3.060162963867188e+02, 3.069207153320312e+02, 3.073948669433594e+02, 3.075143127441406e+02, 3.073647766113281e+02, 3.070321350097656e+02, 3.065950012207031e+02, 3.061189880371094e+02, 3.056504211425781e+02, 3.052276000976562e+02, 3.048838500976562e+02, 3.041906127929688e+02, 3.037576293945312e+02, 3.04055419921875e+02, 3.049043579101562e+02, 3.060833129882812e+02, 3.074143676757812e+02, 3.087528991699219e+02, 3.09964111328125e+02, 3.1093798828125e+02, 3.11613037109375e+02, 3.119960327148438e+02, 3.121408386230469e+02, 3.121227722167969e+02, 3.120157470703125e+02, 3.118672180175781e+02, 3.116957397460938e+02, 3.115028076171875e+02, 3.112868347167969e+02, 3.110620727539062e+02, 3.108533020019531e+02, 3.106856079101562e+02, 3.1057861328125e+02, 3.105409545898438e+02, 3.105635681152344e+02, 3.106251220703125e+02]
+temRet.T=[3.231499938964844e+02, 3.073618774414062e+02, 3.001544189453125e+02, 2.967893676757812e+02, 2.956328735351562e+02, 2.961915893554688e+02, 2.979190979003906e+02, 3.003036804199219e+02, 3.029212036132812e+02, 3.054551391601562e+02, 3.076964721679688e+02, 3.095286560058594e+02, 3.109138488769531e+02, 3.118744812011719e+02, 3.124265747070312e+02, 3.126145935058594e+02, 3.125148620605469e+02, 3.122208557128906e+02, 3.118260192871094e+02, 3.114025573730469e+02, 3.109935913085938e+02, 3.106215515136719e+02, 3.102966613769531e+02, 3.100271301269531e+02, 3.098198852539062e+02, 3.096750183105469e+02, 3.095870971679688e+02, 3.0954736328125e+02, 3.095453186035156e+02, 3.095702209472656e+02, 3.096130065917969e+02, 3.096741333007812e+02, 3.097535705566406e+02, 3.098418579101562e+02, 3.103954467773437e+02, 3.018144226074219e+02, 2.985887756347656e+02, 2.977553405761719e+02, 2.979024963378906e+02, 2.987799072265625e+02, 3.001029052734375e+02, 3.016069030761719e+02, 3.030709228515625e+02, 3.043371276855469e+02, 3.053252563476562e+02, 3.060082702636719e+02, 3.063941040039062e+02, 3.065142822265625e+02, 3.025225830078125e+02, 2.975263671875e+02, 2.9791748046875e+02, 2.998484802246094e+02, 2.99001220703125e+02, 2.942681884765625e+02, 2.923881530761719e+02, 2.918417663574219e+02, 2.928509216308594e+02, 2.926551208496094e+02, 2.940934143066406e+02, 2.9217626953125e+02, 2.923375549316406e+02, 2.936854248046875e+02, 2.966617736816406e+02, 2.988878479003906e+02, 3.007211303710938e+02, 3.021422729492188e+02, 3.031412353515625e+02, 3.037453308105469e+02, 3.040090026855469e+02, 3.040014953613281e+02, 3.037968444824219e+02, 3.034661865234375e+02, 3.030695190429688e+02, 3.026481323242188e+02, 3.022398681640625e+02, 3.018822326660156e+02, 3.0071435546875e+02, 2.998560791015625e+02, 2.997335815429688e+02, 3.001965026855469e+02, 3.010502319335938e+02, 3.021420593261719e+02, 3.033359985351562e+02, 3.044879455566406e+02, 3.054645080566406e+02, 3.061783752441406e+02, 3.06616943359375e+02, 3.068217468261719e+02, 3.068643188476562e+02, 3.0681982421875e+02, 3.067354431152344e+02, 3.066264038085938e+02, 3.064869995117188e+02, 3.063078918457031e+02, 3.061004943847656e+02, 3.058898010253906e+02, 3.057044372558594e+02, 3.055709533691406e+02, 3.055048522949219e+02, 3.055010681152344e+02, 3.055387573242188e+02]
+heaPum.refCyc.sigBus.hea=[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, 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, 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, 1e+00, 1e+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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+heaPum.refCyc.sigBus.onOffMea=[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, 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, 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, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
index 46935450da..14b6894cf5 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-04-15
+last-generated=2024-05-16
 statistics-initialization=
 {
-  "nonlinear": "5",
+  "nonlinear": "5, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -13,8 +13,8 @@ statistics-simulation=
 }
 time=[0e+00, 8.64e+04]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.914292907714844e+02, 2.881525268554688e+02, 2.861549377441406e+02, 2.85569580078125e+02, 2.859130859375e+02, 2.867386169433594e+02, 2.877506103515625e+02, 2.887776794433594e+02, 2.897298583984375e+02, 2.905694885253906e+02, 2.9128369140625e+02, 2.918715515136719e+02, 2.923375854492188e+02, 2.926748657226562e+02, 2.928949584960938e+02, 2.9303271484375e+02, 2.931307373046875e+02, 2.932243041992188e+02, 2.933190612792969e+02, 2.934012451171875e+02, 2.934482421875e+02, 2.934520874023438e+02, 2.934330444335938e+02, 2.934024353027344e+02, 2.933669738769531e+02, 2.933310241699219e+02, 2.932971801757812e+02, 2.932669067382812e+02, 2.932408142089844e+02, 2.932240905761719e+02, 2.932388305664062e+02, 2.93287353515625e+02, 2.933579406738281e+02, 2.95456298828125e+02, 2.921947631835938e+02, 2.893821716308594e+02, 2.893832397460938e+02, 2.900024719238281e+02, 2.908092956542969e+02, 2.916512451171875e+02, 2.924284973144531e+02, 2.930706787109375e+02, 2.935594482421875e+02, 2.939199829101562e+02, 2.941734619140625e+02, 2.94340087890625e+02, 2.944386901855469e+02, 2.944859924316406e+02, 2.944962158203125e+02, 2.944811401367188e+02, 2.999286804199219e+02, 2.979551696777344e+02, 2.938731689453125e+02, 2.942613220214844e+02, 2.951433715820312e+02, 2.959858093261719e+02, 2.967183227539062e+02, 2.97318359375e+02, 2.977644958496094e+02, 2.980919494628906e+02, 2.905216674804688e+02, 2.908216857910156e+02, 2.926947631835938e+02, 2.940179748535156e+02, 2.947525024414062e+02, 2.950532836914062e+02, 2.950900268554688e+02, 2.950737609863281e+02, 2.950588989257812e+02, 2.950487365722656e+02, 2.950419006347656e+02, 2.950226440429688e+02, 2.949675598144531e+02, 2.948807678222656e+02, 2.947794494628906e+02, 2.918869018554688e+02, 2.908958435058594e+02, 2.905484008789062e+02, 2.905599060058594e+02, 2.907955627441406e+02, 2.912239990234375e+02, 2.917580871582031e+02, 2.922785034179688e+02, 2.926702575683594e+02, 2.928947448730469e+02, 2.929875793457031e+02, 2.930104064941406e+02, 2.930346069335938e+02, 2.931054382324219e+02, 2.932125854492188e+02, 2.933177490234375e+02, 2.933715515136719e+02, 2.933501281738281e+02, 2.932738952636719e+02, 2.931716003417969e+02, 2.930750427246094e+02, 2.930153503417969e+02, 2.93001953125e+02, 2.930178833007812e+02, 2.930347900390625e+02]
-temSup.T=[3.231499938964844e+02, 3.111158447265625e+02, 3.068031616210938e+02, 3.053623657226562e+02, 3.057362976074219e+02, 3.070176391601562e+02, 3.086546325683594e+02, 3.103333740234375e+02, 3.118903198242188e+02, 3.132510986328125e+02, 3.143929443359375e+02, 3.153207092285156e+02, 3.160518493652344e+02, 3.166091918945312e+02, 3.170143432617188e+02, 3.172890319824219e+02, 3.174629821777344e+02, 3.175689697265625e+02, 3.176361389160156e+02, 3.176806640625e+02, 3.17705078125e+02, 3.177047729492188e+02, 3.176760559082031e+02, 3.176268310546875e+02, 3.175679931640625e+02, 3.175072937011719e+02, 3.174495849609375e+02, 3.173975219726562e+02, 3.173524169921875e+02, 3.173145141601562e+02, 3.172839660644531e+02, 3.172651672363281e+02, 3.172602844238281e+02, 3.172634887695312e+02, 3.136122741699218e+02, 3.037560729980469e+02, 3.039785461425781e+02, 3.05023681640625e+02, 3.061333312988281e+02, 3.07232177734375e+02, 3.082134094238281e+02, 3.090121765136719e+02, 3.095977478027344e+02, 3.099678039550781e+02, 3.101474304199219e+02, 3.101704711914062e+02, 3.100696411132812e+02, 3.098743286132812e+02, 3.096096801757812e+02, 3.092966918945312e+02, 3.089520568847656e+02, 3.037533264160156e+02, 2.848291625976562e+02, 2.883266906738281e+02, 2.905381164550781e+02, 2.920236206054688e+02, 2.931871032714844e+02, 2.941430053710938e+02, 2.949373779296875e+02, 2.955862731933594e+02, 2.961004638671875e+02, 2.978656311035156e+02, 3.036604919433594e+02, 3.064277954101562e+02, 3.078679504394531e+02, 3.0848291015625e+02, 3.085472106933594e+02, 3.084570922851562e+02, 3.084239807128906e+02, 3.0840478515625e+02, 3.083923950195312e+02, 3.0838427734375e+02, 3.083763122558594e+02, 3.083555908203125e+02, 3.083142395019531e+02, 3.082551574707031e+02, 3.074700927734375e+02, 3.069417114257812e+02, 3.069893798828125e+02, 3.074095153808594e+02, 3.080152587890625e+02, 3.086913452148438e+02, 3.09360595703125e+02, 3.099549560546875e+02, 3.104217224121094e+02, 3.107394409179688e+02, 3.109282531738281e+02, 3.110300598144531e+02, 3.110897216796875e+02, 3.111409606933594e+02, 3.111923828125e+02, 3.112330932617188e+02, 3.112460327148438e+02, 3.112206726074219e+02, 3.111658325195312e+02, 3.111007385253906e+02, 3.110450744628906e+02, 3.110140991210938e+02, 3.110140075683594e+02, 3.110379028320312e+02, 3.110718994140625e+02]
-temRet.T=[3.231499938964844e+02, 3.092321472167969e+02, 3.045989074707031e+02, 3.025772705078125e+02, 3.025083618164062e+02, 3.034881591796875e+02, 3.049300842285156e+02, 3.064868469238281e+02, 3.079706726074219e+02, 3.092909545898438e+02, 3.104144897460938e+02, 3.113390808105469e+02, 3.120770874023438e+02, 3.126472473144531e+02, 3.130665893554688e+02, 3.133533020019531e+02, 3.135365600585938e+02, 3.1365087890625e+02, 3.137281188964844e+02, 3.137857666015625e+02, 3.138253479003906e+02, 3.138397521972656e+02, 3.138226928710938e+02, 3.137823791503906e+02, 3.13730224609375e+02, 3.136744079589844e+02, 3.136201477050781e+02, 3.135704956054688e+02, 3.135269470214844e+02, 3.134900207519531e+02, 3.134603576660156e+02, 3.134448547363281e+02, 3.134474182128906e+02, 3.134624328613281e+02, 3.134232482910156e+02, 3.036737365722657e+02, 3.01708740234375e+02, 3.025626525878906e+02, 3.03567138671875e+02, 3.046215209960938e+02, 3.05603515625e+02, 3.064344482421875e+02, 3.070708312988281e+02, 3.075008850097656e+02, 3.077456665039062e+02, 3.078363342285156e+02, 3.078037109375e+02, 3.076759338378906e+02, 3.074774169921875e+02, 3.072287292480469e+02, 3.069463806152344e+02, 3.038546752929688e+02, 2.901170349121094e+02, 2.883891906738281e+02, 2.905900573730469e+02, 2.920830993652344e+02, 2.932557373046875e+02, 2.942200927734375e+02, 2.950214233398438e+02, 2.9567529296875e+02, 2.961930236816406e+02, 2.95098876953125e+02, 3.01114501953125e+02, 3.040820007324219e+02, 3.057000427246094e+02, 3.0646826171875e+02, 3.06661376953125e+02, 3.065892639160156e+02, 3.065546264648438e+02, 3.065343933105469e+02, 3.065213317871094e+02, 3.065127563476562e+02, 3.065040588378906e+02, 3.064812927246094e+02, 3.064363708496094e+02, 3.063727111816406e+02, 3.053977355957031e+02, 3.046625671386719e+02, 3.045422668457031e+02, 3.04833251953125e+02, 3.053458557128906e+02, 3.059669494628906e+02, 3.066163024902344e+02, 3.0721533203125e+02, 3.076963500976562e+02, 3.080256958007812e+02, 3.082191162109375e+02, 3.083193359375e+02, 3.0837646484375e+02, 3.084303283691406e+02, 3.084916381835938e+02, 3.085473937988281e+02, 3.085750427246094e+02, 3.085584106445312e+02, 3.085045776367188e+02, 3.084334411621094e+02, 3.083672180175781e+02, 3.083251037597656e+02, 3.083165588378906e+02, 3.083352966308594e+02, 3.083656921386719e+02]
-heaPum.refCyc.sigBus.hea=[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, 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, 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]
-heaPum.refCyc.sigBus.onOffMea=[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, 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, 1e+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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+vol.T=[2.931499938964844e+02, 2.917251892089844e+02, 2.886861877441406e+02, 2.866962585449219e+02, 2.860060424804688e+02, 2.8624169921875e+02, 2.869993591308594e+02, 2.879870910644531e+02, 2.890218505859375e+02, 2.899991149902344e+02, 2.908689270019531e+02, 2.916096801757812e+02, 2.922152404785156e+02, 2.926876220703125e+02, 2.930194091796875e+02, 2.932230834960938e+02, 2.93335205078125e+02, 2.9340087890625e+02, 2.934582214355469e+02, 2.935157775878906e+02, 2.935619812011719e+02, 2.935757446289062e+02, 2.93549560546875e+02, 2.935038146972656e+02, 2.934499206542969e+02, 2.933947448730469e+02, 2.933426513671875e+02, 2.93296142578125e+02, 2.932564697265625e+02, 2.932239074707031e+02, 2.932032470703125e+02, 2.932161254882812e+02, 2.932645874023438e+02, 2.933365783691406e+02, 2.95460693359375e+02, 2.925295104980469e+02, 2.896095886230469e+02, 2.89629638671875e+02, 2.902962646484375e+02, 2.911327514648438e+02, 2.919900207519531e+02, 2.92771484375e+02, 2.934074096679688e+02, 2.938790893554688e+02, 2.942116088867188e+02, 2.9442724609375e+02, 2.945483093261719e+02, 2.945964050292969e+02, 2.945913391113281e+02, 2.945502624511719e+02, 2.945060119628906e+02, 3.001047058105469e+02, 2.982427368164062e+02, 2.940140991210938e+02, 2.943144836425781e+02, 2.951688537597656e+02, 2.960208129882812e+02, 2.967854614257812e+02, 2.974311828613281e+02, 2.979300537109375e+02, 2.967666625976562e+02, 2.856502990722656e+02, 2.835823974609375e+02, 2.883830871582031e+02, 2.929782409667969e+02, 2.956009826660156e+02, 2.936690673828125e+02, 2.910787963867188e+02, 2.912563781738281e+02, 2.928034362792969e+02, 2.939569396972656e+02, 2.946380920410156e+02, 2.950357666015625e+02, 2.945670471191406e+02, 2.919860534667969e+02, 2.906861877441406e+02, 2.892413330078125e+02, 2.897418518066406e+02, 2.904535522460938e+02, 2.911250610351562e+02, 2.917194519042969e+02, 2.922969055175781e+02, 2.928437805175781e+02, 2.932951049804688e+02, 2.935728149414062e+02, 2.936619567871094e+02, 2.936131286621094e+02, 2.934982604980469e+02, 2.93396240234375e+02, 2.933577270507812e+02, 2.933752746582031e+02, 2.934109497070312e+02, 2.934136352539062e+02, 2.933562622070312e+02, 2.932557678222656e+02, 2.931380004882812e+02, 2.9303271484375e+02, 2.929696350097656e+02, 2.92957275390625e+02, 2.929777526855469e+02, 2.930016784667969e+02]
+temSup.T=[3.231499938964844e+02, 3.12006103515625e+02, 3.078103637695312e+02, 3.061668090820312e+02, 3.063213500976562e+02, 3.074601135253906e+02, 3.090391540527344e+02, 3.107222595214844e+02, 3.123187561035156e+02, 3.137315979003906e+02, 3.149217529296875e+02, 3.158841552734375e+02, 3.1663134765625e+02, 3.171847839355469e+02, 3.175671691894531e+02, 3.178028259277344e+02, 3.179252624511719e+02, 3.179720153808594e+02, 3.179771118164062e+02, 3.179610290527344e+02, 3.17928955078125e+02, 3.178775634765625e+02, 3.178033447265625e+02, 3.177141418457031e+02, 3.176211242675781e+02, 3.175321655273438e+02, 3.174520568847656e+02, 3.173831481933594e+02, 3.173262023925781e+02, 3.172808227539062e+02, 3.172464294433594e+02, 3.172268676757812e+02, 3.172238159179688e+02, 3.172308349609375e+02, 3.139916687011718e+02, 3.047022705078126e+02, 3.043235473632812e+02, 3.055128784179688e+02, 3.066809997558594e+02, 3.078085632324219e+02, 3.088002319335938e+02, 3.095927429199219e+02, 3.101542663574219e+02, 3.104814758300781e+02, 3.106004943847656e+02, 3.105482788085938e+02, 3.103622131347656e+02, 3.100768127441406e+02, 3.097225646972656e+02, 3.093250122070312e+02, 3.090281066894531e+02, 3.04449951171875e+02, 2.851360168457031e+02, 2.884064025878906e+02, 2.905628662109375e+02, 2.920706787109375e+02, 2.933028869628906e+02, 2.943565063476562e+02, 2.952657470703125e+02, 2.960379638671875e+02, 2.835398559570312e+02, 2.837323608398438e+02, 2.929266662597656e+02, 3.037991943359375e+02, 3.09487060546875e+02, 3.083078308105469e+02, 3.022742614746094e+02, 2.984705810546875e+02, 3.039081420898438e+02, 3.063138732910156e+02, 3.076370849609375e+02, 3.083343505859375e+02, 3.088277893066406e+02, 3.045819702148438e+02, 2.996817016601562e+02, 3.0260546875e+02, 3.0505322265625e+02, 3.065571594238281e+02, 3.078487243652344e+02, 3.089518127441406e+02, 3.098542175292969e+02, 3.10576171875e+02, 3.111401672363281e+02, 3.115458068847656e+02, 3.117832946777344e+02, 3.1185791015625e+02, 3.118078308105469e+02, 3.11688232421875e+02, 3.115538024902344e+02, 3.114443054199219e+02, 3.113700561523438e+02, 3.113177490234375e+02, 3.112651062011719e+02, 3.111953735351562e+02, 3.111118774414062e+02, 3.110299987792969e+02, 3.109668579101562e+02, 3.109361572265625e+02, 3.109426879882812e+02, 3.109779968261719e+02, 3.110260009765625e+02]
+temRet.T=[3.231499938964844e+02, 3.099340209960938e+02, 3.055309448242188e+02, 3.033744201660156e+02, 3.031017761230469e+02, 3.039298400878906e+02, 3.052975158691406e+02, 3.068433837890625e+02, 3.083556213378906e+02, 3.097214660644531e+02, 3.108910827636719e+02, 3.118515625e+02, 3.12609375e+02, 3.131811218261719e+02, 3.135843200683594e+02, 3.13839111328125e+02, 3.139778442382812e+02, 3.140392150878906e+02, 3.140596618652344e+02, 3.140607299804688e+02, 3.140469665527344e+02, 3.140127258300781e+02, 3.139521484375e+02, 3.138734130859375e+02, 3.137881164550781e+02, 3.137046203613281e+02, 3.136281127929688e+02, 3.135614013671875e+02, 3.13505615234375e+02, 3.134606628417969e+02, 3.134265441894531e+02, 3.134095153808594e+02, 3.134131164550781e+02, 3.134311828613281e+02, 3.135132446289062e+02, 3.044541015625001e+02, 3.019859924316406e+02, 3.029919128417969e+02, 3.040614624023438e+02, 3.051487731933594e+02, 3.061451416015625e+02, 3.069747924804688e+02, 3.075936889648438e+02, 3.079889831542969e+02, 3.0818212890625e+02, 3.082066955566406e+02, 3.080974426269531e+02, 3.0788720703125e+02, 3.076052551269531e+02, 3.072766418457031e+02, 3.069886474609375e+02, 3.043913879394531e+02, 2.905680541992188e+02, 2.885044250488281e+02, 2.906229858398438e+02, 2.9211962890625e+02, 2.933461608886719e+02, 2.943958129882812e+02, 2.95301513671875e+02, 2.960699768066406e+02, 2.885525817871094e+02, 2.837503051757812e+02, 2.884703063964844e+02, 3.000557250976562e+02, 3.062027893066406e+02, 3.08029296875e+02, 3.021154174804688e+02, 2.979242553710938e+02, 3.015198669433594e+02, 3.040516662597656e+02, 3.055120239257812e+02, 3.062846984863281e+02, 3.067979125976562e+02, 3.043900146484375e+02, 2.995418701171875e+02, 3.002327270507812e+02, 3.024449462890625e+02, 3.038230590820312e+02, 3.050406188964844e+02, 3.061009521484375e+02, 3.069825744628906e+02, 3.077070617675781e+02, 3.082954406738281e+02, 3.087396850585938e+02, 3.090178833007812e+02, 3.09125e+02, 3.09095458984375e+02, 3.089856262207031e+02, 3.088555603027344e+02, 3.08751708984375e+02, 3.086875610351562e+02, 3.086488647460938e+02, 3.086089172363281e+02, 3.085459289550781e+02, 3.084616088867188e+02, 3.083719482421875e+02, 3.082964172363281e+02, 3.082525634765625e+02, 3.0824853515625e+02, 3.082766723632812e+02, 3.083194885253906e+02]
+heaPum.refCyc.sigBus.hea=[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, 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, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
+heaPum.refCyc.sigBus.onOffMea=[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, 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, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+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]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
index 6ae89b7774..d40601706a 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
@@ -1,4 +1,4 @@
-last-generated=2024-04-05
+last-generated=2024-05-16
 statistics-initialization=
 {
   "nonlinear": "5, 1, 1",
@@ -13,7 +13,7 @@ statistics-simulation=
 }
 time=[0e+00, 8.64e+04]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.930081481933594e+02, 2.890408935546875e+02, 2.861318664550781e+02, 2.8480224609375e+02, 2.847872924804688e+02, 2.856737060546875e+02, 2.870640258789062e+02, 2.886346740722656e+02, 2.901558227539062e+02, 2.914900512695312e+02, 2.9256884765625e+02, 2.933721923828125e+02, 2.939109191894531e+02, 2.941998901367188e+02, 2.942796936035156e+02, 2.942162780761719e+02, 2.940820922851562e+02, 2.939383544921875e+02, 2.938107604980469e+02, 2.936983642578125e+02, 2.93584716796875e+02, 2.934627075195312e+02, 2.933506164550781e+02, 2.932566833496094e+02, 2.93183837890625e+02, 2.931320190429688e+02, 2.930991516113281e+02, 2.930820922851562e+02, 2.930771789550781e+02, 2.930859375e+02, 2.931273193359375e+02, 2.932015686035156e+02, 2.932950744628906e+02, 2.952928161621094e+02, 2.917389221191406e+02, 2.888991394042969e+02, 2.884640502929688e+02, 2.888617553710938e+02, 2.897235107421875e+02, 2.908168640136719e+02, 2.919417724609375e+02, 2.929413146972656e+02, 2.937357482910156e+02, 2.943158264160156e+02, 2.946922607421875e+02, 2.948916625976562e+02, 2.949492492675781e+02, 2.949027709960938e+02, 2.947882995605469e+02, 2.946372985839844e+02, 2.997855529785156e+02, 3.002188720703125e+02, 3.001246032714844e+02, 3.000146484375e+02, 2.999742431640625e+02, 3.000262756347656e+02, 3.001427001953125e+02, 3.002609252929688e+02, 3.003336181640625e+02, 3.003720092773438e+02, 2.928034362792969e+02, 2.905104370117188e+02, 2.914384765625e+02, 2.926476745605469e+02, 2.935851440429688e+02, 2.941985778808594e+02, 2.945193786621094e+02, 2.946030578613281e+02, 2.945147705078125e+02, 2.943774719238281e+02, 2.942656555175781e+02, 2.94166015625e+02, 2.94049072265625e+02, 2.939124145507812e+02, 2.937680358886719e+02, 2.908655090332031e+02, 2.898871154785156e+02, 2.89600830078125e+02, 2.897553100585938e+02, 2.902111206054688e+02, 2.909077453613281e+02, 2.917218627929688e+02, 2.924997253417969e+02, 2.930982360839844e+02, 2.934602661132812e+02, 2.93615234375e+02, 2.936313781738281e+02, 2.935959777832031e+02, 2.93574462890625e+02, 2.935761413574219e+02, 2.935773010253906e+02, 2.935369262695312e+02, 2.934342346191406e+02, 2.932901000976562e+02, 2.931336975097656e+02, 2.929978332519531e+02, 2.929144897460938e+02, 2.928933715820312e+02, 2.929161376953125e+02, 2.929511413574219e+02]
-temSup.T=[3.231499938964844e+02, 3.128330993652344e+02, 3.069313659667969e+02, 3.041143188476562e+02, 3.037375183105469e+02, 3.050202026367188e+02, 3.072518310546875e+02, 3.098486938476562e+02, 3.123942565917969e+02, 3.146322021484375e+02, 3.164364013671875e+02, 3.17773193359375e+02, 3.186666564941406e+02, 3.191739196777344e+02, 3.193647155761719e+02, 3.193130798339844e+02, 3.191001586914062e+02, 3.188040771484375e+02, 3.184895935058594e+02, 3.181965942382812e+02, 3.17939453125e+02, 3.177164306640625e+02, 3.175209350585938e+02, 3.173561096191406e+02, 3.172267456054688e+02, 3.1713330078125e+02, 3.1707275390625e+02, 3.170399475097656e+02, 3.170287475585938e+02, 3.170330505371094e+02, 3.170476989746094e+02, 3.170731811523438e+02, 3.171085205078125e+02, 3.171444702148438e+02, 3.121540527343749e+02, 3.025768432617188e+02, 3.02482421875e+02, 3.02957763671875e+02, 3.040975952148438e+02, 3.056089172363281e+02, 3.071944580078125e+02, 3.086299133300781e+02, 3.097709655761719e+02, 3.105495300292969e+02, 3.109682006835938e+02, 3.110690307617188e+02, 3.1091162109375e+02, 3.10561279296875e+02, 3.10081298828125e+02, 3.095279541015625e+02, 3.08947509765625e+02, 3.035455627441406e+02, 3.02360595703125e+02, 3.017453002929688e+02, 3.0139111328125e+02, 3.011201782226562e+02, 3.009575500488281e+02, 3.009179382324211e+02, 3.009338073730469e+02, 3.009635925292969e+02, 3.009916687011719e+02, 2.987875061035156e+02, 3.010831909179688e+02, 3.038251342773438e+02, 3.056345825195312e+02, 3.068066711425781e+02, 3.074385986328125e+02, 3.076326904296875e+02, 3.075011901855469e+02, 3.071989135742188e+02, 3.069870910644531e+02, 3.06833251953125e+02, 3.067147216796875e+02, 3.066059875488281e+02, 3.064893798828125e+02, 3.0636181640625e+02, 3.056158142089844e+02, 3.0517822265625e+02, 3.054564208984375e+02, 3.062478637695312e+02, 3.073172607421875e+02, 3.084852294921875e+02, 3.096142272949219e+02, 3.105851745605469e+02, 3.113106994628906e+02, 3.117551879882812e+02, 3.119479370117188e+02, 3.119570617675781e+02, 3.118621520996094e+02, 3.117316284179688e+02, 3.116009521484375e+02, 3.114750061035156e+02, 3.113432922363281e+02, 3.111962585449219e+02, 3.1104345703125e+02, 3.109058837890625e+02, 3.108049621582031e+02, 3.107565612792969e+02, 3.107651062011719e+02, 3.108183288574219e+02, 3.108939208984375e+02]
-temRet.T=[3.231499938964844e+02, 3.106587524414062e+02, 3.045890808105469e+02, 3.010768737792969e+02, 2.999817504882812e+02, 3.006295776367188e+02, 3.023643188476562e+02, 3.046147155761719e+02, 3.069502868652344e+02, 3.090885314941406e+02, 3.10875e+02, 3.122500915527344e+02, 3.132162475585938e+02, 3.138132019042969e+02, 3.140957336425781e+02, 3.141268005371094e+02, 3.139821472167969e+02, 3.1373974609375e+02, 3.134677124023438e+02, 3.132093200683594e+02, 3.129804382324219e+02, 3.127786560058594e+02, 3.125961303710938e+02, 3.124373168945312e+02, 3.123087768554688e+02, 3.122126159667969e+02, 3.12147216796875e+02, 3.121086120605469e+02, 3.120915222167969e+02, 3.120904541015625e+02, 3.121010131835938e+02, 3.12126708984375e+02, 3.121690368652344e+02, 3.12219482421875e+02, 3.120546569824218e+02, 3.024830627441407e+02, 3.000220336914062e+02, 3.00110107421875e+02, 3.009400329589844e+02, 3.022372741699219e+02, 3.037079467773438e+02, 3.05116455078125e+02, 3.062982177734375e+02, 3.071637268066406e+02, 3.076986083984375e+02, 3.079310607910156e+02, 3.079097900390625e+02, 3.076922607421875e+02, 3.073365173339844e+02, 3.068959655761719e+02, 3.064158935546875e+02, 3.034611511230469e+02, 3.022779235839844e+02, 3.016626586914062e+02, 3.013091735839844e+02, 3.010384521484375e+02, 3.008760070800781e+02, 3.0085302734375e+02, 3.008524475097656e+02, 3.008822326660156e+02, 3.009102478027344e+02, 2.987004089355469e+02, 2.983962097167969e+02, 3.010659484863281e+02, 3.029046936035156e+02, 3.041611022949219e+02, 3.049052429199219e+02, 3.052197265625e+02, 3.052024536132812e+02, 3.049638061523438e+02, 3.047493896484375e+02, 3.045936584472656e+02, 3.044736022949219e+02, 3.043634643554688e+02, 3.04245361328125e+02, 3.041161193847656e+02, 3.030972900390625e+02, 3.023598937988281e+02, 3.023526306152344e+02, 3.028970031738281e+02, 3.037730407714844e+02, 3.048143005371094e+02, 3.058845825195312e+02, 3.068531188964844e+02, 3.076111145019531e+02, 3.081014709472656e+02, 3.083392028808594e+02, 3.083856811523438e+02, 3.083211669921875e+02, 3.08218994140625e+02, 3.0811767578125e+02, 3.080215454101562e+02, 3.079154357910156e+02, 3.07783935546875e+02, 3.076341857910156e+02, 3.07487548828125e+02, 3.073684692382812e+02, 3.072982177734375e+02, 3.072865295410156e+02, 3.0732373046875e+02, 3.073869934082031e+02]
-heaPum.refCyc.sigBus.onOffMea=[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, 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, 6.969980148596733e-13, 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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+vol.T=[2.931499938964844e+02, 2.93133544921875e+02, 2.893275146484375e+02, 2.865391235351562e+02, 2.85306884765625e+02, 2.853642883300781e+02, 2.862884521484375e+02, 2.876766967773438e+02, 2.892074890136719e+02, 2.906585083007812e+02, 2.919026794433594e+02, 2.92882080078125e+02, 2.935859375e+02, 2.940323181152344e+02, 2.942413024902344e+02, 2.942566528320312e+02, 2.941459045410156e+02, 2.939813842773438e+02, 2.9382275390625e+02, 2.936928405761719e+02, 2.9358740234375e+02, 2.934868469238281e+02, 2.933814086914062e+02, 2.932872314453125e+02, 2.932109375e+02, 2.93154296875e+02, 2.931163940429688e+02, 2.930946960449219e+02, 2.930859680175781e+02, 2.930867004394531e+02, 2.930986633300781e+02, 2.931412048339844e+02, 2.932147216796875e+02, 2.933056945800781e+02, 2.952909851074219e+02, 2.91727783203125e+02, 2.889950561523438e+02, 2.887469482421875e+02, 2.892843627929688e+02, 2.902214660644531e+02, 2.913283081054688e+02, 2.924151000976562e+02, 2.933390502929688e+02, 2.940355224609375e+02, 2.945091247558594e+02, 2.94781982421875e+02, 2.948889770507812e+02, 2.948707885742188e+02, 2.947679443359375e+02, 2.946170654296875e+02, 2.944482421875e+02, 2.995169677734375e+02, 2.997100524902344e+02, 2.988101806640625e+02, 2.977340393066406e+02, 2.968164978027344e+02, 2.9615869140625e+02, 2.957342224121094e+02, 2.954729919433594e+02, 2.959471130371094e+02, 2.965458984375e+02, 2.891456909179688e+02, 2.879156188964844e+02, 2.904720764160156e+02, 2.929844665527344e+02, 2.947738647460938e+02, 2.942584228515625e+02, 2.915440063476562e+02, 2.907592163085938e+02, 2.91749755859375e+02, 2.927495422363281e+02, 2.935050964355469e+02, 2.939776000976562e+02, 2.941773681640625e+02, 2.942243957519531e+02, 2.942117919921875e+02, 2.913864135742188e+02, 2.904174499511719e+02, 2.901033020019531e+02, 2.902076721191406e+02, 2.906007385253906e+02, 2.912286071777344e+02, 2.919721374511719e+02, 2.926804504394531e+02, 2.932130126953125e+02, 2.935156555175781e+02, 2.936206970214844e+02, 2.935985107421875e+02, 2.935371704101562e+02, 2.935014343261719e+02, 2.934984130859375e+02, 2.935018005371094e+02, 2.934681701660156e+02, 2.933750305175781e+02, 2.932423400878906e+02, 2.930985717773438e+02, 2.929759216308594e+02, 2.929055480957031e+02, 2.928961791992188e+02, 2.92928466796875e+02, 2.929700622558594e+02]
+temSup.T=[3.231499938964844e+02, 3.132603454589844e+02, 3.07589599609375e+02, 3.049389343261719e+02, 3.0469482421875e+02, 3.060532836914062e+02, 3.082928161621094e+02, 3.108318176269531e+02, 3.132659301757812e+02, 3.153562622070312e+02, 3.169946594238281e+02, 3.181632995605469e+02, 3.188988647460938e+02, 3.192674560546875e+02, 3.193446960449219e+02, 3.192078857421875e+02, 3.189385070800781e+02, 3.186126098632812e+02, 3.182906494140625e+02, 3.180069885253906e+02, 3.177703857421875e+02, 3.175743713378906e+02, 3.174088134765625e+02, 3.1727392578125e+02, 3.171723937988281e+02, 3.171031494140625e+02, 3.170623168945312e+02, 3.170444030761719e+02, 3.170434875488281e+02, 3.170539245605469e+02, 3.170711364746094e+02, 3.170960998535156e+02, 3.171278991699219e+02, 3.171575622558594e+02, 3.121260681152343e+02, 3.025603637695313e+02, 3.029165649414062e+02, 3.0366650390625e+02, 3.049569091796875e+02, 3.065069580078125e+02, 3.080377197265625e+02, 3.093494873046875e+02, 3.103242492675781e+02, 3.1091845703125e+02, 3.111548767089844e+02, 3.110906677246094e+02, 3.107955627441406e+02, 3.103405151367188e+02, 3.097904968261719e+02, 3.092001647949219e+02, 3.086117248535156e+02, 3.030996704101562e+02, 2.994584655761719e+02, 2.964105834960938e+02, 2.941552734375e+02, 2.925123596191406e+02, 2.913623962402344e+02, 2.906131591796875e+02, 2.901717529296875e+02, 2.929496154785156e+02, 2.922964782714844e+02, 2.927127685546875e+02, 2.989099731445312e+02, 3.042018432617188e+02, 3.076310119628906e+02, 3.096658630371094e+02, 3.030927429199219e+02, 2.983475036621094e+02, 3.020249633789062e+02, 3.040867614746094e+02, 3.055288696289062e+02, 3.064622497558594e+02, 3.069494018554688e+02, 3.071249389648438e+02, 3.072376098632812e+02, 3.072860717773438e+02, 3.06546630859375e+02, 3.060624694824219e+02, 3.062551879882812e+02, 3.069382934570312e+02, 3.078889465332031e+02, 3.089354553222656e+02, 3.099446411132812e+02, 3.1080126953125e+02, 3.114223937988281e+02, 3.117777099609375e+02, 3.11900634765625e+02, 3.11861328125e+02, 3.117387390136719e+02, 3.11597900390625e+02, 3.114696350097656e+02, 3.113544006347656e+02, 3.112384338378906e+02, 3.111104431152344e+02, 3.109789123535156e+02, 3.108638000488281e+02, 3.107853698730469e+02, 3.107578430175781e+02, 3.107837219238281e+02, 3.108493957519531e+02, 3.109321594238281e+02]
+temRet.T=[3.231499938964844e+02, 3.109465637207031e+02, 3.051198425292969e+02, 3.017668762207031e+02, 3.008051147460938e+02, 3.0154052734375e+02, 3.033044128417969e+02, 3.055235595703125e+02, 3.077754211425781e+02, 3.09791748046875e+02, 3.1143408203125e+02, 3.126578063964844e+02, 3.13477783203125e+02, 3.139429931640625e+02, 3.141145935058594e+02, 3.140592651367188e+02, 3.138541564941406e+02, 3.135761108398438e+02, 3.132901000976562e+02, 3.130347290039062e+02, 3.1282080078125e+02, 3.12641357421875e+02, 3.124849853515625e+02, 3.123532409667969e+02, 3.122505798339844e+02, 3.12177490234375e+02, 3.121314086914062e+02, 3.121078186035156e+02, 3.121015625e+02, 3.121073608398438e+02, 3.121213989257812e+02, 3.121476745605469e+02, 3.121878356933594e+02, 3.122334899902344e+02, 3.120255126953124e+02, 3.024656982421876e+02, 3.002981567382812e+02, 3.006697082519531e+02, 3.016737060546875e+02, 3.030414733886719e+02, 3.044920959472656e+02, 3.058102111816406e+02, 3.068545532226562e+02, 3.075583801269531e+02, 3.079270629882812e+02, 3.080040283203125e+02, 3.078488159179688e+02, 3.075254211425781e+02, 3.070947875976562e+02, 3.066099548339844e+02, 3.061132202148438e+02, 3.030145874023438e+02, 3.004136962890625e+02, 2.973762817382812e+02, 2.951348876953125e+02, 2.934813842773438e+02, 2.923077392578125e+02, 2.915289916992188e+02, 2.910557250976562e+02, 2.928703918457031e+02, 2.932261962890625e+02, 2.926277160644531e+02, 2.953840637207031e+02, 3.0063916015625e+02, 3.042180786132812e+02, 3.064935913085938e+02, 3.030009460449219e+02, 2.982584533691406e+02, 2.994433898925781e+02, 3.0144970703125e+02, 3.029169616699219e+02, 3.039224243164062e+02, 3.045039672851562e+02, 3.047346801757812e+02, 3.04848876953125e+02, 3.0489794921875e+02, 3.039365539550781e+02, 3.031767578125e+02, 3.031046142578125e+02, 3.035578918457031e+02, 3.043294982910156e+02, 3.052616271972656e+02, 3.062229309082031e+02, 3.070860900878906e+02, 3.077461547851562e+02, 3.081506042480469e+02, 3.083186950683594e+02, 3.083143005371094e+02, 3.082179870605469e+02, 3.081009521484375e+02, 3.07997802734375e+02, 3.079087524414062e+02, 3.078152465820312e+02, 3.076999206542969e+02, 3.075686645507812e+02, 3.074420166015625e+02, 3.073433837890625e+02, 3.072926025390625e+02, 3.072978210449219e+02, 3.073479309082031e+02, 3.074194030761719e+02]
+heaPum.refCyc.sigBus.onOffMea=[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, 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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+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]
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
index 394f295b2c..645e5f9cba 100644
--- a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
+++ b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-04-15
+last-generated=2024-05-16
 statistics-initialization=
 {
-  "nonlinear": "5",
+  "nonlinear": "5, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -13,8 +13,8 @@ statistics-simulation=
 }
 time=[0e+00, 8.64e+04]
 vol.T_start=[2.931499938964844e+02, 2.931499938964844e+02]
-vol.T=[2.931499938964844e+02, 2.914048156738281e+02, 2.879740600585938e+02, 2.860528869628906e+02, 2.856654663085938e+02, 2.861862182617188e+02, 2.871057739257812e+02, 2.88127685546875e+02, 2.89104736328125e+02, 2.899739074707031e+02, 2.907191467285156e+02, 2.913419799804688e+02, 2.918499755859375e+02, 2.922518005371094e+02, 2.925418090820312e+02, 2.927314758300781e+02, 2.928542785644531e+02, 2.929501037597656e+02, 2.93050537109375e+02, 2.931571960449219e+02, 2.932533569335938e+02, 2.933148803710938e+02, 2.933335571289062e+02, 2.933298034667969e+02, 2.933147888183594e+02, 2.93294677734375e+02, 2.93273193359375e+02, 2.932525024414062e+02, 2.932337341308594e+02, 2.932173767089844e+02, 2.932086181640625e+02, 2.932293395996094e+02, 2.932813720703125e+02, 2.933526306152344e+02, 2.95342529296875e+02, 2.917300720214844e+02, 2.891979064941406e+02, 2.893501892089844e+02, 2.900398254394531e+02, 2.908671569824219e+02, 2.916920776367188e+02, 2.924290161132812e+02, 2.930216064453125e+02, 2.934629516601562e+02, 2.937854919433594e+02, 2.940138244628906e+02, 2.941686401367188e+02, 2.942673645019531e+02, 2.94324462890625e+02, 2.943515014648438e+02, 2.943575744628906e+02, 2.996297302246094e+02, 2.996614685058594e+02, 2.98643798828125e+02, 2.974724731445312e+02, 2.965232849121094e+02, 2.958760986328125e+02, 2.954831848144531e+02, 2.958393859863281e+02, 2.962727966308594e+02, 2.959749755859375e+02, 2.882928161621094e+02, 2.8703125e+02, 2.908804931640625e+02, 2.937384338378906e+02, 2.952322387695312e+02, 2.930983581542969e+02, 2.906957092285156e+02, 2.916450805664062e+02, 2.928605651855469e+02, 2.936227416992188e+02, 2.940279846191406e+02, 2.942453918457031e+02, 2.943353881835938e+02, 2.943392333984375e+02, 2.942956237792969e+02, 2.914695434570312e+02, 2.906198425292969e+02, 2.904268188476562e+02, 2.905630798339844e+02, 2.908778686523438e+02, 2.913409729003906e+02, 2.918734130859375e+02, 2.923671264648438e+02, 2.927195434570312e+02, 2.929036865234375e+02, 2.929636840820312e+02, 2.929650268554688e+02, 2.929788818359375e+02, 2.930472717285156e+02, 2.931556701660156e+02, 2.932629699707031e+02, 2.933190307617188e+02, 2.933009338378906e+02, 2.932304992675781e+02, 2.931369018554688e+02, 2.9305126953125e+02, 2.930030212402344e+02, 2.929996337890625e+02, 2.930225524902344e+02, 2.930431518554688e+02]
-temSup.T=[3.231499938964844e+02, 3.108038330078125e+02, 3.06485107421875e+02, 3.054105224609375e+02, 3.061442260742188e+02, 3.076316833496094e+02, 3.093134155273438e+02, 3.109213562011719e+02, 3.123428039550781e+02, 3.135434265136719e+02, 3.145272827148438e+02, 3.1531494140625e+02, 3.159317626953125e+02, 3.164031372070312e+02, 3.16750732421875e+02, 3.169946594238281e+02, 3.171606750488281e+02, 3.172756958007812e+02, 3.173619079589844e+02, 3.174296569824219e+02, 3.174780883789062e+02, 3.175019226074219e+02, 3.174981384277344e+02, 3.174746398925781e+02, 3.174414672851562e+02, 3.174052734375e+02, 3.173700256347656e+02, 3.173378295898438e+02, 3.173096313476562e+02, 3.1728564453125e+02, 3.172660522460938e+02, 3.172544555664062e+02, 3.172520751953125e+02, 3.172530822753906e+02, 3.127425842285156e+02, 3.028088989257813e+02, 3.039301147460938e+02, 3.050869140625e+02, 3.062459106445312e+02, 3.073246765136719e+02, 3.082395324707031e+02, 3.089511108398438e+02, 3.094498291015625e+02, 3.097481689453125e+02, 3.098782043457031e+02, 3.09875244140625e+02, 3.097700805664062e+02, 3.095882568359375e+02, 3.093504028320312e+02, 3.090728149414062e+02, 3.087680358886719e+02, 3.030213317871094e+02, 2.992156982421875e+02, 2.959024047851562e+02, 2.935732421875e+02, 2.919425048828125e+02, 2.908447875976562e+02, 2.901604614257812e+02, 2.923218078613281e+02, 2.916749267578125e+02, 2.9079541015625e+02, 2.909187316894531e+02, 2.991891784667969e+02, 3.057781677246094e+02, 3.087584838867188e+02, 3.073666381835938e+02, 3.008912658691406e+02, 3.010508728027344e+02, 3.043155517578125e+02, 3.058570861816406e+02, 3.066119995117188e+02, 3.070046081542969e+02, 3.072578430175781e+02, 3.074015808105469e+02, 3.0746484375e+02, 3.074740600585938e+02, 3.069124145507812e+02, 3.0667333984375e+02, 3.069616394042969e+02, 3.075386962890625e+02, 3.082191772460938e+02, 3.089027709960938e+02, 3.09531494140625e+02, 3.100584106445312e+02, 3.104518737792969e+02, 3.107074584960938e+02, 3.108540649414062e+02, 3.109345397949219e+02, 3.109886779785156e+02, 3.110423583984375e+02, 3.110980224609375e+02, 3.111423950195312e+02, 3.111596984863281e+02, 3.111425170898438e+02, 3.111011352539062e+02, 3.110541076660156e+02, 3.110185241699219e+02, 3.11006103515625e+02, 3.110196838378906e+02, 3.110512084960938e+02, 3.110876770019531e+02]
-temRet.T=[3.231499938964844e+02, 3.090293579101562e+02, 3.042601318359375e+02, 3.025152282714844e+02, 3.027882690429688e+02, 3.039975280761719e+02, 3.055193481445312e+02, 3.070376586914062e+02, 3.084109497070312e+02, 3.095883178710938e+02, 3.10564453125e+02, 3.113545227050781e+02, 3.119799499511719e+02, 3.124631958007812e+02, 3.128219299316406e+02, 3.130733032226562e+02, 3.132434997558594e+02, 3.133619995117188e+02, 3.134545288085938e+02, 3.1353271484375e+02, 3.135943908691406e+02, 3.136310424804688e+02, 3.136368408203125e+02, 3.136201782226562e+02, 3.13591796875e+02, 3.135590209960938e+02, 3.135260925292969e+02, 3.134955139160156e+02, 3.134683837890625e+02, 3.134450988769531e+02, 3.134263916015625e+02, 3.134186096191406e+02, 3.134248046875e+02, 3.134390258789062e+02, 3.128311767578124e+02, 3.028026123046876e+02, 3.016048583984375e+02, 3.025806579589844e+02, 3.036518859863281e+02, 3.04704833984375e+02, 3.056361694335938e+02, 3.063908386230469e+02, 3.069460754394531e+02, 3.073055725097656e+02, 3.07498779296875e+02, 3.075594787597656e+02, 3.07517578125e+02, 3.073980712890625e+02, 3.072214050292969e+02, 3.070036926269531e+02, 3.067575073242188e+02, 3.031962890625e+02, 3.000714416503906e+02, 2.967318420410156e+02, 2.94385009765625e+02, 2.927252502441406e+02, 2.91595703125e+02, 2.908806457519531e+02, 2.923994750976562e+02, 2.924208374023438e+02, 2.915252685546875e+02, 2.908757934570312e+02, 2.953509826660156e+02, 3.027464904785156e+02, 3.061596374511719e+02, 3.075789794921875e+02, 3.009295043945312e+02, 2.986697387695312e+02, 3.021163024902344e+02, 3.038099365234375e+02, 3.0468603515625e+02, 3.05121826171875e+02, 3.053946838378906e+02, 3.055486145019531e+02, 3.056154174804688e+02, 3.056239929199219e+02, 3.048055725097656e+02, 3.043324890136719e+02, 3.044488525390625e+02, 3.0490625e+02, 3.055082092285156e+02, 3.061527099609375e+02, 3.067760620117188e+02, 3.073186645507812e+02, 3.077324829101562e+02, 3.080009460449219e+02, 3.081499938964844e+02, 3.082252502441406e+02, 3.082735290527344e+02, 3.083279113769531e+02, 3.083928833007812e+02, 3.084521484375e+02, 3.084835205078125e+02, 3.084733581542969e+02, 3.084306335449219e+02, 3.083751525878906e+02, 3.083271179199219e+02, 3.083027038574219e+02, 3.083081665039062e+02, 3.083354797363281e+02, 3.08369384765625e+02]
+vol.T=[2.931499938964844e+02, 2.914049377441406e+02, 2.879743347167969e+02, 2.860531921386719e+02, 2.856658020019531e+02, 2.861865234375e+02, 2.871060485839844e+02, 2.881279296875e+02, 2.891049499511719e+02, 2.899740905761719e+02, 2.907192993164062e+02, 2.913421020507812e+02, 2.9185009765625e+02, 2.922518920898438e+02, 2.925418701171875e+02, 2.927315368652344e+02, 2.928543090820312e+02, 2.929501647949219e+02, 2.930505676269531e+02, 2.931572265625e+02, 2.932533874511719e+02, 2.933149108886719e+02, 2.933335571289062e+02, 2.93329833984375e+02, 2.933147888183594e+02, 2.93294677734375e+02, 2.93273193359375e+02, 2.932525024414062e+02, 2.932337341308594e+02, 2.932173767089844e+02, 2.932086181640625e+02, 2.932293395996094e+02, 2.932813720703125e+02, 2.933526306152344e+02, 2.95342529296875e+02, 2.91730224609375e+02, 2.891981811523438e+02, 2.893505249023438e+02, 2.900401306152344e+02, 2.908674621582031e+02, 2.916923217773438e+02, 2.924292297363281e+02, 2.930217895507812e+02, 2.934630737304688e+02, 2.937855834960938e+02, 2.94013916015625e+02, 2.941686706542969e+02, 2.942673950195312e+02, 2.943244934082031e+02, 2.943515014648438e+02, 2.943575744628906e+02, 2.996297912597656e+02, 2.9966162109375e+02, 2.9864404296875e+02, 2.974728393554688e+02, 2.96523681640625e+02, 2.958765258789062e+02, 2.954835815429688e+02, 2.958385314941406e+02, 2.962731628417969e+02, 2.959757995605469e+02, 2.882935180664062e+02, 2.870315856933594e+02, 2.908806457519531e+02, 2.937385864257812e+02, 2.952322387695312e+02, 2.930981140136719e+02, 2.906957397460938e+02, 2.916453552246094e+02, 2.928609313964844e+02, 2.936231079101562e+02, 2.940283508300781e+02, 2.942458190917969e+02, 2.943358459472656e+02, 2.943397216796875e+02, 2.942961120605469e+02, 2.914700317382812e+02, 2.906202697753906e+02, 2.904271545410156e+02, 2.905633544921875e+02, 2.908780822753906e+02, 2.913411254882812e+02, 2.918735046386719e+02, 2.923672180175781e+02, 2.927196044921875e+02, 2.929037475585938e+02, 2.929637145996094e+02, 2.929650573730469e+02, 2.929789123535156e+02, 2.930472717285156e+02, 2.931557006835938e+02, 2.932630004882812e+02, 2.933190307617188e+02, 2.933009338378906e+02, 2.932304992675781e+02, 2.931369018554688e+02, 2.9305126953125e+02, 2.930030212402344e+02, 2.929996337890625e+02, 2.930225524902344e+02, 2.930431518554688e+02]
+temSup.T=[3.231499938964844e+02, 3.108042297363281e+02, 3.064856872558594e+02, 3.054111022949219e+02, 3.061447448730469e+02, 3.076321411132812e+02, 3.093138122558594e+02, 3.109216918945312e+02, 3.123431091308594e+02, 3.13543701171875e+02, 3.145274963378906e+02, 3.153151245117188e+02, 3.159319152832031e+02, 3.164032592773438e+02, 3.167508544921875e+02, 3.169947509765625e+02, 3.171607360839844e+02, 3.172757568359375e+02, 3.173619384765625e+02, 3.174296875e+02, 3.174781188964844e+02, 3.17501953125e+02, 3.174981689453125e+02, 3.174746704101562e+02, 3.174414672851562e+02, 3.174053039550781e+02, 3.173700256347656e+02, 3.173378295898438e+02, 3.173096313476562e+02, 3.1728564453125e+02, 3.172660522460938e+02, 3.172544555664062e+02, 3.172520751953125e+02, 3.172530822753906e+02, 3.127427368164062e+02, 3.028093261718751e+02, 3.039306640625e+02, 3.050874938964844e+02, 3.062464294433594e+02, 3.073251342773438e+02, 3.082399291992188e+02, 3.08951416015625e+02, 3.094500732421875e+02, 3.097483520507812e+02, 3.098783569335938e+02, 3.098753356933594e+02, 3.097701416015625e+02, 3.095882873535156e+02, 3.093504028320312e+02, 3.090728149414062e+02, 3.087680053710938e+02, 3.030216979980469e+02, 2.992162780761719e+02, 2.959031372070312e+02, 2.935740356445312e+02, 2.919433288574219e+02, 2.908455505371094e+02, 2.901611938476562e+02, 2.92320068359375e+02, 2.916771545410156e+02, 2.907969970703125e+02, 2.909201049804688e+02, 2.991892700195312e+02, 3.057784118652344e+02, 3.087587280273438e+02, 3.073663024902344e+02, 3.008910827636719e+02, 3.010514526367188e+02, 3.043161926269531e+02, 3.058577575683594e+02, 3.066126098632812e+02, 3.070053100585938e+02, 3.072586364746094e+02, 3.074024353027344e+02, 3.074657287597656e+02, 3.074749450683594e+02, 3.069131774902344e+02, 3.066739501953125e+02, 3.069620971679688e+02, 3.075390319824219e+02, 3.082194519042969e+02, 3.089029846191406e+02, 3.095316467285156e+02, 3.100585327148438e+02, 3.104519653320312e+02, 3.1070751953125e+02, 3.108541259765625e+02, 3.109345703125e+02, 3.109887084960938e+02, 3.110423889160156e+02, 3.110980529785156e+02, 3.111423950195312e+02, 3.111596984863281e+02, 3.111425170898438e+02, 3.111011352539062e+02, 3.110541076660156e+02, 3.110185241699219e+02, 3.11006103515625e+02, 3.110196838378906e+02, 3.110512084960938e+02, 3.110876770019531e+02]
+temRet.T=[3.231499938964844e+02, 3.090296936035156e+02, 3.042606201171875e+02, 3.025157470703125e+02, 3.027887573242188e+02, 3.039979858398438e+02, 3.055197143554688e+02, 3.070379943847656e+02, 3.084112548828125e+02, 3.095885620117188e+02, 3.10564697265625e+02, 3.113547058105469e+02, 3.119801025390625e+02, 3.124633483886719e+02, 3.128220520019531e+02, 3.130733947753906e+02, 3.132435607910156e+02, 3.13362060546875e+02, 3.1345458984375e+02, 3.135327453613281e+02, 3.135944213867188e+02, 3.136310729980469e+02, 3.136368713378906e+02, 3.136201782226562e+02, 3.135918273925781e+02, 3.135590209960938e+02, 3.13526123046875e+02, 3.134955139160156e+02, 3.134683837890625e+02, 3.134450988769531e+02, 3.134263916015625e+02, 3.134186096191406e+02, 3.134247741699219e+02, 3.134389953613281e+02, 3.128312072753906e+02, 3.028029174804688e+02, 3.016053466796875e+02, 3.025812072753906e+02, 3.036523742675781e+02, 3.047052612304688e+02, 3.056365356445312e+02, 3.063911437988281e+02, 3.069463195800781e+02, 3.073057556152344e+02, 3.074989013671875e+02, 3.075595703125e+02, 3.075176391601562e+02, 3.073981018066406e+02, 3.072214050292969e+02, 3.07003662109375e+02, 3.067574768066406e+02, 3.03196533203125e+02, 3.000719604492188e+02, 2.967325134277344e+02, 2.943857421875e+02, 2.927260131835938e+02, 2.91596435546875e+02, 2.9088134765625e+02, 2.923976135253906e+02, 2.924230041503906e+02, 2.915268249511719e+02, 2.908771057128906e+02, 2.953510131835938e+02, 3.027467041015625e+02, 3.061598815917969e+02, 3.075784912109375e+02, 3.0092919921875e+02, 2.986701965332031e+02, 3.021168823242188e+02, 3.03810546875e+02, 3.046866149902344e+02, 3.051224670410156e+02, 3.053954162597656e+02, 3.055493774414062e+02, 3.056162109375e+02, 3.056248168945312e+02, 3.048063354492188e+02, 3.043330688476562e+02, 3.044493103027344e+02, 3.049066162109375e+02, 3.055084838867188e+02, 3.061529235839844e+02, 3.067762145996094e+02, 3.073187866210938e+02, 3.077325744628906e+02, 3.080010070800781e+02, 3.081500549316406e+02, 3.082252807617188e+02, 3.082735290527344e+02, 3.083279418945312e+02, 3.083928833007812e+02, 3.084521484375e+02, 3.084835205078125e+02, 3.084733581542969e+02, 3.084306335449219e+02, 3.083751525878906e+02, 3.083271179199219e+02, 3.083027038574219e+02, 3.083081665039062e+02, 3.083354797363281e+02, 3.08369384765625e+02]
 heaPum.refCyc.sigBus.hea=[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, 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, 1e+00, 1e+00, 1e+00, 1e+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]
 heaPum.refCyc.sigBus.onOffMea=[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, 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, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+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]