diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
index bb0e7566329..4ff034b38d7 100644
--- a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
+++ b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo
@@ -78,6 +78,7 @@ model ChillerSetPointControl
         MediumAir, m_flow_nominal=999)
     annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow pum(
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1.2*mCHW_flow_nominal,
     dp(start=40474),
     redeclare package Medium = Medium2,
@@ -214,6 +215,13 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 August 16, 2019, by Michael Wetter:<br/>
 Changed initialization of PI controller for Dymola 2020.
 </li>
diff --git a/Buildings/Examples/Tutorial/Boiler/System2.mo b/Buildings/Examples/Tutorial/Boiler/System2.mo
index df8da60fd76..d9e833fdc22 100644
--- a/Buildings/Examples/Tutorial/Boiler/System2.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System2.mo
@@ -84,6 +84,7 @@ model System2
 Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -389,6 +390,13 @@ could have been used.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 6, 2017, by Michael Wetter:<br/>
 Added missing density to computation of air mass flow rate.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\">#673</a>.
diff --git a/Buildings/Examples/Tutorial/Boiler/System3.mo b/Buildings/Examples/Tutorial/Boiler/System3.mo
index 3d6fcbe95a7..feec25ad1bd 100644
--- a/Buildings/Examples/Tutorial/Boiler/System3.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System3.mo
@@ -83,6 +83,7 @@ model System3
   Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -140,9 +141,10 @@ model System3
 //----------------------------------------------------------------------------//
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pumBoi(
-      redeclare package Medium = MediumW,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-      m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
+    redeclare package Medium = MediumW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
@@ -576,6 +578,13 @@ this indicates that the model is correct.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 6, 2017, by Michael Wetter:<br/>
 Added missing density to computation of air mass flow rate.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\">#673</a>.
diff --git a/Buildings/Examples/Tutorial/Boiler/System4.mo b/Buildings/Examples/Tutorial/Boiler/System4.mo
index f569c4122c0..b87945d29e9 100644
--- a/Buildings/Examples/Tutorial/Boiler/System4.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System4.mo
@@ -83,6 +83,7 @@ model System4
   Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -140,9 +141,10 @@ model System4
 //----------------------------------------------------------------------------//
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pumBoi(
-      redeclare package Medium = MediumW,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-      m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
+    redeclare package Medium = MediumW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
@@ -534,6 +536,13 @@ Buildings.Examples.Tutorial.Boiler.System5</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 6, 2017, by Michael Wetter:<br/>
 Added missing density to computation of air mass flow rate.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\">#673</a>.
diff --git a/Buildings/Examples/Tutorial/Boiler/System5.mo b/Buildings/Examples/Tutorial/Boiler/System5.mo
index 21003835fed..2c9e599c13e 100644
--- a/Buildings/Examples/Tutorial/Boiler/System5.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System5.mo
@@ -83,6 +83,7 @@ model System5
   Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -140,9 +141,10 @@ model System5
 //----------------------------------------------------------------------------//
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pumBoi(
-      redeclare package Medium = MediumW,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-      m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
+    redeclare package Medium = MediumW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
@@ -601,6 +603,13 @@ Buildings.Examples.Tutorial.Boiler.System4</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 6, 2017, by Michael Wetter:<br/>
 Added missing density to computation of air mass flow rate.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\">#673</a>.
diff --git a/Buildings/Examples/Tutorial/Boiler/System6.mo b/Buildings/Examples/Tutorial/Boiler/System6.mo
index 2b182bce699..d3294f33380 100644
--- a/Buildings/Examples/Tutorial/Boiler/System6.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System6.mo
@@ -78,6 +78,7 @@ model System6
   Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -135,9 +136,10 @@ model System6
 //----------------------------------------------------------------------------//
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pumBoi(
-      redeclare package Medium = MediumW,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-      m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
+    redeclare package Medium = MediumW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
@@ -589,6 +591,13 @@ maintained at their set point.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 6, 2017, by Michael Wetter:<br/>
 Added missing density to computation of air mass flow rate.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/673\">#673</a>.
diff --git a/Buildings/Examples/Tutorial/Boiler/System7.mo b/Buildings/Examples/Tutorial/Boiler/System7.mo
index 249681ee073..1793264dca5 100644
--- a/Buildings/Examples/Tutorial/Boiler/System7.mo
+++ b/Buildings/Examples/Tutorial/Boiler/System7.mo
@@ -78,6 +78,7 @@ model System7
   Buildings.Fluid.Movers.FlowControlled_m_flow pumRad(
     redeclare package Medium = MediumW,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mRad_flow_nominal) "Pump for radiator"
       annotation (Placement(transformation(
       extent={{-10,-10},{10,10}},
@@ -135,9 +136,10 @@ model System7
 //----------------------------------------------------------------------------//
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pumBoi(
-      redeclare package Medium = MediumW,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-      m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
+    redeclare package Medium = MediumW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mBoi_flow_nominal) "Pump for boiler"
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
@@ -663,6 +665,13 @@ response shown below should be seen.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 February 15, 2022, by Michael Wetter:<br/>
 Changed block downstream of <code>greThrTRoo</code> from <code>and</code> to <code>or</code> block.
 This ensures that the system is off when the outdoor air or room air is sufficiently warm.
diff --git a/Buildings/Examples/Tutorial/SpaceCooling/System2.mo b/Buildings/Examples/Tutorial/SpaceCooling/System2.mo
index f2bbc632a4c..0be124d089d 100644
--- a/Buildings/Examples/Tutorial/SpaceCooling/System2.mo
+++ b/Buildings/Examples/Tutorial/SpaceCooling/System2.mo
@@ -70,6 +70,7 @@ model System2
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Supply air fan"
     annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
@@ -525,6 +526,13 @@ from the model.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 20, 2021 by David Blum:<br/>
 Correct supply and return water parameterization.<br/>
 Use design conditions for UA parameterization in cooling coil.<br/>
diff --git a/Buildings/Examples/Tutorial/SpaceCooling/System3.mo b/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
index d814a1518ef..927be466f1a 100644
--- a/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
+++ b/Buildings/Examples/Tutorial/SpaceCooling/System3.mo
@@ -70,6 +70,7 @@ model System3
     annotation (Placement(transformation(extent={{20,70},{40,90}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState) "Supply air fan"
     annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
@@ -369,6 +370,13 @@ Buildings.Controls.OBC.CDL.Reals.PID</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 December 11, 2023, by Jianjun Hu:<br/>
 Reimplemented on-off control to avoid using the obsolete <code>OnOffController</code>.
 This is for
diff --git a/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo b/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
index c79e73e3ff4..a407bced5fb 100644
--- a/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
+++ b/Buildings/Fluid/Boilers/Examples/BoilerPolynomialClosedLoop.mo
@@ -36,6 +36,7 @@ model BoilerPolynomialClosedLoop
         origin={0,40})));
   Movers.FlowControlled_m_flow pumLoa(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=2*m_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heating load" annotation (Placement(transformation(
@@ -44,6 +45,7 @@ model BoilerPolynomialClosedLoop
         origin={0,110})));
   Movers.FlowControlled_m_flow pumBoi(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=m_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for boiler loop" annotation (Placement(transformation(
@@ -270,6 +272,13 @@ and it is used to accommodate for the thermal expansion of the water.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 1, 2016, by Michael Wetter:<br/>
 Removed parameter <code>dynamicBalance</code>.
 This is for
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
index 1a03b7d31a7..4825ec58588 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo
@@ -3,6 +3,7 @@ block Fan "Declaration of an FMU that exports a fan"
    extends Buildings.Fluid.FMI.ExportContainers.ReplaceableTwoPort(
      redeclare replaceable package Medium =  Buildings.Media.Air,
      redeclare final Movers.FlowControlled_dp com(
+      nominalValuesDefineDefaultPressureCurve=true,
       final m_flow_nominal=m_flow_nominal,
       final use_inputFilter=
                           false,
@@ -44,6 +45,13 @@ Buildings.Fluid.Movers.FlowControlled_m_flow</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 January 22, 2016, by Michael Wetter:<br/>
 Corrected type declaration of pressure difference.
 This is
diff --git a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
index ba377d18844..a47a6197858 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo
@@ -64,6 +64,7 @@ block HVACZones
     annotation (Placement(transformation(extent={{100,-100},{120,-80}})));
   Movers.FlowControlled_m_flow fan(
     redeclare package Medium = MediumA,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=allowFlowReversal) "Supply air fan"
@@ -162,6 +163,7 @@ block HVACZones
     redeclare package Medium = MediumA,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=allowFlowReversal,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=mA_flow_nominal/10,
     inputType=Buildings.Fluid.Types.InputType.Constant)
     "Supply air fan that extracts a constant amount of outside air"
@@ -329,6 +331,13 @@ ports which are exposed at the FMU interface.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 21, 2021 by David Blum:<br/>
 Correct supply and return water parameterization.<br/>
 Use explicit calculation of sensible and latent load to determine design load
diff --git a/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo b/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo
index d5aba0bd94f..340514381fc 100644
--- a/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo
+++ b/Buildings/Fluid/FMI/ExportContainers/Validation/RoomHVAC.mo
@@ -49,7 +49,6 @@ protected
     extends Buildings.Examples.Tutorial.SpaceCooling.System3(
       vol(energyDynamics=
       Modelica.Fluid.Types.Dynamics.FixedInitial),
-      fan(nominalValuesDefineDefaultPressureCurve=true),
       hex(dp1_nominal=200 + 10,
           dp2_nominal=200 + 200));
     annotation (Documentation(info="<html>
@@ -218,6 +217,13 @@ With Dymola 2017, we obtain the trajectories shown below.
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Removed redundant nominal curve specification which is now specified
+in a lower-level model.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 21, 2021 by David Blum:<br/>
 Use design conditions for UA parameterization in cooling coil.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
diff --git a/Buildings/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo b/Buildings/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
index 039ab353e6c..c665397c220 100644
--- a/Buildings/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
+++ b/Buildings/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo
@@ -73,6 +73,7 @@ model RectangularBorefield "Example model of a rectangular borefield"
   Buildings.Fluid.Movers.FlowControlled_m_flow pum(
     redeclare package Medium = Medium,
     addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     use_inputFilter=false,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     inputType=Buildings.Fluid.Types.InputType.Constant,
@@ -120,6 +121,13 @@ where <code>dBorHol</code> is the distance between the boreholes,
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 September 10, 2018, by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/Movers/Data/Generic.mo b/Buildings/Fluid/Movers/Data/Generic.mo
index fd6ba3839c3..46880cf3711 100644
--- a/Buildings/Fluid/Movers/Data/Generic.mo
+++ b/Buildings/Fluid/Movers/Data/Generic.mo
@@ -29,12 +29,14 @@ record Generic "Generic data record for movers"
 
   // Efficiency computation choices
   parameter Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod etaHydMet=
-    Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
+    if havePressureCurve
+    then Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.EulerNumber
+    else Buildings.Fluid.Movers.BaseClasses.Types.HydraulicEfficiencyMethod.NotProvided
     "Efficiency computation method for the hydraulic efficiency etaHyd"
     annotation (Dialog(group="Power computation"));
   parameter Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod etaMotMet=
-    if powerOrEfficiencyIsHydraulic
-      then Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve
+    if powerOrEfficiencyIsHydraulic and havePressureCurve
+    then Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.GenericCurve
     else Buildings.Fluid.Movers.BaseClasses.Types.MotorEfficiencyMethod.NotProvided
     "Efficiency computation method for the motor efficiency etaMot"
     annotation (Dialog(group="Power computation"));
@@ -159,6 +161,12 @@ record Generic "Generic data record for movers"
   Documentation(revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Default efficiency methods now depend on whether a pressure curve is available.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 29, 2023, by Hongxiang Fu:<br/>
 Deleted angular speed parameters with the unit rpm.
 This is for
diff --git a/Buildings/Fluid/Movers/Examples/MoverParameter.mo b/Buildings/Fluid/Movers/Examples/MoverParameter.mo
index 29cdcb62e74..e3232690824 100644
--- a/Buildings/Fluid/Movers/Examples/MoverParameter.mo
+++ b/Buildings/Fluid/Movers/Examples/MoverParameter.mo
@@ -9,6 +9,7 @@ model MoverParameter
 
   Buildings.Fluid.Movers.FlowControlled_m_flow pump_m_flow(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=m_flow_nominal,
     use_inputFilter=false,
     massFlowRates={0,0.5,1}*m_flow_nominal,
@@ -88,6 +89,13 @@ set point for a mover model.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Deleted the mover with <code>Nrpm</code> signal.
 This is for
diff --git a/Buildings/Fluid/Movers/Validation/FlowControlled_dp.mo b/Buildings/Fluid/Movers/Validation/FlowControlled_dp.mo
index 230e6e9e04f..bc4a25b3187 100644
--- a/Buildings/Fluid/Movers/Validation/FlowControlled_dp.mo
+++ b/Buildings/Fluid/Movers/Validation/FlowControlled_dp.mo
@@ -4,11 +4,13 @@ model FlowControlled_dp "Fan with zero mass flow rate and head as input"
  extends Buildings.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow(
     gain(k=dp_nominal),
     redeclare Buildings.Fluid.Movers.FlowControlled_dp floMacSta(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
     redeclare Buildings.Fluid.Movers.FlowControlled_dp floMacDyn(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
@@ -38,6 +40,13 @@ This ensures that the actual speed is equal to the input signal.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 November 5, 2015, by Michael Wetter:<br/>
 Changed parameters of fan since the power is no longer a parameter.
 This is for
diff --git a/Buildings/Fluid/Movers/Validation/FlowControlled_dpSystem.mo b/Buildings/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
index 11870342008..396e30507d6 100644
--- a/Buildings/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
+++ b/Buildings/Fluid/Movers/Validation/FlowControlled_dpSystem.mo
@@ -23,6 +23,7 @@ model FlowControlled_dpSystem
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
     use_inputFilter=false) "Regular dp controlled fan"
     annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
@@ -30,6 +31,7 @@ model FlowControlled_dpSystem
     redeclare package Medium = Medium,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     allowFlowReversal=false,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=1,
     use_inputFilter=false,
     prescribeSystemPressure=true)
@@ -228,6 +230,13 @@ The mass flow rates and actual pressure heads of the two configurations are comp
 </html>", revisions="<html>
 <ul>
 <li>
+April 9, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 May 4 2017, by Filip Jorissen:<br/>
 First implementation.
 This is for
diff --git a/Buildings/Fluid/Movers/Validation/FlowControlled_m_flow.mo b/Buildings/Fluid/Movers/Validation/FlowControlled_m_flow.mo
index ce4b5867d29..e24b85496bb 100644
--- a/Buildings/Fluid/Movers/Validation/FlowControlled_m_flow.mo
+++ b/Buildings/Fluid/Movers/Validation/FlowControlled_m_flow.mo
@@ -5,11 +5,13 @@ model FlowControlled_m_flow
  extends Buildings.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow(
     gain(k=m_flow_nominal),
     redeclare Buildings.Fluid.Movers.FlowControlled_m_flow floMacSta(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState),
     redeclare Buildings.Fluid.Movers.FlowControlled_m_flow floMacDyn(
+      nominalValuesDefineDefaultPressureCurve=true,
       redeclare package Medium = Medium,
       m_flow_nominal=m_flow_nominal,
       use_inputFilter=false,
@@ -39,6 +41,13 @@ This ensures that the actual speed is equal to the input signal.
 </html>", revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 February 14, 2012, by Michael Wetter:<br/>
 Added filter for start-up and shut-down transient.
 </li>
diff --git a/Buildings/Fluid/Movers/Validation/PumpCurveDerivatives.mo b/Buildings/Fluid/Movers/Validation/PumpCurveDerivatives.mo
index c916ff13c29..89fa1a0222a 100644
--- a/Buildings/Fluid/Movers/Validation/PumpCurveDerivatives.mo
+++ b/Buildings/Fluid/Movers/Validation/PumpCurveDerivatives.mo
@@ -41,6 +41,7 @@ model PumpCurveDerivatives
 
   Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump1(
     redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
     m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
     use_inputFilter=false) "Pump for forcing a certain mass flow rate"
@@ -154,6 +155,13 @@ monotoneously increasing or decreasing relations between <code>dp</code>,
 revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Replaced the pump with <code>Nrpm</code> signal with one with <code>y</code>
 signal.
diff --git a/Buildings/Fluid/Movers/Validation/Pump_y_stratos.mo b/Buildings/Fluid/Movers/Validation/Pump_y_stratos.mo
index 03043d41fb9..d18bad30cd7 100644
--- a/Buildings/Fluid/Movers/Validation/Pump_y_stratos.mo
+++ b/Buildings/Fluid/Movers/Validation/Pump_y_stratos.mo
@@ -54,28 +54,38 @@ model Pump_y_stratos "Model validation using a Wilo Stratos 80/1-12 pump"
     per=per) "Wilo Stratos pump"
     annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
 
-  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump1(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump1(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,60},{58,80}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump2(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump2(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,10},{58,30}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump3(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump3(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-36},{58,-16}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump4(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump4(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-80},{58,-60}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump5(redeclare package
-      Medium = Medium, m_flow_nominal=3,
+  Buildings.Fluid.Movers.FlowControlled_m_flow forcedPump5(
+    redeclare package Medium = Medium,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=3,
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for forcing a certain mass flow rate"
     annotation (Placement(transformation(extent={{38,-130},{58,-110}})));
@@ -262,6 +272,13 @@ Wilo Stratos 80/1-12 data sheet</a>.
 revisions="<html>
 <ul>
 <li>
+April 8, 2024, by Hongxiang Fu:<br/>
+Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+in the mover component to suppress a warning.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+</li>
+<li>
 March 21, 2023, by Hongxiang Fu:<br/>
 Replaced the pumps with <code>Nrpm</code> signal with ones with <code>y</code>
 signal.
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
index 31ea6326839..1ab85a54ab4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
@@ -1,24 +1,24 @@
-last-generated=2023-07-18
+last-generated=2024-05-09
 statistics-initialization=
 {
   "linear": "0, 0, 0",
-  "nonlinear": "2",
+  "nonlinear": "3",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 5",
-  "nonlinear": "2",
+  "nonlinear": "3",
   "number of continuous time states": "36",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-pla.QFue_flow=[8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 6.943478125e+04, 6.9197515625e+04, 6.918040625e+04, 6.91738046875e+04, 6.9171171875e+04, 6.9170125e+04, 6.916971875e+04, 6.9169578125e+04, 6.91695078125e+04, 6.91694765625e+04, 6.91694609375e+04, 6.9169453125e+04, 6.91694453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.91694609375e+04, 6.91694609375e+04, 6.91694609375e+04, 6.90225859375e+04, 6.684046875e+04, 6.26111484375e+04, 5.705704296875e+04, 5.0898046875e+04, 4.485218359375e+04, 3.963675390625e+04, 3.596899609375e+04, 3.45660078125e+04, 3.457599609375e+04, 3.457998046875e+04, 3.458151171875e+04, 3.45820625e+04, 3.45822578125e+04, 3.458234375e+04, 3.458237890625e+04, 3.458239453125e+04, 3.458240234375e+04, 3.458240625e+04, 3.458241015625e+04, 3.458241015625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.46447578125e+04, 3.49710390625e+04, 3.55520234375e+04, 3.636053125e+04, 3.73695703125e+04, 3.855219140625e+04, 3.9881484375e+04, 4.13305546875e+04, 4.287250390625e+04, 4.448043359375e+04, 4.612744921875e+04, 4.778665625e+04, 4.943116796875e+04, 5.10340859375e+04, 5.2568515625e+04, 5.40075703125e+04, 5.53243515625e+04]
+pla.QFue_flow=[8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 8.33333359375e+04, 6.943478125e+04, 6.9197515625e+04, 6.918040625e+04, 6.91738046875e+04, 6.9171171875e+04, 6.9170125e+04, 6.916971875e+04, 6.9169578125e+04, 6.91695078125e+04, 6.91694765625e+04, 6.91694609375e+04, 6.9169453125e+04, 6.91694453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.9169453125e+04, 6.91694609375e+04, 6.91694609375e+04, 6.91694609375e+04, 6.90225859375e+04, 6.684046875e+04, 6.26111484375e+04, 5.705704296875e+04, 5.0898046875e+04, 4.485218359375e+04, 3.963675390625e+04, 3.596899609375e+04, 3.45660078125e+04, 3.4576e+04, 3.457998046875e+04, 3.458151171875e+04, 3.45820625e+04, 3.45822578125e+04, 3.458234375e+04, 3.458237890625e+04, 3.458239453125e+04, 3.458240234375e+04, 3.458240625e+04, 3.458241015625e+04, 3.458241015625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.45824140625e+04, 3.46447578125e+04, 3.49710390625e+04, 3.55520234375e+04, 3.636053125e+04, 3.73695703125e+04, 3.855219140625e+04, 3.9881484375e+04, 4.13305546875e+04, 4.287250390625e+04, 4.448043359375e+04, 4.612744921875e+04, 4.778665625e+04, 4.943116796875e+04, 5.10340859375e+04, 5.2568515625e+04, 5.40075703125e+04, 5.53243515625e+04]
 bld[1].Q_flow=[1.6e+04, 1.65306875e+04, 1.7135103515625e+04, 1.7771775390625e+04, 1.8399232421875e+04, 1.8976e+04, 1.9460607421875e+04, 1.9811583984375e+04, 1.9987455078125e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 1.9953279296875e+04, 1.9313919921875e+04, 1.80870390625e+04, 1.648e+04, 1.470016015625e+04, 1.29548798828125e+04, 1.145151953125e+04, 1.03974404296875e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1.001881640625e+04, 1.0114e+04, 1.02826240234375e+04, 1.0516912109375e+04, 1.0809087890625e+04, 1.11513759765625e+04, 1.1536e+04, 1.195518359375e+04, 1.240115234375e+04, 1.28661279296875e+04, 1.33423359375e+04, 1.3822e+04, 1.429734375e+04, 1.4760591796875e+04, 1.52039677734375e+04, 1.56196962890625e+04, 1.6e+04]
 bld[3].Q_flow=[1.6e+04, 1.65306875e+04, 1.7135103515625e+04, 1.7771775390625e+04, 1.8399232421875e+04, 1.8976e+04, 1.9460607421875e+04, 1.9811583984375e+04, 1.9987455078125e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 2e+04, 1.9953279296875e+04, 1.9313919921875e+04, 1.80870390625e+04, 1.648e+04, 1.470016015625e+04, 1.29548798828125e+04, 1.145151953125e+04, 1.03974404296875e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1.001881640625e+04, 1.0114e+04, 1.02826240234375e+04, 1.0516912109375e+04, 1.0809087890625e+04, 1.11513759765625e+04, 1.1536e+04, 1.195518359375e+04, 1.240115234375e+04, 1.28661279296875e+04, 1.33423359375e+04, 1.3822e+04, 1.429734375e+04, 1.4760591796875e+04, 1.52039677734375e+04, 1.56196962890625e+04, 1.6e+04]
-pla.port_aSerHea.m_flow=[0e+00, 2.207192778587341e-02, 2.296426519751549e-02, 2.390038035809994e-02, 2.482344582676888e-02, 2.567640319466591e-02, 2.640225365757942e-02, 2.694432623684406e-02, 2.717576734721661e-02, 2.715913765132427e-02, 2.712512388825417e-02, 2.709171921014786e-02, 2.705895155668259e-02, 2.70268376916647e-02, 2.699540182948112e-02, 2.696466632187366e-02, 2.693465352058411e-02, 2.690538577735424e-02, 2.687688916921616e-02, 2.684918791055679e-02, 2.682778611779213e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.676834911108017e-02, 2.591901831328869e-02, 2.427911199629307e-02, 2.212677896022797e-02, 1.974016800522804e-02, 1.73974297940731e-02, 1.537671498954296e-02, 1.395617239177227e-02, 1.341395266354084e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.343845576047897e-02, 1.356520969420671e-02, 1.379056740552187e-02, 1.410409715026617e-02, 1.449537090957165e-02, 1.495395693928003e-02, 1.546942535787821e-02, 1.603134535253048e-02, 1.66292879730463e-02, 1.725281961262226e-02, 1.789150945842266e-02, 1.853493042290211e-02, 1.917264983057976e-02, 1.979423500597477e-02, 2.038925886154175e-02, 2.094728872179985e-02, 2.145789563655853e-02]
+pla.port_aSerHea.m_flow=[0e+00, 2.207192778587341e-02, 2.296426519751549e-02, 2.390038035809994e-02, 2.482344582676888e-02, 2.567640319466591e-02, 2.640225365757942e-02, 2.694432623684406e-02, 2.717576734721661e-02, 2.715913765132427e-02, 2.712512388825417e-02, 2.709171921014786e-02, 2.705895155668259e-02, 2.70268376916647e-02, 2.699540182948112e-02, 2.696466632187366e-02, 2.693465352058411e-02, 2.690538577735424e-02, 2.687688916921616e-02, 2.684918791055679e-02, 2.682778611779213e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.682776749134064e-02, 2.676834911108017e-02, 2.591901831328869e-02, 2.427911199629307e-02, 2.212677896022797e-02, 1.974016800522804e-02, 1.73974297940731e-02, 1.537671498954296e-02, 1.395617239177227e-02, 1.341395266354084e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.341388374567032e-02, 1.343845576047897e-02, 1.356521062552929e-02, 1.37905664741993e-02, 1.410409715026617e-02, 1.449537090957165e-02, 1.495395693928003e-02, 1.546942535787821e-02, 1.603134535253048e-02, 1.66292879730463e-02, 1.725281961262226e-02, 1.789150945842266e-02, 1.853493042290211e-02, 1.917264983057976e-02, 1.979423500597477e-02, 2.038925886154175e-02, 2.094728872179985e-02, 2.145789563655853e-02]
 bld[1].port_a.m_flow=[0e+00, 7.357566151767969e-03, 7.655016612261534e-03, 7.967052981257439e-03, 8.274734951555729e-03, 8.559043519198895e-03, 8.800983428955078e-03, 8.981665596365929e-03, 9.058814495801926e-03, 9.053281508386135e-03, 9.041955694556236e-03, 9.030833840370178e-03, 9.019925259053707e-03, 9.009234607219696e-03, 8.998771198093891e-03, 8.988541550934315e-03, 8.978554047644138e-03, 8.968815207481384e-03, 8.959334343671799e-03, 8.950118906795979e-03, 8.942608721554279e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.922782726585865e-03, 8.63967277109623e-03, 8.093037642538548e-03, 7.375592831522226e-03, 6.58005615696311e-03, 5.799143575131893e-03, 5.125571507960558e-03, 4.652057308703661e-03, 4.471317399293184e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.479485098272562e-03, 4.52173687517643e-03, 4.596855491399765e-03, 4.70136571675539e-03, 4.831789992749691e-03, 4.984652157872915e-03, 5.156475119292736e-03, 5.343781784176826e-03, 5.543095991015434e-03, 5.750939715653658e-03, 5.963836796581745e-03, 6.178310140967369e-03, 6.39088312163949e-03, 6.598078645765781e-03, 6.796419620513916e-03, 6.982429884374142e-03, 7.152631878852844e-03]
-bld[3].port_a.m_flow=[0e+00, 7.357025519013405e-03, 7.654465734958649e-03, 7.966505363583565e-03, 8.274202235043049e-03, 8.558533154428005e-03, 8.800494484603405e-03, 8.981194347143173e-03, 9.058340452611446e-03, 9.052785113453865e-03, 9.041433222591877e-03, 9.030284360051155e-03, 9.019346907734871e-03, 9.008626453578472e-03, 8.99813137948513e-03, 8.987869136035442e-03, 8.977846242487431e-03, 8.968072012066841e-03, 8.958552964031696e-03, 8.949297480285168e-03, 8.942580781877041e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.922782726585865e-03, 8.63967277109623e-03, 8.093037642538548e-03, 7.375592831522226e-03, 6.58005615696311e-03, 5.799143575131893e-03, 5.125571507960558e-03, 4.652057774364948e-03, 4.471317399293184e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.479485098272562e-03, 4.52173687517643e-03, 4.596855491399765e-03, 4.70136571675539e-03, 4.831789992749691e-03, 4.984652157872915e-03, 5.156475119292736e-03, 5.343781784176826e-03, 5.543095991015434e-03, 5.750939715653658e-03, 5.963836796581745e-03, 6.178310140967369e-03, 6.39088312163949e-03, 6.598078645765781e-03, 6.796419620513916e-03, 6.982429884374142e-03, 7.152631878852844e-03]
+bld[3].port_a.m_flow=[0e+00, 7.357025519013405e-03, 7.654465734958649e-03, 7.966505363583565e-03, 8.274202235043049e-03, 8.558533154428005e-03, 8.800494484603405e-03, 8.981194347143173e-03, 9.058340452611446e-03, 9.052785113453865e-03, 9.041433222591877e-03, 9.030284360051155e-03, 9.019346907734871e-03, 9.008626453578472e-03, 8.99813137948513e-03, 8.987869136035442e-03, 8.977846242487431e-03, 8.968072012066841e-03, 8.958552964031696e-03, 8.949297480285168e-03, 8.942580781877041e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.942589163780212e-03, 8.922782726585865e-03, 8.63967277109623e-03, 8.093037642538548e-03, 7.375592831522226e-03, 6.58005615696311e-03, 5.799143575131893e-03, 5.125571507960558e-03, 4.652057774364948e-03, 4.471317864954472e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.471294581890106e-03, 4.479485098272562e-03, 4.52173687517643e-03, 4.596855491399765e-03, 4.70136571675539e-03, 4.831789992749691e-03, 4.984652157872915e-03, 5.156475119292736e-03, 5.343781784176826e-03, 5.543095991015434e-03, 5.750939715653658e-03, 5.963836796581745e-03, 6.178310140967369e-03, 6.39088312163949e-03, 6.598078645765781e-03, 6.796419620513916e-03, 6.982429884374142e-03, 7.152631878852844e-03]
 pla.port_bSerHea.p=[1.01325e+05, 1.15498015625e+05, 1.299321640625e+05, 1.44348453125e+05, 1.58421796875e+05, 1.71921765625e+05, 1.84753265625e+05, 1.9699125e+05, 2.0896328125e+05, 2.21281375e+05, 2.3421e+05, 2.4777615625e+05, 2.62003171875e+05, 2.7691671875e+05, 2.925426875000001e+05, 3.08907625e+05, 3.2603878125e+05, 3.439639687500001e+05, 3.62711375e+05, 3.8230978125e+05, 3.99941125e+05, 4e+05, 4.0000003125e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4.00000625e+05, 4.00003375e+05, 4.0000534375e+05, 4.0000653125e+05, 4.0000690625e+05, 4.000065e+05, 4.0000528125e+05, 4.0000328125e+05, 4.0000046875e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 4e+05, 3.9999984375e+05, 3.9999953125e+05, 3.9999925e+05, 3.9999903125e+05, 3.999988125e+05, 3.99998625e+05, 3.9999846875e+05, 3.9999834375e+05, 3.9999825e+05, 3.999981875e+05, 3.9999815625e+05, 3.9999815625e+05, 3.999981875e+05, 3.9999825e+05, 3.9999834375e+05, 3.999984375e+05, 3.9999859375e+05]
 pla.port_aSerHea.p=[1.01325e+05, 1.01325e+05]
 bld[1].port_b.p=[1.01325e+05, 1.07810578125e+05, 1.08345578125e+05, 1.089296015625e+05, 1.09528328125e+05, 1.10101734375e+05, 1.10604953125e+05, 1.1098990625e+05, 1.1115665625e+05, 1.11144640625e+05, 1.111200703125e+05, 1.110959765625e+05, 1.11072375e+05, 1.110492734375e+05, 1.110266796875e+05, 1.11004625e+05, 1.10983109375e+05, 1.1096215625e+05, 1.109417734375e+05, 1.10921984375e+05, 1.1090621875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.109061875e+05, 1.108637890625e+05, 1.102680859375e+05, 1.0917221875e+05, 1.078425859375e+05, 1.06512421875e+05, 1.053542109375e+05, 1.044725859375e+05, 1.039178828125e+05, 1.037203203125e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03720296875e+05, 1.03729078125e+05, 1.037746484375e+05, 1.038567109375e+05, 1.03973140625e+05, 1.041221015625e+05, 1.04301890625e+05, 1.0451065625e+05, 1.047462890625e+05, 1.05006265625e+05, 1.052875078125e+05, 1.055863203125e+05, 1.05898328125e+05, 1.062184453125e+05, 1.065408828125e+05, 1.068591796875e+05, 1.0716625e+05, 1.074544921875e+05]
@@ -32,8 +32,8 @@ pla.port_bSerHea.h_outflow=[2.673189e+06, 2.679726e+06, 2.685621e+06, 2.690891e+
 bld[1].port_a.h_outflow=[2.7381e+06, 2.7381e+06]
 bld[1].port_b.h_outflow=[4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05, 4.1829246875e+05]
 pla.conPum.u_s=[1e+00, 1e+00]
-pla.conPum.u_m=[1e+00, 1.000749945640564e+00, 1.000048398971558e+00, 9.998145699501038e-01, 9.997490048408508e-01, 9.997451305389404e-01, 9.997647404670715e-01, 9.997935891151428e-01, 9.998294115066528e-01, 9.998592138290405e-01, 9.998717308044434e-01, 9.998757839202881e-01, 9.998764991760254e-01, 9.99876081943512e-01, 9.998751282691956e-01, 9.998739957809448e-01, 9.998726844787598e-01, 9.998712539672852e-01, 9.998697638511658e-01, 9.998682141304016e-01, 9.997885823249817e-01, 9.999058246612549e-01, 9.999630451202393e-01, 9.999853372573853e-01, 9.999942183494568e-01, 9.999977350234985e-01, 9.999991059303284e-01, 9.999995827674866e-01, 9.999998211860657e-01, 9.999999403953552e-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, 1.000001907348633e+00, 1.000032186508179e+00, 1.000072836875916e+00, 1.000105977058411e+00, 1.00012481212616e+00, 1.000128626823425e+00, 1.000117659568787e+00, 1.000092625617981e+00, 1.000053882598877e+00, 1.000021934509277e+00, 1.000008344650269e+00, 1.000003099441528e+00, 1.000001192092896e+00, 1.000000596046448e+00, 1.000000238418579e+00, 1.00000011920929e+00, 1.00000011920929e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999991655349731e-01, 9.999955892562866e-01, 9.999909400939941e-01, 9.999862909317017e-01, 9.999818205833435e-01, 9.999778270721436e-01, 9.999743700027466e-01, 9.99971330165863e-01, 9.999688863754272e-01, 9.999669194221497e-01, 9.99965488910675e-01, 9.999646544456482e-01, 9.999643564224243e-01, 9.999646544456482e-01, 9.999656081199646e-01, 9.99967098236084e-01, 9.999692440032959e-01]
+pla.conPum.u_m=[1e+00, 1.000749945640564e+00, 1.000048398971558e+00, 9.998145699501038e-01, 9.997490048408508e-01, 9.997451305389404e-01, 9.997647404670715e-01, 9.997935891151428e-01, 9.998294115066528e-01, 9.998592138290405e-01, 9.998717308044434e-01, 9.998757839202881e-01, 9.998764991760254e-01, 9.99876081943512e-01, 9.998751282691956e-01, 9.998739957809448e-01, 9.998726844787598e-01, 9.998712539672852e-01, 9.998697638511658e-01, 9.998682141304016e-01, 9.997885823249817e-01, 9.999058246612549e-01, 9.999630451202393e-01, 9.999853372573853e-01, 9.999942183494568e-01, 9.999977350234985e-01, 9.999991059303284e-01, 9.999995827674866e-01, 9.999998211860657e-01, 9.999999403953552e-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, 1.000001907348633e+00, 1.000032186508179e+00, 1.000072836875916e+00, 1.000105977058411e+00, 1.00012481212616e+00, 1.000128626823425e+00, 1.000117659568787e+00, 1.000092625617981e+00, 1.000053882598877e+00, 1.000021934509277e+00, 1.000008344650269e+00, 1.000003099441528e+00, 1.000001192092896e+00, 1.000000596046448e+00, 1.000000238418579e+00, 1.00000011920929e+00, 1.00000011920929e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999991655349731e-01, 9.999955892562866e-01, 9.999909400939941e-01, 9.999862313270569e-01, 9.999818205833435e-01, 9.999778270721436e-01, 9.999743700027466e-01, 9.99971330165863e-01, 9.999688863754272e-01, 9.999669194221497e-01, 9.99965488910675e-01, 9.999646544456482e-01, 9.999643564224243e-01, 9.999646544456482e-01, 9.999656081199646e-01, 9.99967098236084e-01, 9.999692440032959e-01]
 pla.conBoi.u_s=[1e+00, 1e+00]
 pla.conBoi.u_m=[2.533124983310699e-01, 2.887450456619263e-01, 3.248304128646851e-01, 3.608711361885071e-01, 3.960544764995575e-01, 4.298044145107269e-01, 4.618831872940063e-01, 4.924781024456025e-01, 5.224082469940186e-01, 5.532034635543823e-01, 5.855250358581543e-01, 6.194403767585754e-01, 6.550079584121704e-01, 6.92291796207428e-01, 7.313567399978639e-01, 7.72269070148468e-01, 8.150969743728638e-01, 8.599098920822145e-01, 9.067783951759338e-01, 9.557744860649109e-01, 9.998527765274048e-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, 1.000001549720764e+00, 1.000008463859558e+00, 1.00001335144043e+00, 1.000016331672668e+00, 1.000017285346985e+00, 1.000016212463379e+00, 1.00001323223114e+00, 1.000008225440979e+00, 1.000001192092896e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999995827674866e-01, 9.999988079071045e-01, 9.99998152256012e-01, 9.999975562095642e-01, 9.999970197677612e-01, 9.99996542930603e-01, 9.999961853027344e-01, 9.999958872795105e-01, 9.999956488609314e-01, 9.999954700469971e-01, 9.999954104423523e-01, 9.999954104423523e-01, 9.999954700469971e-01, 9.999955892562866e-01, 9.999958276748657e-01, 9.999961256980896e-01, 9.999964833259583e-01]
-pla.conPum.y=[6.99999988079071e-01, 3.371609449386597e-01, 4.191201031208038e-01, 4.815050065517426e-01, 5.337050557136536e-01, 5.78672468662262e-01, 6.172996163368225e-01, 6.497573256492615e-01, 6.752736568450928e-01, 6.959642171859741e-01, 7.166070938110352e-01, 7.375763058662415e-01, 7.587911486625671e-01, 7.802302837371826e-01, 8.018950819969177e-01, 8.237956762313843e-01, 8.459432125091553e-01, 8.683477640151978e-01, 8.910192847251892e-01, 9.139670729637146e-01, 9.540978670120239e-01, 9.571428298950195e-01, 9.562363624572754e-01, 9.558830261230469e-01, 9.557427763938904e-01, 9.556865692138672e-01, 9.556649923324585e-01, 9.556573629379272e-01, 9.55653965473175e-01, 9.556521773338318e-01, 9.556513428688049e-01, 9.55650806427002e-01, 9.556505680084229e-01, 9.556506872177124e-01, 9.55650806427002e-01, 9.556509256362915e-01, 9.556509852409363e-01, 9.556510448455811e-01, 9.556510448455811e-01, 9.556510448455811e-01, 9.556511044502258e-01, 9.556511044502258e-01, 9.552282691001892e-01, 9.466167092323303e-01, 9.294245839118958e-01, 9.071628451347351e-01, 8.832326531410217e-01, 8.603535294532776e-01, 8.410468101501465e-01, 8.276832103729248e-01, 8.225669860839844e-01, 8.22940468788147e-01, 8.231251835823059e-01, 8.231963515281677e-01, 8.232219219207764e-01, 8.232309222221375e-01, 8.232349753379822e-01, 8.232365846633911e-01, 8.232372403144836e-01, 8.232377171516418e-01, 8.232378363609314e-01, 8.232379555702209e-01, 8.232380747795105e-01, 8.232380747795105e-01, 8.232381343841553e-01, 8.232381343841553e-01, 8.232381343841553e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.234327435493469e-01, 8.245803713798523e-01, 8.26659619808197e-01, 8.295664191246033e-01, 8.332070708274841e-01, 8.374901413917542e-01, 8.423258662223816e-01, 8.476238250732422e-01, 8.532923460006714e-01, 8.592380285263062e-01, 8.653653860092163e-01, 8.715767860412598e-01, 8.777722716331482e-01, 8.838495016098022e-01, 8.897039294242859e-01, 8.952288627624512e-01, 9.00315523147583e-01]
-pla.conBoi.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.332173824310303e-01, 8.303701281547546e-01, 8.301648497581482e-01, 8.300856947898865e-01, 8.300541043281555e-01, 8.300414681434631e-01, 8.300366401672363e-01, 8.300349116325378e-01, 8.300341367721558e-01, 8.300337195396423e-01, 8.30033540725708e-01, 8.300334215164185e-01, 8.300333619117737e-01, 8.300334215164185e-01, 8.300334215164185e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.282710313796997e-01, 8.020856380462646e-01, 7.513337731361389e-01, 6.846845149993896e-01, 6.107766032218933e-01, 5.382261872291565e-01, 4.756410419940948e-01, 4.316279590129852e-01, 4.147920906543732e-01, 4.149119555950165e-01, 4.149597585201263e-01, 4.149781465530396e-01, 4.149847626686096e-01, 4.149870872497559e-01, 4.149881303310394e-01, 4.149885475635529e-01, 4.149887263774872e-01, 4.149888455867767e-01, 4.149888753890991e-01, 4.149889051914215e-01, 4.149889349937439e-01, 4.149889349937439e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.15737122297287e-01, 4.196524620056152e-01, 4.266242682933807e-01, 4.363263845443726e-01, 4.484348297119141e-01, 4.626262784004211e-01, 4.785778224468231e-01, 4.959666728973389e-01, 5.144700407981873e-01, 5.337651968002319e-01, 5.535293817520142e-01, 5.7343989610672e-01, 5.931739807128906e-01, 6.124089956283569e-01, 6.308221817016602e-01, 6.480908393859863e-01, 6.638922095298767e-01]
+pla.conPum.y=[6.99999988079071e-01, 3.371609449386597e-01, 4.191201031208038e-01, 4.815050065517426e-01, 5.337050557136536e-01, 5.78672468662262e-01, 6.172996163368225e-01, 6.497573256492615e-01, 6.752736568450928e-01, 6.959642171859741e-01, 7.166070938110352e-01, 7.375763058662415e-01, 7.587911486625671e-01, 7.802302837371826e-01, 8.018950819969177e-01, 8.237956762313843e-01, 8.459432125091553e-01, 8.683477640151978e-01, 8.910192847251892e-01, 9.139670729637146e-01, 9.540978670120239e-01, 9.571428298950195e-01, 9.562363624572754e-01, 9.558830261230469e-01, 9.557427763938904e-01, 9.556865692138672e-01, 9.556649923324585e-01, 9.556573629379272e-01, 9.55653965473175e-01, 9.556521773338318e-01, 9.556513428688049e-01, 9.55650806427002e-01, 9.556505680084229e-01, 9.556506872177124e-01, 9.55650806427002e-01, 9.556509256362915e-01, 9.556509852409363e-01, 9.556510448455811e-01, 9.556510448455811e-01, 9.556510448455811e-01, 9.556511044502258e-01, 9.556511044502258e-01, 9.552282691001892e-01, 9.466167092323303e-01, 9.294245839118958e-01, 9.071628451347351e-01, 8.832326531410217e-01, 8.603535294532776e-01, 8.410468101501465e-01, 8.276832103729248e-01, 8.225669860839844e-01, 8.229405283927917e-01, 8.231251239776611e-01, 8.231963515281677e-01, 8.232219219207764e-01, 8.232309222221375e-01, 8.232349157333374e-01, 8.232365846633911e-01, 8.232372403144836e-01, 8.232376575469971e-01, 8.232378363609314e-01, 8.232379555702209e-01, 8.232380747795105e-01, 8.232380747795105e-01, 8.232381343841553e-01, 8.232381343841553e-01, 8.232381343841553e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.232381939888e-01, 8.234327435493469e-01, 8.245804309844971e-01, 8.26659619808197e-01, 8.29566478729248e-01, 8.332070708274841e-01, 8.374901413917542e-01, 8.423258066177368e-01, 8.476238250732422e-01, 8.532923460006714e-01, 8.592380285263062e-01, 8.653653860092163e-01, 8.715767860412598e-01, 8.777722716331482e-01, 8.838495016098022e-01, 8.897038698196411e-01, 8.952288627624512e-01, 9.00315523147583e-01]
+pla.conBoi.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.332173824310303e-01, 8.303701281547546e-01, 8.301648497581482e-01, 8.300856947898865e-01, 8.300541043281555e-01, 8.300414681434631e-01, 8.300366401672363e-01, 8.300349116325378e-01, 8.300341367721558e-01, 8.300337195396423e-01, 8.30033540725708e-01, 8.300334215164185e-01, 8.300333619117737e-01, 8.300334215164185e-01, 8.300334215164185e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.300334811210632e-01, 8.282710313796997e-01, 8.020856380462646e-01, 7.513337731361389e-01, 6.846845149993896e-01, 6.107766032218933e-01, 5.382261872291565e-01, 4.756410419940948e-01, 4.316279590129852e-01, 4.147920906543732e-01, 4.149119853973389e-01, 4.14959728717804e-01, 4.149781465530396e-01, 4.149847626686096e-01, 4.149870872497559e-01, 4.149881303310394e-01, 4.149885475635529e-01, 4.149887263774872e-01, 4.149888455867767e-01, 4.149888753890991e-01, 4.149889051914215e-01, 4.149889349937439e-01, 4.149889349937439e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.149889647960663e-01, 4.157370626926422e-01, 4.196524918079376e-01, 4.266242682933807e-01, 4.363263845443726e-01, 4.484348297119141e-01, 4.626262784004211e-01, 4.785778224468231e-01, 4.959666728973389e-01, 5.144700407981873e-01, 5.337651968002319e-01, 5.535293817520142e-01, 5.7343989610672e-01, 5.931739807128906e-01, 6.124089956283569e-01, 6.308221817016602e-01, 6.480908393859863e-01, 6.638922095298767e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
index c08939ac53b..f8b55812364 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_AirToWater2D_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-05-17
+last-generated=2024-05-28
 statistics-initialization=
 {
-  "nonlinear": "5, 1, 1, 1, 1",
+  "nonlinear": "5",
   "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.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.928719482421875e+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.032536926269531e+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.106855773925781e+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]
+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.982200622558594e+02, 2.97158447265625e+02, 2.957817687988281e+02, 2.953205261230469e+02, 2.9562890625e+02, 2.957838439941406e+02, 2.965177307128906e+02, 2.962039794921875e+02, 2.959082336425781e+02, 2.892634887695312e+02, 2.894605712890625e+02, 2.907706298828125e+02, 2.920339660644531e+02, 2.930657043457031e+02, 2.938260498046875e+02, 2.943192749023438e+02, 2.945739440917969e+02, 2.946323852539062e+02, 2.945427856445312e+02, 2.943532104492188e+02, 2.940932312011719e+02, 2.937789916992188e+02, 2.93447021484375e+02, 2.931388244628906e+02, 2.901953735351562e+02, 2.891919555664062e+02, 2.888753967285156e+02, 2.890163879394531e+02, 2.89490478515625e+02, 2.902430725097656e+02, 2.911509399414062e+02, 2.920552673339844e+02, 2.92802001953125e+02, 2.933180236816406e+02, 2.936148681640625e+02, 2.937462463378906e+02, 2.937908935546875e+02, 2.938128662109375e+02, 2.938264465332031e+02, 2.938162841796875e+02, 2.937498779296875e+02, 2.936128234863281e+02, 2.93429443359375e+02, 2.93231201171875e+02, 2.930529174804688e+02, 2.929289855957031e+02, 2.928719787597656e+02, 2.928667297363281e+02, 2.928837585449219e+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.167262573242188e+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.962228393554688e+02, 2.918812255859375e+02, 2.903455505371094e+02, 2.904980468750002e+02, 2.927996215820312e+02, 2.925937194824219e+02, 2.940502624511719e+02, 2.921875e+02, 2.922550659179688e+02, 2.969201354980469e+02, 3.003316345214844e+02, 3.027400207519531e+02, 3.046285705566406e+02, 3.060158081054688e+02, 3.069202880859375e+02, 3.0739453125e+02, 3.075140686035156e+02, 3.073646240234375e+02, 3.070320739746094e+02, 3.065950012207031e+02, 3.061190185546875e+02, 3.056505126953125e+02, 3.052276916503906e+02, 3.048839721679688e+02, 3.041907043457031e+02, 3.037576904296875e+02, 3.04055419921875e+02, 3.049043579101562e+02, 3.060832824707031e+02, 3.07414306640625e+02, 3.087528686523438e+02, 3.099640502929688e+02, 3.109379272460938e+02, 3.116130065917969e+02, 3.119960021972656e+02, 3.121408081054688e+02, 3.121227722167969e+02, 3.120157470703125e+02, 3.118672180175781e+02, 3.116957702636719e+02, 3.115028381347656e+02, 3.11286865234375e+02, 3.110620727539062e+02, 3.108533325195312e+02, 3.106856079101562e+02, 3.1057861328125e+02, 3.105409545898438e+02, 3.105635681152344e+02, 3.106250915527344e+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.990012817382812e+02, 2.942684631347656e+02, 2.923883056640625e+02, 2.918414611816406e+02, 2.928507080078125e+02, 2.926548461914062e+02, 2.940930480957031e+02, 2.921758728027344e+02, 2.923380432128906e+02, 2.936854248046875e+02, 2.966615600585938e+02, 2.988874816894531e+02, 3.00720703125e+02, 3.02141845703125e+02, 3.031408386230469e+02, 3.037449951171875e+02, 3.040087280273438e+02, 3.040013427734375e+02, 3.037967529296875e+02, 3.034661560058594e+02, 3.030695495605469e+02, 3.026481628417969e+02, 3.022399597167969e+02, 3.0188232421875e+02, 3.007144470214844e+02, 2.998561706542969e+02, 2.997336120605469e+02, 3.00196533203125e+02, 3.010502319335938e+02, 3.021420288085938e+02, 3.033359375e+02, 3.044878845214844e+02, 3.054644470214844e+02, 3.061783447265625e+02, 3.066169128417969e+02, 3.068217468261719e+02, 3.068642883300781e+02, 3.0681982421875e+02, 3.067354736328125e+02, 3.066264343261719e+02, 3.064869995117188e+02, 3.063079223632812e+02, 3.061004943847656e+02, 3.058898010253906e+02, 3.057044677734375e+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/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
index 73cc5cd8b5a..11e6ecf47ed 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_CarnotWithLosses_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-05-17
+last-generated=2024-05-28
 statistics-initialization=
 {
-  "nonlinear": "5, 1, 1",
+  "nonlinear": "5",
   "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.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.982427673339844e+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.043900451660156e+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]
+vol.T=[2.931499938964844e+02, 2.917250671386719e+02, 2.886859130859375e+02, 2.866959533691406e+02, 2.860057067871094e+02, 2.862413940429688e+02, 2.869990844726562e+02, 2.879868774414062e+02, 2.890216369628906e+02, 2.899989318847656e+02, 2.908688049316406e+02, 2.916095886230469e+02, 2.922151794433594e+02, 2.926875305175781e+02, 2.930193786621094e+02, 2.932230529785156e+02, 2.933351745605469e+02, 2.934008483886719e+02, 2.934582214355469e+02, 2.935157470703125e+02, 2.935619812011719e+02, 2.935757446289062e+02, 2.93549560546875e+02, 2.935038146972656e+02, 2.93449951171875e+02, 2.93394775390625e+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.925293579101562e+02, 2.896094360351562e+02, 2.896294250488281e+02, 2.902959594726562e+02, 2.911324462890625e+02, 2.9198974609375e+02, 2.92771240234375e+02, 2.934071960449219e+02, 2.938789367675781e+02, 2.942114868164062e+02, 2.944271850585938e+02, 2.945482788085938e+02, 2.945964050292969e+02, 2.945913391113281e+02, 2.9455029296875e+02, 2.945059509277344e+02, 3.001045532226562e+02, 2.982425231933594e+02, 2.940137939453125e+02, 2.943140869140625e+02, 2.951683959960938e+02, 2.96020263671875e+02, 2.967848815917969e+02, 2.974305419921875e+02, 2.979293823242188e+02, 2.967770385742188e+02, 2.856513671875e+02, 2.835741882324219e+02, 2.883721618652344e+02, 2.929720153808594e+02, 2.956014099121094e+02, 2.936730346679688e+02, 2.910821838378906e+02, 2.912540893554688e+02, 2.928012084960938e+02, 2.939553833007812e+02, 2.946370849609375e+02, 2.950349426269531e+02, 2.945740051269531e+02, 2.919945678710938e+02, 2.906835632324219e+02, 2.892365417480469e+02, 2.897383117675781e+02, 2.904513244628906e+02, 2.911238708496094e+02, 2.917189636230469e+02, 2.922969360351562e+02, 2.928441162109375e+02, 2.932956237792969e+02, 2.935733947753906e+02, 2.936625061035156e+02, 2.936136169433594e+02, 2.934986877441406e+02, 2.933966064453125e+02, 2.933580017089844e+02, 2.933754577636719e+02, 2.934110717773438e+02, 2.934137268066406e+02, 2.933562927246094e+02, 2.932557678222656e+02, 2.931380004882812e+02, 2.930326843261719e+02, 2.929696044921875e+02, 2.929572448730469e+02, 2.929777221679688e+02, 2.930016479492188e+02]
+temSup.T=[3.231499938964844e+02, 3.120057067871094e+02, 3.07809814453125e+02, 3.061662292480469e+02, 3.063208312988281e+02, 3.074596557617188e+02, 3.090387573242188e+02, 3.10721923828125e+02, 3.123184814453125e+02, 3.137313537597656e+02, 3.149215698242188e+02, 3.158840026855469e+02, 3.166312255859375e+02, 3.171846618652344e+02, 3.175671081542969e+02, 3.178027954101562e+02, 3.179252319335938e+02, 3.179719848632812e+02, 3.179771118164062e+02, 3.179609985351562e+02, 3.179289245605469e+02, 3.178775634765625e+02, 3.178033447265625e+02, 3.177141723632812e+02, 3.176211547851562e+02, 3.175321960449219e+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.139915466308593e+02, 3.047018432617188e+02, 3.043232116699219e+02, 3.055123901367188e+02, 3.066804809570312e+02, 3.078080749511719e+02, 3.087998046875e+02, 3.095923767089844e+02, 3.101539916992188e+02, 3.104812622070312e+02, 3.10600341796875e+02, 3.105481872558594e+02, 3.103621826171875e+02, 3.100768127441406e+02, 3.097225952148438e+02, 3.093250732421875e+02, 3.0902783203125e+02, 3.044494018554688e+02, 2.851355895996094e+02, 2.884056396484375e+02, 2.905619201660156e+02, 2.92069580078125e+02, 2.933016662597656e+02, 2.94355224609375e+02, 2.952643432617188e+02, 2.960365295410156e+02, 2.835647583007812e+02, 2.83724609375e+02, 2.928941650390625e+02, 3.037863464355469e+02, 3.094819641113281e+02, 3.0831982421875e+02, 3.022811889648438e+02, 2.98442626953125e+02, 3.039031982421875e+02, 3.063108825683594e+02, 3.076353454589844e+02, 3.083329467773438e+02, 3.088265075683594e+02, 3.046014709472656e+02, 2.996952514648438e+02, 3.025931091308594e+02, 3.050462341308594e+02, 3.065529174804688e+02, 3.078464050292969e+02, 3.089508666992188e+02, 3.098541870117188e+02, 3.105766906738281e+02, 3.111409912109375e+02, 3.115467224121094e+02, 3.117842712402344e+02, 3.118587951660156e+02, 3.1180859375e+02, 3.116888427734375e+02, 3.115542907714844e+02, 3.114446411132812e+02, 3.113703002929688e+02, 3.113179016113281e+02, 3.112651672363281e+02, 3.111954040527344e+02, 3.111118774414062e+02, 3.110299682617188e+02, 3.109668273925781e+02, 3.109361267089844e+02, 3.109426574707031e+02, 3.109779357910156e+02, 3.110259704589844e+02]
+temRet.T=[3.231499938964844e+02, 3.099337158203125e+02, 3.055304565429688e+02, 3.033739013671875e+02, 3.031012878417969e+02, 3.039293823242188e+02, 3.052971496582031e+02, 3.068430480957031e+02, 3.083553466796875e+02, 3.097212524414062e+02, 3.108908996582031e+02, 3.118514099121094e+02, 3.126092529296875e+02, 3.131810302734375e+02, 3.13584228515625e+02, 3.138390502929688e+02, 3.139778137207031e+02, 3.140391845703125e+02, 3.140596313476562e+02, 3.140606994628906e+02, 3.140469360351562e+02, 3.140127258300781e+02, 3.139521789550781e+02, 3.138734436035156e+02, 3.137881469726562e+02, 3.137046203613281e+02, 3.136281127929688e+02, 3.135614318847656e+02, 3.135056457519531e+02, 3.13460693359375e+02, 3.134265747070312e+02, 3.134095458984375e+02, 3.134131164550781e+02, 3.134311828613281e+02, 3.135132446289062e+02, 3.044537963867188e+02, 3.019857482910156e+02, 3.029914855957031e+02, 3.040610046386719e+02, 3.051483154296875e+02, 3.061447448730469e+02, 3.069744567871094e+02, 3.075933837890625e+02, 3.079887390136719e+02, 3.081819763183594e+02, 3.082065734863281e+02, 3.080973815917969e+02, 3.078871765136719e+02, 3.076052856445312e+02, 3.072766723632812e+02, 3.069884643554688e+02, 3.043909301757812e+02, 2.905676574707031e+02, 2.885037841796875e+02, 2.906221618652344e+02, 2.921186828613281e+02, 2.933450622558594e+02, 2.943946228027344e+02, 2.953002014160156e+02, 2.96068603515625e+02, 2.885838012695312e+02, 2.837427673339844e+02, 2.884351806640625e+02, 3.000410461425781e+02, 3.061963500976562e+02, 3.080410461425781e+02, 3.021223449707031e+02, 2.979292907714844e+02, 3.015148315429688e+02, 3.040485534667969e+02, 3.055101013183594e+02, 3.062833251953125e+02, 3.067966918945312e+02, 3.044093627929688e+02, 2.99555419921875e+02, 3.002203979492188e+02, 3.024376831054688e+02, 3.038185119628906e+02, 3.050379943847656e+02, 3.060997314453125e+02, 3.069822998046875e+02, 3.077073974609375e+02, 3.08296142578125e+02, 3.087405395507812e+02, 3.090187683105469e+02, 3.091258239746094e+02, 3.0909619140625e+02, 3.089862365722656e+02, 3.088560180664062e+02, 3.087520751953125e+02, 3.086878051757812e+02, 3.086490173339844e+02, 3.086090087890625e+02, 3.085459594726562e+02, 3.084616088867188e+02, 3.083719177246094e+02, 3.0829638671875e+02, 3.082525329589844e+02, 3.082485046386719e+02, 3.082766418457031e+02, 3.083194580078125e+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/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
index 16696d1b283..32ff9fc1331 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_LargeScaleWaterToWater_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-05-17
+last-generated=2024-05-28
 statistics-initialization=
 {
-  "nonlinear": "5, 1, 1",
+  "nonlinear": "5",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
@@ -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.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.935372009277344e+02, 2.935014343261719e+02, 2.934984130859375e+02, 2.935018005371094e+02, 2.934681396484375e+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.112384033203125e+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.083186645507812e+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]
+vol.T=[2.931499938964844e+02, 2.93125244140625e+02, 2.893094177246094e+02, 2.86515625e+02, 2.852822570800781e+02, 2.853415222167969e+02, 2.86269287109375e+02, 2.876618041992188e+02, 2.891967468261719e+02, 2.906513977050781e+02, 2.918984985351562e+02, 2.92880126953125e+02, 2.935855712890625e+02, 2.940329895019531e+02, 2.942425842285156e+02, 2.942582702636719e+02, 2.941476135253906e+02, 2.939830627441406e+02, 2.938242797851562e+02, 2.936941223144531e+02, 2.935885009765625e+02, 2.934876708984375e+02, 2.933820190429688e+02, 2.932876586914062e+02, 2.932112121582031e+02, 2.931544494628906e+02, 2.931164245605469e+02, 2.930946960449219e+02, 2.930859069824219e+02, 2.930866088867188e+02, 2.930985717773438e+02, 2.9314111328125e+02, 2.932146301269531e+02, 2.933056335449219e+02, 2.952905883789062e+02, 2.917188415527344e+02, 2.889768676757812e+02, 2.887237243652344e+02, 2.892603454589844e+02, 2.901995239257812e+02, 2.913100891113281e+02, 2.924013061523438e+02, 2.933297119140625e+02, 2.940301513671875e+02, 2.945070495605469e+02, 2.947824096679688e+02, 2.9489111328125e+02, 2.948739624023438e+02, 2.947716369628906e+02, 2.946207580566406e+02, 2.944516906738281e+02, 2.995132751464844e+02, 2.99698974609375e+02, 2.987921447753906e+02, 2.977092895507812e+02, 2.967884826660156e+02, 2.961298522949219e+02, 2.957061462402344e+02, 2.954540100097656e+02, 2.960680236816406e+02, 2.965196533203125e+02, 2.890726928710938e+02, 2.878395385742188e+02, 2.904207763671875e+02, 2.929597473144531e+02, 2.947701416015625e+02, 2.94256591796875e+02, 2.915326843261719e+02, 2.9075244140625e+02, 2.917359313964844e+02, 2.927305603027344e+02, 2.934844665527344e+02, 2.939580993652344e+02, 2.941589965820312e+02, 2.941998901367188e+02, 2.941813049316406e+02, 2.91353271484375e+02, 2.903870544433594e+02, 2.900783081054688e+02, 2.901890869140625e+02, 2.905885009765625e+02, 2.91221923828125e+02, 2.919698181152344e+02, 2.926812133789062e+02, 2.932157287597656e+02, 2.935193786621094e+02, 2.936246643066406e+02, 2.936022644042969e+02, 2.935404052734375e+02, 2.935039672851562e+02, 2.93500244140625e+02, 2.935029907226562e+02, 2.934687805175781e+02, 2.93375244140625e+02, 2.932422485351562e+02, 2.930983276367188e+02, 2.929755554199219e+02, 2.929051513671875e+02, 2.928957824707031e+02, 2.929281311035156e+02, 2.929697875976562e+02]
+temSup.T=[3.231499938964844e+02, 3.132328796386719e+02, 3.075495300292969e+02, 3.048960571289062e+02, 3.046547241210938e+02, 3.06019287109375e+02, 3.082662658691406e+02, 3.108125305175781e+02, 3.132530517578125e+02, 3.153485717773438e+02, 3.169908752441406e+02, 3.181623229980469e+02, 3.188997802734375e+02, 3.192695007324219e+02, 3.193473815917969e+02, 3.192107849121094e+02, 3.189413452148438e+02, 3.18615234375e+02, 3.182929077148438e+02, 3.180088500976562e+02, 3.177718505859375e+02, 3.175754699707031e+02, 3.174096069335938e+02, 3.172744445800781e+02, 3.171726684570312e+02, 3.17103271484375e+02, 3.170623168945312e+02, 3.170443115234375e+02, 3.170433654785156e+02, 3.170537719726562e+02, 3.170709838867188e+02, 3.17095947265625e+02, 3.171277770996094e+02, 3.17157470703125e+02, 3.121165771484374e+02, 3.025310974121094e+02, 3.02875732421875e+02, 3.036237182617188e+02, 3.049174194335938e+02, 3.064739074707031e+02, 3.080124816894531e+02, 3.093321228027344e+02, 3.103139953613281e+02, 3.109141235351562e+02, 3.111550903320312e+02, 3.110940856933594e+02, 3.108009948730469e+02, 3.103468933105469e+02, 3.097970581054688e+02, 3.092063293457031e+02, 3.086170959472656e+02, 3.030761413574219e+02, 2.994175415039062e+02, 2.963576965332031e+02, 2.940987548828125e+02, 2.924556579589844e+02, 2.913078918457031e+02, 2.905625610351562e+02, 2.910955810546875e+02, 2.931913452148438e+02, 2.920854187011719e+02, 2.925428161621094e+02, 2.988048706054688e+02, 3.041518249511719e+02, 3.076205444335938e+02, 3.096827392578125e+02, 3.030755615234375e+02, 2.98312744140625e+02, 3.020038757324219e+02, 3.040534057617188e+02, 3.054917602539062e+02, 3.064266967773438e+02, 3.069188842773438e+02, 3.07085693359375e+02, 3.071860046386719e+02, 3.0722607421875e+02, 3.064916687011719e+02, 3.060168762207031e+02, 3.062209777832031e+02, 3.069154663085938e+02, 3.078760986328125e+02, 3.089305114746094e+02, 3.099454345703125e+02, 3.108056640625e+02, 3.114287109375e+02, 3.117846374511719e+02, 3.119072570800781e+02, 3.118670959472656e+02, 3.117433471679688e+02, 3.116012573242188e+02, 3.114718322753906e+02, 3.113556213378906e+02, 3.112388610839844e+02, 3.111103515625e+02, 3.109784545898438e+02, 3.108631896972656e+02, 3.107846984863281e+02, 3.107571716308594e+02, 3.107831420898438e+02, 3.10848876953125e+02, 3.109317321777344e+02]
+temRet.T=[3.231499938964844e+02, 3.109277648925781e+02, 3.050867919921875e+02, 3.017288208007812e+02, 3.00767822265625e+02, 3.015077819824219e+02, 3.032779846191406e+02, 3.055037841796875e+02, 3.0776171875e+02, 3.097831420898438e+02, 3.114293823242188e+02, 3.126560363769531e+02, 3.134779968261719e+02, 3.139444885253906e+02, 3.141167907714844e+02, 3.140618286132812e+02, 3.138567504882812e+02, 3.135785522460938e+02, 3.132922668457031e+02, 3.130365295410156e+02, 3.12822265625e+02, 3.126424865722656e+02, 3.124857788085938e+02, 3.123537902832031e+02, 3.122509155273438e+02, 3.121776428222656e+02, 3.121314392089844e+02, 3.121077575683594e+02, 3.121014404296875e+02, 3.121072387695312e+02, 3.121212768554688e+02, 3.121475219726562e+02, 3.121877136230469e+02, 3.122333984375e+02, 3.120243225097656e+02, 3.024447326660157e+02, 3.002640380859375e+02, 3.006314086914062e+02, 3.016367492675781e+02, 3.030093994140625e+02, 3.044667053222656e+02, 3.057919616699219e+02, 3.068429870605469e+02, 3.075525512695312e+02, 3.0792578125e+02, 3.08006103515625e+02, 3.078530883789062e+02, 3.075309143066406e+02, 3.071007080078125e+02, 3.066156616210938e+02, 3.061183471679688e+02, 3.029993286132812e+02, 3.003806457519531e+02, 2.973302612304688e+02, 2.950841979980469e+02, 2.934295043945312e+02, 2.922571411132812e+02, 2.914814453125e+02, 2.910217590332031e+02, 2.931203002929688e+02, 2.930205078125e+02, 2.924661560058594e+02, 2.952695007324219e+02, 3.005777282714844e+02, 3.041963195800781e+02, 3.065003356933594e+02, 3.029920349121094e+02, 2.982320251464844e+02, 2.994301452636719e+02, 3.014225769042969e+02, 3.028842468261719e+02, 3.038895568847656e+02, 3.044745788574219e+02, 3.047039794921875e+02, 3.048056335449219e+02, 3.0484619140625e+02, 3.038850708007812e+02, 3.031323547363281e+02, 3.030699157714844e+02, 3.035335388183594e+02, 3.043146667480469e+02, 3.052546691894531e+02, 3.062218322753906e+02, 3.070889282226562e+02, 3.077512817382812e+02, 3.081567077636719e+02, 3.083247985839844e+02, 3.083197937011719e+02, 3.082225341796875e+02, 3.081044006347656e+02, 3.080001831054688e+02, 3.0791015625e+02, 3.078158874511719e+02, 3.076999816894531e+02, 3.075683898925781e+02, 3.074414978027344e+02, 3.073427734375e+02, 3.072919921875e+02, 3.072972717285156e+02, 3.073474426269531e+02, 3.074189758300781e+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, 0e+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/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
index c8a1b030608..3e226848d4b 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatPumps_ModularReversible_Examples_Modular_OneRoomRadiator.txt
@@ -1,7 +1,7 @@
-last-generated=2024-05-17
+last-generated=2024-05-28
 statistics-initialization=
 {
-  "nonlinear": "5, 1, 1",
+  "nonlinear": "5",
   "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.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]
+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.90918701171875e+02, 2.991891784667969e+02, 3.057781677246094e+02, 3.087584838867188e+02, 3.073666381835938e+02, 3.008912963867188e+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.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.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]
 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]
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_11_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_11_1_0.mo
index 2635e8719f5..75586326aaa 100644
--- a/Buildings/UsersGuide/ReleaseNotes/Version_11_1_0.mo
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_11_1_0.mo
@@ -60,6 +60,64 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3796\">#3796</a>.
     </td>
 </tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples.ChillerSetPointControl<br/>
+                       Buildings.Examples.Tutorial.Boiler.System2<br/>
+                       Buildings.Examples.Tutorial.Boiler.System3<br/>
+                       Buildings.Examples.Tutorial.Boiler.System4<br/>
+                       Buildings.Examples.Tutorial.Boiler.System5<br/>
+                       Buildings.Examples.Tutorial.Boiler.System6<br/>
+                       Buildings.Examples.Tutorial.Boiler.System7<br/>
+                       Buildings.Examples.Tutorial.SpaceCooling.System2<br/>
+                       Buildings.Examples.Tutorial.SpaceCooling.System3
+    </td>
+    <td valign=\"top\">Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+                       in the mover component to suppress a warning.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop<br/>
+                       Buildings.Fluid.FMI.ExportContainers.Examples.FMUs.Fan<br/>
+                       Buildings.Fluid.FMI.ExportContainers.Examples.FMUs.HVACZones<br/>
+                       Buildings.Fluid.Geothermal.Borefields.Examples.RectangularBorefield<br/>
+                       Buildings.Fluid.Movers.Examples.MoverParameter<br/>
+                       Buildings.Fluid.Movers.Validation.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.Validation.FlowControlled_dpSystem<br/>
+                       Buildings.Fluid.Movers.Validation.FlowControlled_m_flow<br/>
+                       Buildings.Fluid.Movers.Validation.Pump_y_stratos<br/>
+                       Buildings.Fluid.Movers.Validation.PumpCurveDerivatives
+    </td>
+    <td valign=\"top\">Specified <code>nominalValuesDefineDefaultPressureCurve=true</code>
+                       in the mover component to suppress a warning.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI.ExportContainers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FMI.ExportContainers.Validation.RoomHVAC
+    </td>
+    <td valign=\"top\">Removed redundant <code>nominalValuesDefineDefaultPressureCurve=true</code>
+                       which is now modified in a lower-level model.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.Data.Generic
+    </td>
+    <td valign=\"top\">Default efficiency method assignments now depend on
+                       the availability of pressure curves.
+                       This reduces the occurrance of a warning message.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3819\">#3819</a>.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>xxx</b>
     </td>
 </tr>
