From ff220be7124e15a629f9b2ba4f60aadcc9290a9d Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Fri, 10 Feb 2023 16:05:39 -0800
Subject: [PATCH 1/5] Merged IBPSA

---
 .../BaseClasses/PartialThreeWayValve.mo       |  9 +---
 .../Fluid/Chillers/BaseClasses/Carnot.mo      | 47 ++++++++++++-------
 Buildings/Fluid/Chillers/Carnot_TEva.mo       | 46 +++++++++++-------
 Buildings/Fluid/Chillers/Carnot_y.mo          | 46 ++++++++++++------
 .../Fluid/Chillers/Examples/Carnot_TEva.mo    |  9 +++-
 Buildings/Fluid/Chillers/Examples/Carnot_y.mo |  9 +++-
 .../Chillers/Validation/Carnot_TEva_2ndLaw.mo |  7 ++-
 .../Validation/Carnot_TEva_reverseFlow.mo     |  7 ++-
 Buildings/Fluid/HeatPumps/Carnot_TCon.mo      | 46 ++++++++++++------
 Buildings/Fluid/HeatPumps/Carnot_y.mo         | 47 +++++++++++++------
 .../Fluid/HeatPumps/Examples/Carnot_TCon.mo   |  9 +++-
 .../Validation/Carnot_TCon_reverseFlow.mo     | 11 +++--
 Buildings/package.mo                          | 22 +++++++++
 13 files changed, 223 insertions(+), 92 deletions(-)
diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index ff2441a739e..1fa5481c66c 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -7,6 +7,7 @@ partial model PartialThreeWayValve "Partial three way valve"
       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve res1
         constrainedby Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
           deltaM=deltaM,
+          dp(start=dpValve_nominal/2),
           from_dp=from_dp,
           final linearized=linearized[1],
           final homotopyInitialization=homotopyInitialization,
@@ -22,6 +23,7 @@ partial model PartialThreeWayValve "Partial three way valve"
       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve res3
         constrainedby Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
           deltaM=deltaM,
+          dp(start=dpValve_nominal/2),
           from_dp=from_dp,
           final linearized=linearized[2],
           final homotopyInitialization=homotopyInitialization,
@@ -152,13 +154,6 @@ for details regarding the valve implementation.
 </html>", revisions="<html>
 <ul>
 <li>
-February 3, 2023, by Michael Wetter:<br/>
-Removed start value for <code>dp</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">
-https://github.com/lbl-srg/modelica-buildings/issues/3231</a>.
-</li>
-<li>
 November 16, 2022, by Michael Wetter:<br/>
 Propagated parameter <code>riseTime</code> to valves. The value is not used as the filter is disabled,
 but it will show in the result file. Having a consistent value for all these parameters in the result filter
diff --git a/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo b/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
index bee045357b4..cce66be7a1a 100644
--- a/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
+++ b/Buildings/Fluid/Chillers/BaseClasses/Carnot.mo
@@ -24,14 +24,13 @@ partial model Carnot
   parameter Boolean use_eta_Carnot_nominal = true
     "Set to true to use Carnot effectiveness etaCarnot_nominal rather than COP_nominal"
     annotation(Dialog(group="Efficiency"));
-  parameter Real etaCarnot_nominal(unit="1") = COP_nominal/
-    (TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))
-    "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true"
+  parameter Real etaCarnot_nominal(unit="1") = 0.3
+    "Carnot effectiveness (=COP/COP_Carnot) used during simulation if use_eta_Carnot_nominal = true"
     annotation (Dialog(group="Efficiency", enable=use_eta_Carnot_nominal));
 
   parameter Real COP_nominal(unit="1") = etaCarnot_nominal*TUseAct_nominal/
     (TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal))
-    "Coefficient of performance at TEva_nominal and TCon_nominal, used if use_eta_Carnot_nominal = false"
+    "Coefficient of performance at TEva_nominal and TCon_nominal, used during simulation if use_eta_Carnot_nominal = false"
     annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal));
 
   parameter Modelica.Units.SI.Temperature TCon_nominal=303.15
@@ -336,24 +335,30 @@ whose coefficient of performance COP changes
 with temperatures in the same way as the Carnot efficiency changes.
 </p>
 <p>
-The model allows to either specify the Carnot effectiveness
-<i>&eta;<sub>Carnot,0</sub></i>, or
-a <i>COP<sub>0</sub></i>
-at the nominal conditions, together with
-the evaporator temperature <i>T<sub>eva,0</sub></i> and
-the condenser temperature <i>T<sub>con,0</sub></i>, in which
-case the model computes the Carnot effectiveness as
+Set <code>use_eta_Carnot_nominal=true</code> to specify directly
+the Carnot effectiveness <i>&eta;<sub>Carnot,0</sub></i>,
+in which case the value of the parameter <code>COP_nominal</code>
+will not affect the simulation.
+If <code>use_eta_Carnot_nominal=false</code>, the model will use
+the value of the parameter <code>COP_nominal</code>
+together with the specified nominal temperatures
+to compute the Carnot effectiveness as
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
 &eta;<sub>Carnot,0</sub> =
   COP<sub>0</sub>
-&frasl;  (T<sub>use,0</sub> &frasl; (T<sub>con,0</sub>-T<sub>eva,0</sub>)),
+&frasl;  (T<sub>use,0</sub> &frasl; (T<sub>con,0</sub> + T<sub>app,con,0</sub> - (T<sub>eva,0</sub>-T<sub>app,eva,0</sub>))),
 </p>
 <p>
 where
-<i>T<sub>use</sub></i> is the temperature of the the useful heat,
-e.g., the evaporator temperature for a chiller or the condenser temperature
-for a heat pump.
+<i>T<sub>eva,0</sub></i> is the evaporator temperature,
+<i>T<sub>con,0</sub></i> is the condenser temperature,
+<i>T<sub>app,eva,0</sub></i> is the evaporator approach temperature,
+<i>T<sub>app,con,0</sub></i> is the condenser approach temperature, and
+<i>T<sub>use,0</sub></i> is the temperature of the the useful heat.
+If <code>COP_is_for_cooling=true</code>,
+then <i>T<sub>use,0</sub></i> is the condenser temperature of a heat pump plus the approach temperature,
+otherwise it is the evaporator temperature minus the approach temperature of a chiller.
 </p>
 <p>
 The COP is computed as the product
@@ -368,7 +373,7 @@ a polynomial.
 This polynomial has the form
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...
+  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...,
 </p>
 <p>
 where <i>y &isin; [0, 1]</i> is
@@ -386,6 +391,16 @@ and the part load ratio are set up.
 </html>", revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Changed parameter binding
+<code>etaCarnot_nominal(unit=\"1\") = COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+to
+<code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+Improved documentation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">Buildings, #3226</a>.
+</li>
+<li>
 April 14, 2020, by Michael Wetter:<br/>
 Changed <code>homotopyInitialization</code> to a constant.<br/>
 This is for
diff --git a/Buildings/Fluid/Chillers/Carnot_TEva.mo b/Buildings/Fluid/Chillers/Carnot_TEva.mo
index fadf2e17384..f434647d7c5 100644
--- a/Buildings/Fluid/Chillers/Carnot_TEva.mo
+++ b/Buildings/Fluid/Chillers/Carnot_TEva.mo
@@ -76,41 +76,45 @@ The control input is the setpoint of the evaporator leaving temperature, which
 is met exactly at steady state if the chiller has sufficient capacity.
 </p>
 <p>
-The model allows to either specify the Carnot effectiveness
-<i>&eta;<sub>Carnot,0</sub></i>, or
-a <i>COP<sub>0</sub></i>
-at the nominal conditions, together with
-the evaporator temperature <i>T<sub>eva,0</sub></i> and
-the condenser temperature <i>T<sub>con,0</sub></i>, in which
-case the model computes the Carnot effectiveness as
+Set <code>use_eta_Carnot_nominal=true</code> to specify directly
+the Carnot effectiveness <i>&eta;<sub>Carnot,0</sub></i>,
+in which case the value of the parameter <code>COP_nominal</code>
+will not affect the simulation.
+If <code>use_eta_Carnot_nominal=false</code>, the model will use
+the value of the parameter <code>COP_nominal</code>
+together with the specified nominal temperatures
+to compute the Carnot effectiveness as
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
 &eta;<sub>Carnot,0</sub> =
   COP<sub>0</sub>
-&frasl;  (T<sub>eva,0</sub> &frasl; (T<sub>con,0</sub>-T<sub>eva,0</sub>)).
+&frasl;  (T<sub>eva,0</sub> &frasl; (T<sub>con,0</sub> + T<sub>app,con,0</sub> - (T<sub>eva,0</sub>-T<sub>app,eva,0</sub>))),
 </p>
 <p>
-On the <code>Advanced</code> tab, a user can specify the temperatures that
-will be used as the evaporator and condenser temperature.
+where
+<i>T<sub>eva,0</sub></i> is the evaporator temperature,
+<i>T<sub>con,0</sub></i> is the condenser temperature,
+<i>T<sub>app,eva,0</sub></i> is the evaporator approach temperature and
+<i>T<sub>app,con,0</sub></i> is the condenser approach temperature.
 </p>
 <p>
-During the simulation, the chiller COP is computed as the product
+The COP is computed as the product
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
   COP = &eta;<sub>Carnot,0</sub> COP<sub>Carnot</sub> &eta;<sub>PL</sub>,
 </p>
 <p>
 where <i>COP<sub>Carnot</sub></i> is the Carnot efficiency and
-<i>&eta;<sub>PL</sub></i> is a polynomial in the cooling part load ratio <i>y<sub>PL</sub></i>
-that can be used to take into account a change in <i>COP</i> at part load
-conditions.
+<i>&eta;<sub>PL</sub></i> is the part load efficiency, expressed using
+a polynomial.
 This polynomial has the form
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y<sub>PL</sub> + a<sub>3</sub> y<sub>PL</sub><sup>2</sup> + ...
+  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...,
 </p>
 <p>
-where the coefficients <i>a<sub>i</sub></i>
+where <i>y &isin; [0, 1]</i> is
+the part load for cooling and the coefficients <i>a<sub>i</sub></i>
 are declared by the parameter <code>a</code>.
 </p>
 <p>
@@ -153,6 +157,16 @@ Buildings.Fluid.HeatPumps.Examples.Carnot_TCon</a>.
 revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Changed in base class the parameter binding
+<code>etaCarnot_nominal(unit=\"1\") = COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+to
+<code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+Improved documentation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">Buildings, #3226</a>.
+</li>
+<li>
 May 8, 2017, by Michael Wetter:<br/>
 Replaced model that interfaces with fluid stream.<br/>
 This is for
diff --git a/Buildings/Fluid/Chillers/Carnot_y.mo b/Buildings/Fluid/Chillers/Carnot_y.mo
index 3d4ad031774..c5845c619af 100644
--- a/Buildings/Fluid/Chillers/Carnot_y.mo
+++ b/Buildings/Fluid/Chillers/Carnot_y.mo
@@ -13,37 +13,45 @@ with temperatures in the same way as the Carnot efficiency changes.
 The input signal <i>y</i> is the control signal for the compressor.
 </p>
 <p>
-The model allows to either specify the Carnot effectiveness
-<i>&eta;<sub>Carnot,0</sub></i>, or
-a <i>COP<sub>0</sub></i>
-at the nominal conditions, together with
-the evaporator temperature <i>T<sub>eva,0</sub></i> and
-the condenser temperature <i>T<sub>con,0</sub></i>, in which
-case the model computes the Carnot effectiveness as
+Set <code>use_eta_Carnot_nominal=true</code> to specify directly
+the Carnot effectiveness <i>&eta;<sub>Carnot,0</sub></i>,
+in which case the value of the parameter <code>COP_nominal</code>
+will not affect the simulation.
+If <code>use_eta_Carnot_nominal=false</code>, the model will use
+the value of the parameter <code>COP_nominal</code>
+together with the specified nominal temperatures
+to compute the Carnot effectiveness as
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
 &eta;<sub>Carnot,0</sub> =
   COP<sub>0</sub>
-&frasl;  (T<sub>eva,0</sub> &frasl; (T<sub>con,0</sub>-T<sub>eva,0</sub>)).
+&frasl;  (T<sub>eva,0</sub> &frasl; (T<sub>con,0</sub> + T<sub>app,con,0</sub> - (T<sub>eva,0</sub>-T<sub>app,eva,0</sub>))),
 </p>
 <p>
-The chiller COP is computed as the product
+where
+<i>T<sub>eva,0</sub></i> is the evaporator temperature,
+<i>T<sub>con,0</sub></i> is the condenser temperature,
+<i>T<sub>app,eva,0</sub></i> is the evaporator approach temperature and
+<i>T<sub>app,con,0</sub></i> is the condenser approach temperature.
+</p>
+<p>
+The COP is computed as the product
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
   COP = &eta;<sub>Carnot,0</sub> COP<sub>Carnot</sub> &eta;<sub>PL</sub>,
 </p>
 <p>
 where <i>COP<sub>Carnot</sub></i> is the Carnot efficiency and
-<i>&eta;<sub>PL</sub></i> is a polynomial in the cooling part load ratio <i>y<sub>PL</sub></i>
-that can be used to take into account a change in <i>COP</i> at part load
-conditions.
+<i>&eta;<sub>PL</sub></i> is the part load efficiency, expressed using
+a polynomial.
 This polynomial has the form
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y<sub>PL</sub> + a<sub>3</sub> y<sub>PL</sub><sup>2</sup> + ...
+  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...,
 </p>
 <p>
-where the coefficients <i>a<sub>i</sub></i>
+where <i>y &isin; [0, 1]</i> is
+the part load for cooling and the coefficients <i>a<sub>i</sub></i>
 are declared by the parameter <code>a</code>.
 </p>
 <p>
@@ -85,6 +93,16 @@ For a similar model that can be used as a heat pump, see
 revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Changed in base class the parameter binding
+<code>etaCarnot_nominal(unit=\"1\") = COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+to
+<code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+Improved documentation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">Buildings, #3226</a>.
+</li>
+<li>
 January 2, 2017, by Filip Jorissen:<br/>
 Removed parameters
 <code>effInpEva</code> and <code>effInpCon</code>
diff --git a/Buildings/Fluid/Chillers/Examples/Carnot_TEva.mo b/Buildings/Fluid/Chillers/Examples/Carnot_TEva.mo
index c3d32d137cf..753f1d15fae 100644
--- a/Buildings/Fluid/Chillers/Examples/Carnot_TEva.mo
+++ b/Buildings/Fluid/Chillers/Examples/Carnot_TEva.mo
@@ -26,7 +26,6 @@ model Carnot_TEva
     allowFlowReversal1=false,
     allowFlowReversal2=false,
     use_eta_Carnot_nominal=true,
-    etaCarnot_nominal=0.3,
     dp1_nominal=6000,
     dp2_nominal=6000) "Chiller model"
     annotation (Placement(transformation(extent={{10,-10},{30,10}})));
@@ -115,8 +114,14 @@ a temperature difference equal to <code>dTEva_nominal</code>.
 revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/Chillers/Examples/Carnot_y.mo b/Buildings/Fluid/Chillers/Examples/Carnot_y.mo
index d04873a2e77..5a895b64f12 100644
--- a/Buildings/Fluid/Chillers/Examples/Carnot_y.mo
+++ b/Buildings/Fluid/Chillers/Examples/Carnot_y.mo
@@ -26,7 +26,6 @@ model Carnot_y "Test model for chiller based on Carnot_y efficiency"
     dTEva_nominal=dTEva_nominal,
     dTCon_nominal=dTCon_nominal,
     use_eta_Carnot_nominal=true,
-    etaCarnot_nominal=0.3,
     dp1_nominal=6000,
     dp2_nominal=6000,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -113,8 +112,14 @@ __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Chil
     Documentation(revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo b/Buildings/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo
index 5b7a66f03ec..9253baf7ab7 100644
--- a/Buildings/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo
+++ b/Buildings/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo
@@ -88,7 +88,6 @@ protected
       QEva_flow_nominal=QEva_flow_nominal,
       allowFlowReversal1=false,
       allowFlowReversal2=false,
-      etaCarnot_nominal=0.3,
       dp1_nominal=0,
       dp2_nominal=0,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
@@ -226,6 +225,12 @@ despite of a very small temperature lift.
 </html>", revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
 Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
diff --git a/Buildings/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo b/Buildings/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo
index 80e3aee87b5..91d642a2057 100644
--- a/Buildings/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo
+++ b/Buildings/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo
@@ -24,7 +24,6 @@ model Carnot_TEva_reverseFlow
     dTEva_nominal=dTEva_nominal,
     dTCon_nominal=dTCon_nominal,
     use_eta_Carnot_nominal=true,
-    etaCarnot_nominal=0.3,
     m1_flow_nominal=m1_flow_nominal,
     m2_flow_nominal=m2_flow_nominal,
     show_T=true,
@@ -131,6 +130,12 @@ This example checks the correct behavior if a mass flow rate attains zero.
 revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
 Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
diff --git a/Buildings/Fluid/HeatPumps/Carnot_TCon.mo b/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
index 6752867e3ef..e1c0b6863c2 100644
--- a/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
+++ b/Buildings/Fluid/HeatPumps/Carnot_TCon.mo
@@ -81,37 +81,45 @@ The control input is the setpoint of the condenser leaving temperature, which
 is met exactly at steady state if the heat pump has sufficient capacity.
 </p>
 <p>
-The model allows to either specify the Carnot effectivness
-<i>&eta;<sub>Carnot,0</sub></i>, or
-a <i>COP<sub>0</sub></i>
-at the nominal conditions, together with
-the evaporator temperature <i>T<sub>eva,0</sub></i> and
-the condenser temperature <i>T<sub>con,0</sub></i>, in which
-case the model computes the Carnot effectivness as
+Set <code>use_eta_Carnot_nominal=true</code> to specify directly
+the Carnot effectiveness <i>&eta;<sub>Carnot,0</sub></i>,
+in which case the value of the parameter <code>COP_nominal</code>
+will not affect the simulation.
+If <code>use_eta_Carnot_nominal=false</code>, the model will use
+the value of the parameter <code>COP_nominal</code>
+together with the specified nominal temperatures
+to compute the Carnot effectiveness as
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
 &eta;<sub>Carnot,0</sub> =
   COP<sub>0</sub>
-&frasl;  (T<sub>con,0</sub> &frasl; (T<sub>con,0</sub>-T<sub>eva,0</sub>)).
+&frasl;  (T<sub>con,0</sub> &frasl; (T<sub>con,0</sub> + T<sub>app,con,0</sub> - (T<sub>eva,0</sub>-T<sub>app,eva,0</sub>))),
 </p>
 <p>
-The heat pump COP is computed as the product
+where
+<i>T<sub>eva,0</sub></i> is the evaporator temperature,
+<i>T<sub>con,0</sub></i> is the condenser temperature,
+<i>T<sub>app,eva,0</sub></i> is the evaporator approach temperature and
+<i>T<sub>app,con,0</sub></i> is the condenser approach temperature.
+</p>
+<p>
+The COP is computed as the product
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
   COP = &eta;<sub>Carnot,0</sub> COP<sub>Carnot</sub> &eta;<sub>PL</sub>,
 </p>
 <p>
 where <i>COP<sub>Carnot</sub></i> is the Carnot efficiency and
-<i>&eta;<sub>PL</sub></i> is a polynomial in heating part load ratio <i>y<sub>PL</sub></i>
-that can be used to take into account a change in <i>COP</i> at part load
-conditions.
+<i>&eta;<sub>PL</sub></i> is the part load efficiency, expressed using
+a polynomial.
 This polynomial has the form
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y<sub>PL</sub> + a<sub>3</sub> y<sub>PL</sub><sup>2</sup> + ...
+  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...,
 </p>
 <p>
-where the coefficients <i>a<sub>i</sub></i>
+where <i>y &isin; [0, 1]</i> is
+the part load for heating and the coefficients <i>a<sub>i</sub></i>
 are declared by the parameter <code>a</code>.
 </p>
 <p>
@@ -154,6 +162,16 @@ Buildings.Fluid.Chillers.Examples.Carnot_TEva</a>.
 revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Changed in base class the parameter binding
+<code>etaCarnot_nominal(unit=\"1\") = COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+to
+<code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+Improved documentation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">Buildings, #3226</a>.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 Removed parameters
 <code>effInpEva</code> and <code>effInpCon</code>
diff --git a/Buildings/Fluid/HeatPumps/Carnot_y.mo b/Buildings/Fluid/HeatPumps/Carnot_y.mo
index 550ec2e0a41..5a369b31a4b 100644
--- a/Buildings/Fluid/HeatPumps/Carnot_y.mo
+++ b/Buildings/Fluid/HeatPumps/Carnot_y.mo
@@ -15,37 +15,46 @@ with temperatures in the same way as the Carnot efficiency changes.
 The input signal <i>y</i> is the control signal for the compressor.
 </p>
 <p>
-The model allows to either specify the Carnot effectivness
-<i>&eta;<sub>Carnot,0</sub></i>, or
-a <i>COP<sub>0</sub></i>
-at the nominal conditions, together with
-the evaporator temperature <i>T<sub>eva,0</sub></i> and
-the condenser temperature <i>T<sub>con,0</sub></i>, in which
-case the model computes the Carnot effectivness as
+Set <code>use_eta_Carnot_nominal=true</code> to specify directly
+the Carnot effectiveness <i>&eta;<sub>Carnot,0</sub></i>,
+in which case the value of the parameter <code>COP_nominal</code>
+will not affect the simulation.
+If <code>use_eta_Carnot_nominal=false</code>, the model will use
+the value of the parameter <code>COP_nominal</code>
+together with the specified nominal temperatures
+to compute the Carnot effectiveness as
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
 &eta;<sub>Carnot,0</sub> =
   COP<sub>0</sub>
-&frasl;  (T<sub>con,0</sub> &frasl; (T<sub>con,0</sub>-T<sub>eva,0</sub>)).
+&frasl;  (T<sub>con,0</sub> &frasl; (T<sub>con,0</sub> + T<sub>app,con,0</sub> - (T<sub>eva,0</sub>-T<sub>app,eva,0</sub>))),
 </p>
 <p>
-The heat pump COP is computed as the product
+where
+<i>T<sub>eva,0</sub></i> is the evaporator temperature,
+<i>T<sub>con,0</sub></i> is the condenser temperature,
+<i>T<sub>app,eva,0</sub></i> is the evaporator approach temperature and
+<i>T<sub>app,con,0</sub></i> is the condenser approach temperature.
+</p>
+<p>
+The COP is computed as the product
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
   COP = &eta;<sub>Carnot,0</sub> COP<sub>Carnot</sub> &eta;<sub>PL</sub>,
 </p>
 <p>
 where <i>COP<sub>Carnot</sub></i> is the Carnot efficiency and
-<i>&eta;<sub>PL</sub></i> is a polynomial in the heating part load ratio <i>y<sub>PL</sub></i>
-that can be used to take into account a change in <i>COP</i> at part load
-conditions.
+<i>&eta;<sub>PL</sub></i> is the part load efficiency, expressed using
+a polynomial.
 This polynomial has the form
 </p>
 <p align=\"center\" style=\"font-style:italic;\">
-  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y<sub>PL</sub> + a<sub>3</sub> y<sub>PL</sub><sup>2</sup> + ...
+  &eta;<sub>PL</sub> = a<sub>1</sub> + a<sub>2</sub> y + a<sub>3</sub> y<sup>2</sup> + ...,
 </p>
 <p>
-where the coefficients <i>a<sub>i</sub></i> are declared by the parameter <code>a</code>.
+where <i>y &isin; [0, 1]</i> is
+the part load for heating and the coefficients <i>a<sub>i</sub></i>
+are declared by the parameter <code>a</code>.
 </p>
 <p>
 On the <code>Dynamics</code> tag, the model can be parametrized to compute a transient
@@ -86,6 +95,16 @@ For a similar model that can be used as a chiller, see
 revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Changed in base class the parameter binding
+<code>etaCarnot_nominal(unit=\"1\") = COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+to
+<code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+Improved documentation.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">Buildings, #3226</a>.
+</li>
+<li>
 January 3, 2017, by Michael Wetter:<br/>
 Removed parameters
 <code>effInpEva</code> and <code>effInpCon</code>
diff --git a/Buildings/Fluid/HeatPumps/Examples/Carnot_TCon.mo b/Buildings/Fluid/HeatPumps/Examples/Carnot_TCon.mo
index 292ab8308f4..5bad68b97da 100644
--- a/Buildings/Fluid/HeatPumps/Examples/Carnot_TCon.mo
+++ b/Buildings/Fluid/HeatPumps/Examples/Carnot_TCon.mo
@@ -24,7 +24,6 @@ model Carnot_TCon
     allowFlowReversal1=false,
     allowFlowReversal2=false,
     use_eta_Carnot_nominal=true,
-    etaCarnot_nominal=0.3,
     QCon_flow_nominal=QCon_flow_nominal,
     dp1_nominal=6000,
     dp2_nominal=6000) "Heat pump"
@@ -106,8 +105,14 @@ a temperature difference equal to <code>dTEva_nominal</code>.
 revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 2, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
+Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
 </li>
 <li>
diff --git a/Buildings/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo b/Buildings/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo
index 2f3f9ad433f..93f17a58a08 100644
--- a/Buildings/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo
+++ b/Buildings/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo
@@ -38,7 +38,6 @@ model Carnot_TCon_reverseFlow
     m1_flow_nominal=m1_flow_nominal,
     show_T=true,
     use_eta_Carnot_nominal=true,
-    etaCarnot_nominal=0.3,
     QCon_flow_nominal=QCon_flow_nominal,
     allowFlowReversal1=true,
     allowFlowReversal2=true,
@@ -115,9 +114,15 @@ This example checks the correct behavior if a mass flow rate attains zero.
 revisions="<html>
 <ul>
 <li>
+February 10, 2023, by Michael Wetter:<br/>
+Removed binding of parameter with same value as the default.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1692\">#1692</a>.
+</li>
+<li>
 May 15, 2019, by Jianjun Hu:<br/>
-Replaced fluid source. This is for 
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
+Replaced fluid source. This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\">#1072</a>.
 </li>
 <li>
 November 25, 2015, by Michael Wetter:<br/>
diff --git a/Buildings/package.mo b/Buildings/package.mo
index b374d6f41e1..529c6c41318 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -288,6 +288,16 @@ have been <b style=\"color:blue\">improved</b> in a
                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">#2302</a>.
     </td>
 </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve
+    </td>
+    <td valign=\"top\">Removed start value for <code>dp</code>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">#3231</a>.
+    </td>
+  </tr>
 <tr><td colspan=\"2\"><b>Buildings.Fluid.BaseClasses</b>
     </td>
   </tr>
@@ -320,6 +330,18 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3211\">#3211</a>.
     </td>
   </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Chillers.BaseClasses.Carnot
+  </td>
+  <td valign=\"top\">Changed parameter binding
+                     <code>etaCarnot_nominal(unit=\"1\") =
+                     COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+                     to
+                     <code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+                     Improved documentation.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">#3226</a>.
+  </td>
+</tr>
 <tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
     </td>
 </tr>

From 5df82f2c94b16a5115575b14db2c882f5ddd9189 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 13 Feb 2023 11:40:06 -0800
Subject: [PATCH 2/5] Checked out file from master

---
 .../Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index 1fa5481c66c..ff2441a739e 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -7,7 +7,6 @@ partial model PartialThreeWayValve "Partial three way valve"
       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve res1
         constrainedby Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
           deltaM=deltaM,
-          dp(start=dpValve_nominal/2),
           from_dp=from_dp,
           final linearized=linearized[1],
           final homotopyInitialization=homotopyInitialization,
@@ -23,7 +22,6 @@ partial model PartialThreeWayValve "Partial three way valve"
       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve res3
         constrainedby Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve(
           deltaM=deltaM,
-          dp(start=dpValve_nominal/2),
           from_dp=from_dp,
           final linearized=linearized[2],
           final homotopyInitialization=homotopyInitialization,
@@ -154,6 +152,13 @@ for details regarding the valve implementation.
 </html>", revisions="<html>
 <ul>
 <li>
+February 3, 2023, by Michael Wetter:<br/>
+Removed start value for <code>dp</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">
+https://github.com/lbl-srg/modelica-buildings/issues/3231</a>.
+</li>
+<li>
 November 16, 2022, by Michael Wetter:<br/>
 Propagated parameter <code>riseTime</code> to valves. The value is not used as the filter is disabled,
 but it will show in the result file. Having a consistent value for all these parameters in the result filter

From 96b5d2e7c5a0cc185ce3d9e174498f82a75d5904 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 27 Feb 2023 08:39:37 -0800
Subject: [PATCH 3/5] Merged IBPSA Master

---
 .../BaseClasses/PartialThreeWayValve.mo       |  3 +--
 Buildings/Fluid/Humidifiers/Humidifier_u.mo   | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
index ff2441a739e..31f8d173584 100644
--- a/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
+++ b/Buildings/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo
@@ -155,8 +155,7 @@ for details regarding the valve implementation.
 February 3, 2023, by Michael Wetter:<br/>
 Removed start value for <code>dp</code>.<br/>
 This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">
-https://github.com/lbl-srg/modelica-buildings/issues/3231</a>.
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">Buildings, #3231</a>.
 </li>
 <li>
 November 16, 2022, by Michael Wetter:<br/>
diff --git a/Buildings/Fluid/Humidifiers/Humidifier_u.mo b/Buildings/Fluid/Humidifiers/Humidifier_u.mo
index e8b91cdeea4..a38af0276eb 100644
--- a/Buildings/Fluid/Humidifiers/Humidifier_u.mo
+++ b/Buildings/Fluid/Humidifiers/Humidifier_u.mo
@@ -56,13 +56,6 @@ equation
           extent={{-114,104},{-70,76}},
           textColor={0,0,127},
           textString="u"),
-        Rectangle(
-          visible=use_T_in,
-          extent={{-100,-59},{-70,-62}},
-          lineColor={0,0,0},
-          pattern=LinePattern.None,
-          fillColor={191,0,0},
-          fillPattern=FillPattern.Solid),
         Rectangle(
           extent={{-100,5},{101,-5}},
           lineColor={0,0,255},
@@ -107,6 +100,12 @@ equation
               {42,-28},{42,-26}},
           lineColor={255,255,255},
           fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-98,-57},{-70,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={191,0,0},
           fillPattern=FillPattern.Solid)}),
 defaultComponentName="hum",
 Documentation(info="<html>
@@ -137,6 +136,13 @@ is adiabatic. To change the enthalpy of the air, add heat flow to the connector
 revisions="<html>
 <ul>
 <li>
+February 9, 2023, by Michael Wetter:<br/>
+Removed access to parameter <code>use_T_in</code> which does not exist
+in this model.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1697\">#1697</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Removed <code>massDynamics</code>.<br/>
 This is for

From e5e63957d5749bbf150660a650b94587acce75ad Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 12 Feb 2024 11:49:25 -0800
Subject: [PATCH 4/5] Merged IBPSA master

This adds HeatMeter, corrects annotation, adds missing causality statements in FMI package and fixes PPM sensor example to avoid redundant initial conditions
---
 Buildings/.copiedFiles.txt                    |  3 +
 .../Tutorial/SimpleHouse/SimpleHouse0.mo      |  2 +-
 Buildings/Fluid/FMI/Conversion/AirToOutlet.mo | 13 +++-
 Buildings/Fluid/FMI/Conversion/InletToAir.mo  | 13 +++-
 Buildings/Fluid/Movers/Data/Generic.mo        |  2 +-
 Buildings/Fluid/Movers/FlowControlled_dp.mo   |  2 +-
 Buildings/Fluid/Sensors/Examples/HeatMeter.mo | 77 +++++++++++++++++++
 Buildings/Fluid/Sensors/Examples/PPM.mo       | 59 +++++++++-----
 .../Fluid/Sensors/Examples/package.order      |  1 +
 Buildings/Fluid/Sensors/UsersGuide.mo         |  2 +-
 Buildings/Fluid/Sensors/VolumeFlowRate.mo     |  2 +-
 Buildings/Fluid/Sensors/package.order         |  1 +
 ...dings_Fluid_Sensors_Examples_HeatMeter.txt | 11 +++
 .../Buildings_Fluid_Sensors_Examples_PPM.txt  | 20 ++---
 .../Fluid/Sensors/Examples/HeatMeter.mos      |  2 +
 ...dings.Fluid.Sensors.Examples.HeatMeter.mos |  5 ++
 16 files changed, 170 insertions(+), 45 deletions(-)
 create mode 100644 Buildings/Fluid/Sensors/Examples/HeatMeter.mo
 create mode 100644 Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_HeatMeter.txt
 create mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos
 create mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.HeatMeter.mos

diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index ce023d58df4..5cb396fba75 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -1682,6 +1682,7 @@ Buildings/Fluid/Sensors/EntropyFlowRate.mo
 Buildings/Fluid/Sensors/Examples/Density.mo
 Buildings/Fluid/Sensors/Examples/EnthalpyFlowRate.mo
 Buildings/Fluid/Sensors/Examples/EntropyFlowRate.mo
+Buildings/Fluid/Sensors/Examples/HeatMeter.mo
 Buildings/Fluid/Sensors/Examples/MassFraction.mo
 Buildings/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mo
 Buildings/Fluid/Sensors/Examples/PPM.mo
@@ -1696,6 +1697,7 @@ Buildings/Fluid/Sensors/Examples/Velocity.mo
 Buildings/Fluid/Sensors/Examples/VolumeFlowRate.mo
 Buildings/Fluid/Sensors/Examples/package.mo
 Buildings/Fluid/Sensors/Examples/package.order
+Buildings/Fluid/Sensors/HeatMeter.mo
 Buildings/Fluid/Sensors/LatentEnthalpyFlowRate.mo
 Buildings/Fluid/Sensors/MassFlowRate.mo
 Buildings/Fluid/Sensors/MassFraction.mo
@@ -2690,6 +2692,7 @@ Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Conversions/Examples/To_VolumeF
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/Density.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EnthalpyFlowRate.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/EntropyFlowRate.mos
+Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MassFraction.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/MoistAirEnthalpyFlowRate.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
index 11a40d4729f..fc686832db8 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
@@ -10,7 +10,7 @@ model SimpleHouse0
   parameter Modelica.Units.SI.Density rhoWall = 2000 "Wall density";
   parameter Modelica.Units.SI.SpecificHeatCapacity cpWall = 1000 "Wall specific heat capacity";
   Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
-        ModelicaServices.ExternalReferences.loadResource(
+        Modelica.Utilities.Files.loadResource(
         "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
     "Weather data reader"
     annotation (Placement(transformation(extent={{-180,-10},{-160,10}})));
diff --git a/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo b/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
index 4b4fcb36a94..3fe36ceb506 100644
--- a/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
+++ b/Buildings/Fluid/FMI/Conversion/AirToOutlet.mo
@@ -48,7 +48,7 @@ block AirToOutlet
     if allowFlowReversal
     "Temperature of the backward flowing medium in the connector outlet"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{20,20},{-20,-20}},
         rotation=90,
         origin={-60,-120}),
@@ -61,7 +61,7 @@ block AirToOutlet
     if Medium.nXi > 0 and allowFlowReversal
     "Water mass fraction per total air mass of the backward flowing medium in the connector outlet"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{20,20},{-20,-20}},
         rotation=90,
         origin={0,-120}),
@@ -74,7 +74,7 @@ block AirToOutlet
     if allowFlowReversal
     "Trace substances of the backward flowing medium in the connector outlet"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{20,20},{-20,-20}},
         rotation=90,
         origin={60,-120}),
@@ -93,7 +93,7 @@ protected
     "Internal connector for water vapor concentration in kg/kg total air";
 
    // Conditional connectors for the backward flowing medium
-  Buildings.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
+  output Buildings.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
     redeclare final package Medium = Medium)
     "Internal connector for fluid properties for back flow";
 
@@ -174,6 +174,11 @@ for its usage.
 </html>", revisions="<html>
 <ul>
 <li>
+February 1, 2024, by Michael Wetter:<br/>
+Added causality.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1829\">#1829</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air only.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Fluid/FMI/Conversion/InletToAir.mo b/Buildings/Fluid/FMI/Conversion/InletToAir.mo
index ed2f903e0f0..fd2ea820eed 100644
--- a/Buildings/Fluid/FMI/Conversion/InletToAir.mo
+++ b/Buildings/Fluid/FMI/Conversion/InletToAir.mo
@@ -24,7 +24,7 @@ block InletToAir
     if allowFlowReversal
     "Zone air temperature"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{-20,-20},{20,20}},
         rotation=90,
         origin={-60,-120}),
@@ -37,7 +37,7 @@ block InletToAir
     if Medium.nXi > 0 and allowFlowReversal
     "Zone air water mass fraction per total air mass"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{-20,-20},{20,20}},
         rotation=90,
         origin={0,-120}),
@@ -50,7 +50,7 @@ block InletToAir
     if allowFlowReversal
     "Zone air trace substances"
     annotation (Placement(
-        visible=allowFloWReserval,
+        visible=allowFlowReversal,
         transformation(extent={{-20,-20},{20,20}},
         rotation=90,
         origin={60,-120}),
@@ -77,7 +77,7 @@ block InletToAir
     annotation (Placement(transformation(extent={{100,-100},{140,-60}})));
 
 protected
-  Buildings.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
+  input Buildings.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(
     redeclare final package Medium = Medium)
     "Internal connector for fluid properties for back flow";
 
@@ -172,6 +172,11 @@ for its usage.
 </html>", revisions="<html>
 <ul>
 <li>
+February 1, 2024, by Michael Wetter:<br/>
+Added causality.<br/>
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1829\">#1829</a>.
+</li>
+<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice to moist air only.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Fluid/Movers/Data/Generic.mo b/Buildings/Fluid/Movers/Data/Generic.mo
index f0e64eb766b..fd6ba3839c3 100644
--- a/Buildings/Fluid/Movers/Data/Generic.mo
+++ b/Buildings/Fluid/Movers/Data/Generic.mo
@@ -98,7 +98,7 @@ record Generic "Generic data record for movers"
   parameter Boolean motorCooledByFluid=true
     "If true, then motor heat is added to fluid stream"
     annotation(Dialog(group="Motor heat rejection"));
-  parameter Modelica.Units.SI.Power WMot_nominal(final displayUnit="W")=
+  parameter Modelica.Units.SI.Power WMot_nominal=
     if max(power.P)>Modelica.Constants.eps
     then
       if powerOrEfficiencyIsHydraulic
diff --git a/Buildings/Fluid/Movers/FlowControlled_dp.mo b/Buildings/Fluid/Movers/FlowControlled_dp.mo
index 48ae5798756..c36607c31c2 100644
--- a/Buildings/Fluid/Movers/FlowControlled_dp.mo
+++ b/Buildings/Fluid/Movers/FlowControlled_dp.mo
@@ -77,7 +77,7 @@ model FlowControlled_dp
 
   Modelica.Blocks.Interfaces.RealInput dpMea(
     final quantity="PressureDifference",
-    final displayUnit="Pa",
+    displayUnit="Pa",
     final unit="Pa")=gain.u if prescribeSystemPressure
     "Measurement of pressure difference between two points where the set point should be obtained"
     annotation (Placement(transformation(
diff --git a/Buildings/Fluid/Sensors/Examples/HeatMeter.mo b/Buildings/Fluid/Sensors/Examples/HeatMeter.mo
new file mode 100644
index 00000000000..2db705562f3
--- /dev/null
+++ b/Buildings/Fluid/Sensors/Examples/HeatMeter.mo
@@ -0,0 +1,77 @@
+within Buildings.Fluid.Sensors.Examples;
+model HeatMeter
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Water
+    "Medium model";
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 10 "Nominal mass flow rate";
+
+  Sources.MassFlowSource_T sou(
+    redeclare package Medium = Medium,
+    m_flow=m_flow_nominal,
+    nPorts=1) "Mass flow source"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Sources.Boundary_pT sin(
+    redeclare package Medium = Medium,
+    nPorts=1)
+    "Sink"
+    annotation (Placement(transformation(extent={{70,-10},{50,10}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedHeatFlow heaFloRat(Q_flow=
+        m_flow_nominal*10*4200) "Heat flow rate"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  MixingVolumes.MixingVolume vol(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=m_flow_nominal,
+    V=0.1,
+    nPorts=2)
+    "Mixing volume"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  TemperatureTwoPort senT(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal)
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Buildings.Fluid.Sensors.HeatMeter senHeaFlo(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal)
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+equation
+  connect(sou.ports[1], senT.port_a)
+    annotation (Line(points={{-50,0},{-30,0}},   color={0,127,255}));
+  connect(senT.port_b, vol.ports[1]) annotation (Line(points={{-10,0},{-2,0},{
+          -2,30},{-1,30}},    color={0,127,255}));
+  connect(vol.ports[2], senHeaFlo.port_a) annotation (Line(points={{1,30},{2,30},
+          {2,0},{10,0}},       color={0,127,255}));
+  connect(senHeaFlo.port_b, sin.ports[1])
+    annotation (Line(points={{30,0},{50,0}},   color={0,127,255}));
+  connect(senT.T, senHeaFlo.TExt) annotation (Line(points={{-20,11},{-20,18},{
+          -6,18},{-6,6},{8,6}},     color={0,0,127}));
+  connect(heaFloRat.port, vol.heatPort)
+    annotation (Line(points={{-30,40},{-10,40}}, color={191,0,0}));
+    annotation (
+experiment(Tolerance=1e-6, StopTime=60),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos"
+        "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This example tests the heat meter sensor for the situation where heat is exchanged with a control volume.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+February 1, 2024, by Michael Wetter:<br/>
+Revised implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1831\">IBPSA, #1831</a>.
+</li>
+<li>
+February 1, 2024, by Jan Gall:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1831\">IBPSA, #1831</a>.
+</li>
+</ul>
+</html>"));
+end HeatMeter;
diff --git a/Buildings/Fluid/Sensors/Examples/PPM.mo b/Buildings/Fluid/Sensors/Examples/PPM.mo
index 2782302fca7..232d323d7df 100644
--- a/Buildings/Fluid/Sensors/Examples/PPM.mo
+++ b/Buildings/Fluid/Sensors/Examples/PPM.mo
@@ -4,8 +4,8 @@ model PPM "Test model for the extra property sensor outputting PPM"
   package Medium = Buildings.Media.Air(extraPropertiesNames={"CO2"})
     "Medium model";
 
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=volDyn.V*
-      senPPMTwoPort.tau*3*rho_default
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
+    volDyn.V*senPPMTwoPort.tau*3*rho_default
     "Mass flow rate into and out of the volume";
 
   Buildings.Fluid.MixingVolumes.MixingVolume volDyn(
@@ -20,7 +20,7 @@ model PPM "Test model for the extra property sensor outputting PPM"
     redeclare package Medium = Medium,
     nPorts=2,
     m_flow=m_flow_nominal) "Fresh air supply"
-    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+    annotation (Placement(transformation(origin = {-28, 0}, extent = {{-40, 30}, {-20, 50}})));
 
   Buildings.Fluid.Sensors.PPM senPPMVol(
     redeclare package Medium = Medium,
@@ -82,32 +82,44 @@ model PPM "Test model for the extra property sensor outputting PPM"
     redeclare package Medium = Medium,
     nPorts=1,
     m_flow=m_flow_nominal) "Fresh air supply for steady state volume"
-    annotation (Placement(transformation(extent={{-40,110},{-20,130}})));
+    annotation (Placement(transformation(origin = {-28, 0}, extent = {{-40, 110}, {-20, 130}})));
   Buildings.Fluid.Sources.Boundary_pT sin(
     redeclare package Medium = Medium,
     nPorts=2) "Exhaust air"
-    annotation (Placement(transformation(extent={{-40,-60},{-20,-40}})));
+    annotation (Placement(transformation(origin = {-30, 0}, extent = {{-40, -60}, {-20, -40}})));
+
+  Buildings.Fluid.FixedResistances.PressureDrop dp(
+     redeclare package Medium = Medium,
+     dp_nominal = 200,
+     m_flow_nominal = m_flow_nominal)
+     "Pressure drop to decouple volume pressure from boundary pressure"
+     annotation (
+    Placement(transformation(origin = {-28, -50}, extent = {{-2, -10}, {18, 10}})));
 
 protected
   final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX(
       T=Medium.T_default,
       p=Medium.p_default,
-      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values";
+      X=Medium.X_default[1:Medium.nXi]) "Medium state at default values"
+    annotation(Evaluate=true);
   // Density at medium default values, used to compute the size of control volumes
-  final parameter Modelica.Units.SI.Density rho_default=Medium.density(state=
-      state_default) "Density, used to compute fluid mass";
+  final parameter Modelica.Units.SI.Density rho_default=Medium.density(
+    state=state_default)
+    "Density, used to compute fluid mass"
+    annotation(Evaluate=true);
 
 equation
-  connect(mSou.ports[1], volDyn.ports[1]) annotation (Line(points={{-20,42},{
-          77.3333,42},{77.3333,50}},       color={0,127,255}));
+  connect(mSou.ports[1], volDyn.ports[1]) annotation (Line(points={{-48,39},{
+          -48,50},{78.6667,50}},
+                            color={0,127,255}));
   connect(CO2In.y, volDyn.C_flow[1]) annotation (Line(points={{21,70},{32,70},{32,
           54},{68,54}}, color={0,0,127}));
   connect(senPPMVol.port, volDyn.ports[2]) annotation (Line(points={{130,40},{80,
-          40},{80,50}},         color={0,127,255}));
+          40},{80,50}},color={0,127,255}));
   connect(senPPMIn.port, mSou.ports[2])
-    annotation (Line(points={{-10,80},{-10,38},{-20,38}}, color={0,127,255}));
+    annotation (Line(points={{-10,80},{-10,41},{-48,41}}, color={0,127,255}));
   connect(senPPMTwoPort.port_a, volDyn.ports[3]) annotation (Line(points={{80,20},
-          {80,50},{82.6667,50}},         color={0,127,255}));
+          {80,50},{81.3333,50}},         color={0,127,255}));
   connect(senPPMNoRev.port_a, senPPMTwoPort.port_b)
     annotation (Line(points={{80,-20},{80,0}}, color={0,127,255}));
   connect(senPPMRev.port_b, senPPMNoRev.port_b) annotation (Line(points={{60,-50},
@@ -116,15 +128,17 @@ equation
     annotation (Line(points={{20,-50},{30,-50},{40,-50}}, color={0,127,255}));
   connect(CO2In.y,volSte. C_flow[1]) annotation (Line(points={{21,70},{32,70},{32,
           84},{68,84}}, color={0,0,127}));
-  connect(volSte.ports[1], senPPMVol2.port) annotation (Line(points={{77.3333,
+  connect(volSte.ports[1], senPPMVol2.port) annotation (Line(points={{78.6667,
           80},{130,80}},          color={0,127,255}));
-  connect(mSouSta.ports[1], volSte.ports[2]) annotation (Line(points={{-20,120},
+  connect(mSouSta.ports[1], volSte.ports[2]) annotation (Line(points={{-48,120},
           {54,120},{54,80},{80,80}},      color={0,127,255}));
-  connect(sin.ports[1], senPPMSta.port_b) annotation (Line(points={{-20,-48},{-10,
-          -48},{-10,-50},{0,-50}}, color={0,127,255}));
-  connect(sin.ports[2], volSte.ports[3]) annotation (Line(points={{-20,-52},{
-          -20,-80},{110,-80},{110,80},{82.6667,80}},
-                                                 color={0,127,255}));
+  connect(sin.ports[1], volSte.ports[3]) annotation (
+    Line(points={{-50,-51},{-50,-80},{110,-80},{110,80},{81.3333,80}},            color = {0, 127, 255}));
+  connect(dp.port_b, senPPMSta.port_b) annotation (
+    Line(points = {{-10, -50}, {0, -50}}, color = {0, 127, 255}));
+  connect(dp.port_a, sin.ports[2]) annotation (
+    Line(points={{-30,-50},{-40,-50},{-40,-49},{-50,-49}},
+                                            color = {0, 127, 255}));
     annotation (
 experiment(Tolerance=1e-6, StopTime=3),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/PPM.mos"
@@ -142,6 +156,11 @@ and with or without dynamics are tested.
 revisions="<html>
 <ul>
 <li>
+February 1, 2024, by Michael Wetter:<br/>
+Added pressure drop to avoid redundant initial conditions for pressure of control volume.<br/>
+This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1830\"> #1830</a>.
+</li>
+<li>
 May 2, 2019, by Jianjun Hu:<br/>
 Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
diff --git a/Buildings/Fluid/Sensors/Examples/package.order b/Buildings/Fluid/Sensors/Examples/package.order
index 6e4c242734b..9288f236149 100644
--- a/Buildings/Fluid/Sensors/Examples/package.order
+++ b/Buildings/Fluid/Sensors/Examples/package.order
@@ -1,6 +1,7 @@
 Density
 EnthalpyFlowRate
 EntropyFlowRate
+HeatMeter
 MassFraction
 MoistAirEnthalpyFlowRate
 PPM
diff --git a/Buildings/Fluid/Sensors/UsersGuide.mo b/Buildings/Fluid/Sensors/UsersGuide.mo
index 2b84e759f5a..1af9dbbffcb 100644
--- a/Buildings/Fluid/Sensors/UsersGuide.mo
+++ b/Buildings/Fluid/Sensors/UsersGuide.mo
@@ -60,7 +60,7 @@ Sensors for quantities that depend on the direction of the mass flow rate but
 not of its magnitude:
 </em>
 Such quantities include density, mass fraction, PPM, relative humidity, specific enthalpy, specific entropy and trace substances.
-Not that these are all quantities that are carried by the fluid that flows through the sensor.
+Note that these are all quantities that are carried by the fluid that flows through the sensor.
 For these sensors, if the parameter <code>allowFlowReversal=true</code> is set (which is the default setting),
 then it is strongly recommended to configure them
 as a dynamic sensor. This is the default setting.<br/>
diff --git a/Buildings/Fluid/Sensors/VolumeFlowRate.mo b/Buildings/Fluid/Sensors/VolumeFlowRate.mo
index 12e7712f4c4..3022f0cd5c3 100644
--- a/Buildings/Fluid/Sensors/VolumeFlowRate.mo
+++ b/Buildings/Fluid/Sensors/VolumeFlowRate.mo
@@ -25,7 +25,7 @@ model VolumeFlowRate "Ideal sensor for volume flow rate"
         rotation=270)));
 protected
   Medium.Density dMed(start=d_start)
-    "Medium temperature to which the sensor is exposed";
+    "Medium density to which the sensor is exposed";
 
   Medium.Density d_a_inflow(start=d_start)
     "Density of inflowing fluid at port_a";
diff --git a/Buildings/Fluid/Sensors/package.order b/Buildings/Fluid/Sensors/package.order
index e7e7c9bff91..fa943ff00f4 100644
--- a/Buildings/Fluid/Sensors/package.order
+++ b/Buildings/Fluid/Sensors/package.order
@@ -3,6 +3,7 @@ Density
 DensityTwoPort
 EnthalpyFlowRate
 EntropyFlowRate
+HeatMeter
 LatentEnthalpyFlowRate
 MassFlowRate
 MassFraction
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_HeatMeter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_HeatMeter.txt
new file mode 100644
index 00000000000..e6493018ae1
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_HeatMeter.txt
@@ -0,0 +1,11 @@
+last-generated=2024-02-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "3",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6e+01]
+senHeaFlo.Q_flow=[0e+00, 6.135302814887254e+03, 2.024211004943313e+04, 3.806596635045912e+04, 5.735886017640069e+04, 7.69003203125e+04, 9.605505767047344e+04, 1.145098494566929e+05, 1.321029788968033e+05, 1.487847005315746e+05, 1.645585e+05, 1.794507366602567e+05, 1.934949730579872e+05, 2.067290271429792e+05, 2.191943982694409e+05, 2.30933234375e+05, 2.41987868139305e+05, 2.523970031914593e+05, 2.621994657085459e+05, 2.714292556591234e+05, 2.8011971875e+05, 2.883016199230112e+05, 2.960048461113893e+05, 3.032570914998232e+05, 3.100849416862036e+05, 3.16513375e+05, 3.225658712441389e+05, 3.282644616773623e+05, 3.336297565791147e+05, 3.38681284347135e+05, 3.4343725e+05, 3.479150597213503e+05, 3.521309010177422e+05, 3.561000986168839e+05, 3.598370335411865e+05, 3.6335534375e+05, 3.666678729444488e+05, 3.697867773791028e+05, 3.727235973512874e+05, 3.754886266952436e+05, 3.780919375e+05, 3.805429672290988e+05, 3.828506533860168e+05, 3.85023346414309e+05, 3.870689075040729e+05, 3.8899471875e+05, 3.908079051247715e+05, 3.925150603812684e+05, 3.941224394709131e+05, 3.956357509278391e+05, 3.97060625e+05, 3.984022804174283e+05, 3.996654359322101e+05, 4.008547202083168e+05, 4.019744347208977e+05, 4.0302865625e+05, 4.040212211838006e+05, 4.04955686340282e+05, 4.058354698288537e+05, 4.066638104436868e+05, 4.0744371875e+05, 4.081780018008138e+05, 4.088693741418842e+05, 4.09520344548312e+05, 4.101332484785269e+05, 4.107103125e+05, 4.11253626332332e+05, 4.117651556152049e+05, 4.122467818404886e+05, 4.127002176242927e+05, 4.13127125e+05, 4.135290322358382e+05, 4.139074682803112e+05, 4.142637504369059e+05, 4.145992179171435e+05, 4.149150625e+05, 4.152124382295441e+05, 4.154924371525018e+05, 4.157560628232587e+05, 4.160042806340994e+05, 4.1623796875e+05, 4.164580005396084e+05, 4.16665155992903e+05, 4.168601564892154e+05, 4.170437807942336e+05, 4.172166875e+05, 4.17379437899342e+05, 4.175326873098595e+05, 4.176770001768287e+05, 4.178128434126455e+05, 4.1794075e+05, 4.180611877956323e+05, 4.181745936091331e+05, 4.182813438809327e+05, 4.183818435008583e+05, 4.1847646875e+05, 4.185655627185454e+05, 4.186494373958896e+05, 4.187283750967591e+05, 4.188026873156272e+05, 4.1887265625e+05]
+heaFloRat.Q_flow=[4.2e+05, 4.2e+05]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_PPM.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_PPM.txt
index 0089ece8557..74323325e9d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_PPM.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Sensors_Examples_PPM.txt
@@ -1,20 +1,16 @@
-last-generated=2020-08-17
-statistics-initialization=
-{
-  "linear": "0, 0, 0"
-}
+last-generated=2024-02-12
 statistics-simulation=
 {
   "linear": " ",
-  "nonlinear": " ",
-  "number of continuous time states": "6",
+  "nonlinear": "0",
+  "number of continuous time states": "7",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3e+00]
-senPPMTwoPort.ppm=[0e+00, 8.996816086141198e-01, 3.261243962162067e+00, 6.996448959183172e+00, 1.189501145107917e+01, 1.789784686578036e+01, 2.485735146073957e+01, 3.259696377497645e+01, 4.105935444762826e+01, 5.009243443013055e+01, 5.969271460490052e+01, 6.973167737036231e+01, 8.013662217149903e+01, 9.085043853411885e+01, 1.018091250185619e+02, 1.129411360444768e+02, 1.242126582012896e+02, 1.35685916750072e+02, 1.472309945400953e+02, 1.587855557281445e+02, 1.702871765570848e+02, 1.816735400024704e+02, 1.928822229426333e+02, 2.040466012234394e+02, 2.150784807509485e+02, 2.259406127929688e+02, 2.366362711222483e+02, 2.471979514365048e+02, 2.575865568382896e+02, 2.677913191908738e+02, 2.778281023748404e+02, 2.876852393667581e+02, 2.97354621091526e+02, 3.068346832881419e+02, 3.161298276136881e+02, 3.252321614984316e+02, 3.341385371771331e+02, 3.428546101380485e+02, 3.513777505903283e+02, 3.597054255625459e+02, 3.678395257586792e+02, 3.757887828359731e+02, 3.83549196766915e+02, 3.911213473758851e+02, 3.985058465950154e+02, 4.057032414097783e+02, 4.127139598367621e+02, 4.195494459680543e+02, 4.262123287340807e+02, 4.327008300596927e+02, 4.390174255371094e+02, 4.451647091357333e+02, 4.511453359258974e+02, 4.569623043904733e+02, 4.626237173718269e+02, 4.681301922917376e+02, 4.734853912875683e+02, 4.786932917913336e+02, 4.837579940133548e+02, 4.886836883825772e+02, 4.93471992340488e+02, 4.98123345472343e+02, 5.026446511887629e+02, 5.070397664648337e+02, 5.113126891155132e+02, 5.154673396615225e+02, 5.195078709946036e+02, 5.234312756394222e+02, 5.272422532980618e+02, 5.309455647400673e+02, 5.345443227681088e+02, 5.380416127867987e+02, 5.414404811088552e+02, 5.447435850827459e+02, 5.479502533249536e+02, 5.510652465820312e+02, 5.540909452180879e+02, 5.570296075583516e+02, 5.598836750151843e+02, 5.626552227900103e+02, 5.653466712309562e+02, 5.679604434709777e+02, 5.704982878266436e+02, 5.729622184642218e+02, 5.753541274703547e+02, 5.776759069451692e+02, 5.799293269204203e+02, 5.82119453326203e+02, 5.84246574680838e+02, 5.863121285977516e+02, 5.883176848382988e+02, 5.90265013424921e+02, 5.921555792035998e+02, 5.939908470191522e+02, 5.957723427603796e+02, 5.975012871360339e+02, 5.991789487556531e+02, 6.008066360245897e+02, 6.023853730021718e+02, 6.039162583238314e+02, 6.0540087890625e+02]
-senPPMNoRev.ppm=[0e+00, 8.996816086141198e-01, 3.261243962162067e+00, 6.996448959183172e+00, 1.189501145107917e+01, 1.789784686578036e+01, 2.485735146073957e+01, 3.259696377497645e+01, 4.105935444762826e+01, 5.009243443013055e+01, 5.969271460490052e+01, 6.973167737036231e+01, 8.013662217149903e+01, 9.085043853411885e+01, 1.018091250185619e+02, 1.129411360444768e+02, 1.242126582012896e+02, 1.35685916750072e+02, 1.472309945400953e+02, 1.587855557281445e+02, 1.702871765570848e+02, 1.816735400024704e+02, 1.928822229426333e+02, 2.040466012234394e+02, 2.150784807509485e+02, 2.259406127929688e+02, 2.366362711222483e+02, 2.471979514365048e+02, 2.575865568382896e+02, 2.677913191908738e+02, 2.778281023748404e+02, 2.876852393667581e+02, 2.97354621091526e+02, 3.068346832881419e+02, 3.161298276136881e+02, 3.252321614984316e+02, 3.341385371771331e+02, 3.428546101380485e+02, 3.513777505903283e+02, 3.597054255625459e+02, 3.678395257586792e+02, 3.757887828359731e+02, 3.83549196766915e+02, 3.911213473758851e+02, 3.985058465950154e+02, 4.057032414097783e+02, 4.127139598367621e+02, 4.195494459680543e+02, 4.262123287340807e+02, 4.327008300596927e+02, 4.390174255371094e+02, 4.451647091357333e+02, 4.511453359258974e+02, 4.569623043904733e+02, 4.626237173718269e+02, 4.681301922917376e+02, 4.734853912875683e+02, 4.786932917913336e+02, 4.837579940133548e+02, 4.886836883825772e+02, 4.93471992340488e+02, 4.98123345472343e+02, 5.026446511887629e+02, 5.070397664648337e+02, 5.113126891155132e+02, 5.154673396615225e+02, 5.195078709946036e+02, 5.234312756394222e+02, 5.272422532980618e+02, 5.309455647400673e+02, 5.345443227681088e+02, 5.380416127867987e+02, 5.414404811088552e+02, 5.447435850827459e+02, 5.479502533249536e+02, 5.510652465820312e+02, 5.540909452180879e+02, 5.570296075583516e+02, 5.598836750151843e+02, 5.626552227900103e+02, 5.653466712309562e+02, 5.679604434709777e+02, 5.704982878266436e+02, 5.729622184642218e+02, 5.753541274703547e+02, 5.776759069451692e+02, 5.799293269204203e+02, 5.82119453326203e+02, 5.84246574680838e+02, 5.863121285977516e+02, 5.883176848382988e+02, 5.90265013424921e+02, 5.921555792035998e+02, 5.939908470191522e+02, 5.957723427603796e+02, 5.975012871360339e+02, 5.991789487556531e+02, 6.008066360245897e+02, 6.023853730021718e+02, 6.039162583238314e+02, 6.0540087890625e+02]
-senPPMVol.ppm=[0e+00, 5.613963437066388e+01, 1.077039511626077e+02, 1.548696997882877e+02, 1.981162298469092e+02, 2.375828171270601e+02, 2.736105264042075e+02, 3.06616339810619e+02, 3.367406362239968e+02, 3.643493557251906e+02, 3.894509486663835e+02, 4.123664148981433e+02, 4.33274923260867e+02, 4.523163537986374e+02, 4.6967066147338e+02, 4.85512243513828e+02, 4.999411058785238e+02, 5.128511391184212e+02, 5.245485759369311e+02, 5.35194643518065e+02, 5.449506760925327e+02, 5.53977967685209e+02, 5.624377369097319e+02, 5.700621343637193e+02, 5.770690242867438e+02, 5.835645751953125e+02, 5.895640312558013e+02, 5.950166011436219e+02, 6.000334514410496e+02, 6.046616203810436e+02, 6.088816560084496e+02, 6.127429800680521e+02, 6.162858910799091e+02, 6.195328969579393e+02, 6.22489503734849e+02, 6.251962321105826e+02, 6.276802333811596e+02, 6.299418324579674e+02, 6.320065316955087e+02, 6.338994776715811e+02, 6.35631894346054e+02, 6.371936025600559e+02, 6.386146244503877e+02, 6.399101578103424e+02, 6.410957621576812e+02, 6.421871329486953e+02, 6.432001954671858e+02, 6.441122445969505e+02, 6.449317001525884e+02, 6.456822502850604e+02, 6.4637255859375e+02, 6.470109258753323e+02, 6.47605286734171e+02, 6.481624749835894e+02, 6.486622924034897e+02, 6.491243289634949e+02, 6.495515754193425e+02, 6.499462885766635e+02, 6.503102415873639e+02, 6.506443483457343e+02, 6.509540410070686e+02, 6.512467647307232e+02, 6.515173948946767e+02, 6.517659302879757e+02, 6.519921267686856e+02, 6.521950680518466e+02, 6.52373351944068e+02, 6.525449219281626e+02, 6.527062379866048e+02, 6.528528445452275e+02, 6.529849857434914e+02, 6.531023555321183e+02, 6.532047116390332e+02, 6.532930296169372e+02, 6.533799437682034e+02, 6.534578857421875e+02, 6.535275879526157e+02, 6.535895997193867e+02, 6.536444703606529e+02, 6.536926271230902e+02, 6.537357176395608e+02, 6.53775024329856e+02, 6.538102416561454e+02, 6.538419189356113e+02, 6.538706054860181e+02, 6.538967895900712e+02, 6.539208984949312e+02, 6.53941772529234e+02, 6.539605101909455e+02, 6.539774779854346e+02, 6.539929809332633e+02, 6.540072631748627e+02, 6.540204467813212e+02, 6.540327148584959e+02, 6.540441284430949e+02, 6.540549316736091e+02, 6.540650024041536e+02, 6.54074523899588e+02, 6.540834350422957e+02, 6.540917358322768e+02, 6.540995483398438e+02]
-senPPMRev.ppm=[0e+00, 8.996816086141198e-01, 3.261243962162067e+00, 6.996448959183172e+00, 1.189501145107917e+01, 1.789784686578036e+01, 2.485735146073957e+01, 3.259696377497645e+01, 4.105935444762826e+01, 5.009243443013055e+01, 5.969271460490052e+01, 6.973167737036231e+01, 8.013662217149903e+01, 9.085043853411885e+01, 1.018091250185619e+02, 1.129411360444768e+02, 1.242126582012896e+02, 1.35685916750072e+02, 1.472309945400953e+02, 1.587855557281445e+02, 1.702871765570848e+02, 1.816735400024704e+02, 1.928822229426333e+02, 2.040466012234394e+02, 2.150784807509485e+02, 2.259406127929688e+02, 2.366362711222483e+02, 2.471979514365048e+02, 2.575865568382896e+02, 2.677913191908738e+02, 2.778281023748404e+02, 2.876852393667581e+02, 2.97354621091526e+02, 3.068346832881419e+02, 3.161298276136881e+02, 3.252321614984316e+02, 3.341385371771331e+02, 3.428546101380485e+02, 3.513777505903283e+02, 3.597054255625459e+02, 3.678395257586792e+02, 3.757887828359731e+02, 3.83549196766915e+02, 3.911213473758851e+02, 3.985058465950154e+02, 4.057032414097783e+02, 4.127139598367621e+02, 4.195494459680543e+02, 4.262123287340807e+02, 4.327008300596927e+02, 4.390174255371094e+02, 4.451647091357333e+02, 4.511453359258974e+02, 4.569623043904733e+02, 4.626237173718269e+02, 4.681301922917376e+02, 4.734853912875683e+02, 4.786932917913336e+02, 4.837579940133548e+02, 4.886836883825772e+02, 4.93471992340488e+02, 4.98123345472343e+02, 5.026446511887629e+02, 5.070397664648337e+02, 5.113126891155132e+02, 5.154673396615225e+02, 5.195078709946036e+02, 5.234312756394222e+02, 5.272422532980618e+02, 5.309455647400673e+02, 5.345443227681088e+02, 5.380416127867987e+02, 5.414404811088552e+02, 5.447435850827459e+02, 5.479502533249536e+02, 5.510652465820312e+02, 5.540909452180879e+02, 5.570296075583516e+02, 5.598836750151843e+02, 5.626552227900103e+02, 5.653466712309562e+02, 5.679604434709777e+02, 5.704982878266436e+02, 5.729622184642218e+02, 5.753541274703547e+02, 5.776759069451692e+02, 5.799293269204203e+02, 5.82119453326203e+02, 5.84246574680838e+02, 5.863121285977516e+02, 5.883176848382988e+02, 5.90265013424921e+02, 5.921555792035998e+02, 5.939908470191522e+02, 5.957723427603796e+02, 5.975012871360339e+02, 5.991789487556531e+02, 6.008066360245897e+02, 6.023853730021718e+02, 6.039162583238314e+02, 6.0540087890625e+02]
-senPPMSta.ppm=[0e+00, 5.613963437066388e+01, 1.077039511626077e+02, 1.548696997882877e+02, 1.981162298469092e+02, 2.375828171270601e+02, 2.736105264042075e+02, 3.06616339810619e+02, 3.367406362239968e+02, 3.643493557251906e+02, 3.894509486663835e+02, 4.123664148981433e+02, 4.33274923260867e+02, 4.523163537986374e+02, 4.6967066147338e+02, 4.85512243513828e+02, 4.999411058785238e+02, 5.128511391184212e+02, 5.245485759369311e+02, 5.35194643518065e+02, 5.449506760925327e+02, 5.53977967685209e+02, 5.624377369097319e+02, 5.700621343637193e+02, 5.770690242867438e+02, 5.835645751953125e+02, 5.895640312558013e+02, 5.950166011436219e+02, 6.000334514410496e+02, 6.046616203810436e+02, 6.088816560084496e+02, 6.127429800680521e+02, 6.162858910799091e+02, 6.195328969579393e+02, 6.22489503734849e+02, 6.251962321105826e+02, 6.276802333811596e+02, 6.299418324579674e+02, 6.320065316955087e+02, 6.338994776715811e+02, 6.35631894346054e+02, 6.371936025600559e+02, 6.386146244503877e+02, 6.399101578103424e+02, 6.410957621576812e+02, 6.421871329486953e+02, 6.432001954671858e+02, 6.441122445969505e+02, 6.449317001525884e+02, 6.456822502850604e+02, 6.4637255859375e+02, 6.470109258753323e+02, 6.47605286734171e+02, 6.481624749835894e+02, 6.486622924034897e+02, 6.491243289634949e+02, 6.495515754193425e+02, 6.499462885766635e+02, 6.503102415873639e+02, 6.506443483457343e+02, 6.509540410070686e+02, 6.512467647307232e+02, 6.515173948946767e+02, 6.517659302879757e+02, 6.519921267686856e+02, 6.521950680518466e+02, 6.52373351944068e+02, 6.525449219281626e+02, 6.527062379866048e+02, 6.528528445452275e+02, 6.529849857434914e+02, 6.531023555321183e+02, 6.532047116390332e+02, 6.532930296169372e+02, 6.533799437682034e+02, 6.534578857421875e+02, 6.535275879526157e+02, 6.535895997193867e+02, 6.536444703606529e+02, 6.536926271230902e+02, 6.537357176395608e+02, 6.53775024329856e+02, 6.538102416561454e+02, 6.538419189356113e+02, 6.538706054860181e+02, 6.538967895900712e+02, 6.539208984949312e+02, 6.53941772529234e+02, 6.539605101909455e+02, 6.539774779854346e+02, 6.539929809332633e+02, 6.540072631748627e+02, 6.540204467813212e+02, 6.540327148584959e+02, 6.540441284430949e+02, 6.540549316736091e+02, 6.540650024041536e+02, 6.54074523899588e+02, 6.540834350422957e+02, 6.540917358322768e+02, 6.540995483398438e+02]
+senPPMTwoPort.ppm=[0e+00, 8.46067230764875e-01, 3.252887871197772e+00, 7.028847659530076e+00, 1.196603730150056e+01, 1.797314326129481e+01, 2.492432230423388e+01, 3.269408213736357e+01, 4.112722173185828e+01, 5.020110369245315e+01, 5.980029671142682e+01, 6.983883984106275e+01, 8.024902604085509e+01, 9.095313780115292e+01, 1.018870211532165e+02, 1.130716597557821e+02, 1.243967096965716e+02, 1.357914312379978e+02, 1.471850962332342e+02, 1.585370357953951e+02, 1.698999085919349e+02, 1.811853502944727e+02, 1.923668725586847e+02, 2.034740914533518e+02, 2.144592486085022e+02, 2.253045349121094e+02, 2.360227762489104e+02, 2.465870352983972e+02, 2.569848722915874e+02, 2.672235396433341e+02, 2.772860186518257e+02, 2.871633887762368e+02, 2.968628913783352e+02, 3.063727081831126e+02, 3.15687200676085e+02, 3.248158102244553e+02, 3.33751269067508e+02, 3.424911152548881e+02, 3.510329935179627e+02, 3.593747981523533e+02, 3.675288567917815e+02, 3.754890696952897e+02, 3.832564111238874e+02, 3.908321322905168e+02, 3.982179742789615e+02, 4.054190617186404e+02, 4.124368907466144e+02, 4.1927481828064e+02, 4.259366329338815e+02, 4.32426141338553e+02, 4.38736572265625e+02, 4.448779964845923e+02, 4.508547170253385e+02, 4.566712582468765e+02, 4.62332793299246e+02, 4.678446393208616e+02, 4.732126557236124e+02, 4.784274836881932e+02, 4.834901412308793e+02, 4.884131500505588e+02, 4.932009962540139e+02, 4.978583308129916e+02, 5.023899819934163e+02, 5.068009664253187e+02, 5.110938780886515e+02, 5.152535945375441e+02, 5.192968724584773e+02, 5.232270520096171e+02, 5.270476121983622e+02, 5.307619099820745e+02, 5.343733023049218e+02, 5.378851796231228e+02, 5.412950953430937e+02, 5.446058287187916e+02, 5.478221405226716e+02, 5.509464111328125e+02, 5.539810819452779e+02, 5.569283502498488e+02, 5.597905353894477e+02, 5.625698956730047e+02, 5.652691565592357e+02, 5.678900088850463e+02, 5.704343840099008e+02, 5.729042960991943e+02, 5.753016982742403e+02, 5.776282995305701e+02, 5.798859919664677e+02, 5.82079719453357e+02, 5.842104418555324e+02, 5.862789865009229e+02, 5.882871672562932e+02, 5.902365710409443e+02, 5.921287847704912e+02, 5.939652732898476e+02, 5.957476235241356e+02, 5.974771172151291e+02, 5.991551450435514e+02, 6.007828933488084e+02, 6.023616913615468e+02, 6.038929428921066e+02, 6.053847045898438e+02]
+senPPMNoRev.ppm=[0e+00, 8.46067230764875e-01, 3.252887871197772e+00, 7.028847659530076e+00, 1.196603730150056e+01, 1.797314326129481e+01, 2.492432230423388e+01, 3.269408213736357e+01, 4.112722173185828e+01, 5.020110369245315e+01, 5.980029671142682e+01, 6.983883984106275e+01, 8.024902604085509e+01, 9.095313780115292e+01, 1.018870211532165e+02, 1.130716597557821e+02, 1.243967096965716e+02, 1.357914312379978e+02, 1.471850962332342e+02, 1.585370357953951e+02, 1.698999085919349e+02, 1.811853502944727e+02, 1.923668725586847e+02, 2.034740914533518e+02, 2.144592486085022e+02, 2.253045349121094e+02, 2.360227762489104e+02, 2.465870352983972e+02, 2.569848722915874e+02, 2.672235396433341e+02, 2.772860186518257e+02, 2.871633887762368e+02, 2.968628913783352e+02, 3.063727081831126e+02, 3.15687200676085e+02, 3.248158102244553e+02, 3.33751269067508e+02, 3.424911152548881e+02, 3.510329935179627e+02, 3.593747981523533e+02, 3.675288567917815e+02, 3.754890696952897e+02, 3.832564111238874e+02, 3.908321322905168e+02, 3.982179742789615e+02, 4.054190617186404e+02, 4.124368907466144e+02, 4.1927481828064e+02, 4.259366329338815e+02, 4.32426141338553e+02, 4.38736572265625e+02, 4.448779964845923e+02, 4.508547170253385e+02, 4.566712582468765e+02, 4.62332793299246e+02, 4.678446393208616e+02, 4.732126557236124e+02, 4.784274836881932e+02, 4.834901412308793e+02, 4.884131500505588e+02, 4.932009962540139e+02, 4.978583308129916e+02, 5.023899819934163e+02, 5.068009664253187e+02, 5.110938780886515e+02, 5.152535945375441e+02, 5.192968724584773e+02, 5.232270520096171e+02, 5.270476121983622e+02, 5.307619099820745e+02, 5.343733023049218e+02, 5.378851796231228e+02, 5.412950953430937e+02, 5.446058287187916e+02, 5.478221405226716e+02, 5.509464111328125e+02, 5.539810819452779e+02, 5.569283502498488e+02, 5.597905353894477e+02, 5.625698956730047e+02, 5.652691565592357e+02, 5.678900088850463e+02, 5.704343840099008e+02, 5.729042960991943e+02, 5.753016982742403e+02, 5.776282995305701e+02, 5.798859919664677e+02, 5.82079719453357e+02, 5.842104418555324e+02, 5.862789865009229e+02, 5.882871672562932e+02, 5.902365710409443e+02, 5.921287847704912e+02, 5.939652732898476e+02, 5.957476235241356e+02, 5.974771172151291e+02, 5.991551450435514e+02, 6.007828933488084e+02, 6.023616913615468e+02, 6.038929428921066e+02, 6.053847045898438e+02]
+senPPMVol.ppm=[0e+00, 5.62014553523934e+01, 1.075797446083771e+02, 1.545714515080496e+02, 1.976541631852909e+02, 2.370406113449349e+02, 2.730246499109512e+02, 3.059019538493686e+02, 3.360444997279689e+02, 3.635063382090021e+02, 3.88570760657669e+02, 4.114473475454107e+02, 4.323054408545626e+02, 4.513451318896522e+02, 4.687284922399741e+02, 4.84439855749394e+02, 4.98742528034226e+02, 5.118155251865799e+02, 5.238380043660728e+02, 5.349238916419927e+02, 5.449841841699437e+02, 5.542365126315798e+02, 5.627632374833838e+02, 5.705224615228283e+02, 5.77643792263802e+02, 5.84190185546875e+02, 5.901533867405583e+02, 5.956172481157931e+02, 6.006321452500223e+02, 6.05199645295708e+02, 6.093812897749568e+02, 6.132183829053221e+02, 6.167110009023725e+02, 6.199078359328724e+02, 6.228422258795349e+02, 6.255063516618792e+02, 6.279375576819818e+02, 6.301605824731013e+02, 6.321993417447892e+02, 6.340775782020761e+02, 6.357766087228654e+02, 6.3733178615497e+02, 6.387578129305397e+02, 6.400681168195525e+02, 6.412751444429496e+02, 6.423775015949758e+02, 6.433893434144157e+02, 6.443175058623921e+02, 6.451674178701469e+02, 6.459442131497831e+02, 6.466749877929688e+02, 6.47350464481274e+02, 6.479736339423029e+02, 6.48545897823268e+02, 6.490677489437421e+02, 6.495381473214147e+02, 6.49954956724847e+02, 6.503515009518438e+02, 6.507364500768607e+02, 6.510905763853016e+02, 6.514136357370264e+02, 6.517045284113292e+02, 6.519615477357301e+02, 6.521820069299422e+02, 6.523692019587595e+02, 6.525703732276279e+02, 6.527527464708554e+02, 6.529164429196968e+02, 6.53061706713322e+02, 6.531880495724212e+02, 6.532950442470201e+02, 6.533817135680022e+02, 6.534644162603089e+02, 6.535435789577906e+02, 6.536132811868451e+02, 6.536742553710938e+02, 6.537272949678587e+02, 6.537728882627556e+02, 6.538116456073469e+02, 6.538446656519072e+02, 6.538755492232747e+02, 6.539027099032153e+02, 6.539267577830083e+02, 6.539481811458439e+02, 6.539675293085164e+02, 6.539852295188658e+02, 6.540015869544195e+02, 6.540166016126552e+02, 6.540306396004165e+02, 6.540439452791278e+02, 6.540566406051125e+02, 6.540688476484891e+02, 6.540805664098394e+02, 6.540917358538135e+02, 6.541023559801201e+02, 6.541122436824174e+02, 6.541212157877164e+02, 6.541290282993579e+02, 6.541353759660852e+02, 6.541403808535542e+02, 6.541526489257812e+02]
+senPPMRev.ppm=[0e+00, 8.46067230764875e-01, 3.252887871197772e+00, 7.028847659530076e+00, 1.196603730150056e+01, 1.797314326129481e+01, 2.492432230423388e+01, 3.269408213736357e+01, 4.112722173185828e+01, 5.020110369245315e+01, 5.980029671142682e+01, 6.983883984106275e+01, 8.024902604085509e+01, 9.095313780115292e+01, 1.018870211532165e+02, 1.130716597557821e+02, 1.243967096965716e+02, 1.357914312379978e+02, 1.471850962332342e+02, 1.585370357953951e+02, 1.698999085919349e+02, 1.811853502944727e+02, 1.923668725586847e+02, 2.034740914533518e+02, 2.144592486085022e+02, 2.253045349121094e+02, 2.360227762489104e+02, 2.465870352983972e+02, 2.569848722915874e+02, 2.672235396433341e+02, 2.772860186518257e+02, 2.871633887762368e+02, 2.968628913783352e+02, 3.063727081831126e+02, 3.15687200676085e+02, 3.248158102244553e+02, 3.33751269067508e+02, 3.424911152548881e+02, 3.510329935179627e+02, 3.593747981523533e+02, 3.675288567917815e+02, 3.754890696952897e+02, 3.832564111238874e+02, 3.908321322905168e+02, 3.982179742789615e+02, 4.054190617186404e+02, 4.124368907466144e+02, 4.1927481828064e+02, 4.259366329338815e+02, 4.32426141338553e+02, 4.38736572265625e+02, 4.448779964845923e+02, 4.508547170253385e+02, 4.566712582468765e+02, 4.62332793299246e+02, 4.678446393208616e+02, 4.732126557236124e+02, 4.784274836881932e+02, 4.834901412308793e+02, 4.884131500505588e+02, 4.932009962540139e+02, 4.978583308129916e+02, 5.023899819934163e+02, 5.068009664253187e+02, 5.110938780886515e+02, 5.152535945375441e+02, 5.192968724584773e+02, 5.232270520096171e+02, 5.270476121983622e+02, 5.307619099820745e+02, 5.343733023049218e+02, 5.378851796231228e+02, 5.412950953430937e+02, 5.446058287187916e+02, 5.478221405226716e+02, 5.509464111328125e+02, 5.539810819452779e+02, 5.569283502498488e+02, 5.597905353894477e+02, 5.625698956730047e+02, 5.652691565592357e+02, 5.678900088850463e+02, 5.704343840099008e+02, 5.729042960991943e+02, 5.753016982742403e+02, 5.776282995305701e+02, 5.798859919664677e+02, 5.82079719453357e+02, 5.842104418555324e+02, 5.862789865009229e+02, 5.882871672562932e+02, 5.902365710409443e+02, 5.921287847704912e+02, 5.939652732898476e+02, 5.957476235241356e+02, 5.974771172151291e+02, 5.991551450435514e+02, 6.007828933488084e+02, 6.023616913615468e+02, 6.038929428921066e+02, 6.053847045898438e+02]
+senPPMSta.ppm=[0e+00, 5.62014553523934e+01, 1.075797446083771e+02, 1.545714515080496e+02, 1.976541631852909e+02, 2.370406113449349e+02, 2.730246499109512e+02, 3.059019538493686e+02, 3.360444997279689e+02, 3.635063382090021e+02, 3.88570760657669e+02, 4.114473475454107e+02, 4.323054408545626e+02, 4.513451318896522e+02, 4.687284922399741e+02, 4.84439855749394e+02, 4.98742528034226e+02, 5.118155251865799e+02, 5.238380043660728e+02, 5.349238916419927e+02, 5.449841841699437e+02, 5.542365126315798e+02, 5.627632374833838e+02, 5.705224615228283e+02, 5.77643792263802e+02, 5.84190185546875e+02, 5.901533867405583e+02, 5.956172481157931e+02, 6.006321452500223e+02, 6.05199645295708e+02, 6.093812897749568e+02, 6.132183829053221e+02, 6.167110009023725e+02, 6.199078359328724e+02, 6.228422258795349e+02, 6.255063516618792e+02, 6.279375576819818e+02, 6.301605824731013e+02, 6.321993417447892e+02, 6.340775782020761e+02, 6.357766087228654e+02, 6.3733178615497e+02, 6.387578129305397e+02, 6.400681168195525e+02, 6.412751444429496e+02, 6.423775015949758e+02, 6.433893434144157e+02, 6.443175058623921e+02, 6.451674178701469e+02, 6.459442131497831e+02, 6.466749877929688e+02, 6.47350464481274e+02, 6.479736339423029e+02, 6.48545897823268e+02, 6.490677489437421e+02, 6.495381473214147e+02, 6.49954956724847e+02, 6.503515009518438e+02, 6.507364500768607e+02, 6.510905763853016e+02, 6.514136357370264e+02, 6.517045284113292e+02, 6.519615477357301e+02, 6.521820069299422e+02, 6.523692019587595e+02, 6.525703732276279e+02, 6.527527464708554e+02, 6.529164429196968e+02, 6.53061706713322e+02, 6.531880495724212e+02, 6.532950442470201e+02, 6.533817135680022e+02, 6.534644162603089e+02, 6.535435789577906e+02, 6.536132811868451e+02, 6.536742553710938e+02, 6.537272949678587e+02, 6.537728882627556e+02, 6.538116456073469e+02, 6.538446656519072e+02, 6.538755492232747e+02, 6.539027099032153e+02, 6.539267577830083e+02, 6.539481811458439e+02, 6.539675293085164e+02, 6.539852295188658e+02, 6.540015869544195e+02, 6.540166016126552e+02, 6.540306396004165e+02, 6.540439452791278e+02, 6.540566406051125e+02, 6.540688476484891e+02, 6.540805664098394e+02, 6.540917358538135e+02, 6.541023559801201e+02, 6.541122436824174e+02, 6.541212157877164e+02, 6.541290282993579e+02, 6.541353759660852e+02, 6.541403808535542e+02, 6.541526489257812e+02]
 senPPMIn.ppm=[0e+00, 0e+00]
 senPPMVol2.ppm=[6.541798095703125e+02, 6.541798095703125e+02]
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos
new file mode 100644
index 00000000000..574d6678978
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/Sensors/Examples/HeatMeter.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Fluid.Sensors.Examples.HeatMeter", stopTime=60, tolerance=1e-06, resultFile="HeatMeter");
+createPlot(id=1, position={551, 169, 592, 371}, y={"senHeaFlo.Q_flow", "heaFloRat.Q_flow"}, range={0.0, 60.0, -50000.0, 450000.0}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.HeatMeter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.HeatMeter.mos
new file mode 100644
index 00000000000..abad5fe92c7
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.Sensors.Examples.HeatMeter.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "senHeaFlo.Q_flow",
+    "heaFloRat.Q_flow"
+  };

From 3a663dce519d5861b236b50223fabb95bd5e1c48 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 12 Feb 2024 11:57:05 -0800
Subject: [PATCH 5/5] Added missing file

---
 Buildings/Fluid/Sensors/HeatMeter.mo | 126 +++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 Buildings/Fluid/Sensors/HeatMeter.mo

diff --git a/Buildings/Fluid/Sensors/HeatMeter.mo b/Buildings/Fluid/Sensors/HeatMeter.mo
new file mode 100644
index 00000000000..e5203589215
--- /dev/null
+++ b/Buildings/Fluid/Sensors/HeatMeter.mo
@@ -0,0 +1,126 @@
+within Buildings.Fluid.Sensors;
+model HeatMeter "Measures thermal energy provided between supply and return pipes"
+  extends BaseClasses.PartialDynamicFlowSensor;
+  extends Modelica.Icons.RoundSensor;
+  Modelica.Blocks.Interfaces.RealInput TExt(
+    final unit="K",
+    displayUnit="degC") "External temperature measurement to calculate temperature difference"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+        iconTransformation(extent={{-140,40},{-100,80}})));
+  Modelica.Blocks.Interfaces.RealOutput Q_flow(
+    final quantity="HeatFlowRate",
+    final unit="W") "Heat flow rate"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={0,110})));
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
+    "Initial or guess value of temperature"
+    annotation (Dialog(group="Initialization"));
+  Medium.Temperature T(start=T_start) "Temperature of the passing fluid";
+protected
+  Medium.Temperature TMed(start=T_start) "Medium temperature to which the sensor is exposed";
+  Medium.Temperature T_a_inflow "Temperature of inflowing fluid at port_a";
+  Medium.Temperature T_b_inflow "Temperature of inflowing fluid at port_b, or T_a_inflow if uni-directional flow";
+initial equation
+  if dynamic then
+    if initType == Modelica.Blocks.Types.Init.SteadyState then
+      der(T) = 0;
+    elseif initType == Modelica.Blocks.Types.Init.InitialState or
+           initType == Modelica.Blocks.Types.Init.InitialOutput then
+      T = T_start;
+    end if;
+  end if;
+equation
+  if allowFlowReversal then
+     T_a_inflow = Medium.temperature(state=
+                    Medium.setState_phX(p=port_b.p, h=port_b.h_outflow, X=port_b.Xi_outflow));
+     T_b_inflow = Medium.temperature(state=
+                    Medium.setState_phX(p=port_a.p, h=port_a.h_outflow, X=port_a.Xi_outflow));
+     TMed = Modelica.Fluid.Utilities.regStep(
+              x=port_a.m_flow,
+              y1=T_a_inflow,
+              y2=T_b_inflow,
+              x_small=m_flow_small);
+  else
+     TMed = Medium.temperature(state=
+              Medium.setState_phX(p=port_b.p, h=port_b.h_outflow, X=port_b.Xi_outflow));
+     T_a_inflow = TMed;
+     T_b_inflow = TMed;
+  end if;
+  if dynamic then
+    der(T) = (TMed-T)*k*tauInv;
+  else
+    T = TMed;
+  end if;
+  Q_flow = port_a.m_flow * Medium.cp_const * (T - TExt);
+
+annotation (defaultComponentName="senHeaFlo",
+  Icon(graphics={
+        Ellipse(
+          fillColor={245,222,222},
+          fillPattern=FillPattern.Solid,
+          extent={{-70,-70},{70,70}}),
+        Line(points={{-100,0},{-70,0}}, color={0,128,255}),
+        Line(points={{70,0},{100,0}}, color={0,128,255}),
+        Line(points={{0,100},{0,70}}, color={0,0,127}),
+        Text(
+          extent={{180,151},{20,99}},
+          textColor={0,0,0},
+          textString="Q_flow"),
+        Text(
+          extent={{-20,120},{-140,70}},
+          textColor={0,0,0},
+          textString=DynamicSelect("", String(Q_flow, leftJustified=false, significantDigits=3))),
+        Text(
+          extent={{-22,120},{-100,48}},
+          textColor={0,0,127},
+          textString="TExt"),
+        Line(points={{37.6,13.7},{65.8,23.9}}),
+        Line(points={{22.9,32.8},{40.2,57.3}}),
+        Line(points={{0,70},{0,40}}),
+        Line(points={{-22.9,32.8},{-40.2,57.3}}),
+        Line(points={{-37.6,13.7},{-65.8,23.9}}),
+        Ellipse(
+          fillColor={64,64,64},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-7,-7},{7,7}}),
+        Polygon(
+          rotation=-17.5,
+          fillColor={64,64,64},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-5.0,0.0},{-2.0,60.0},{0.0,65.0},{2.0,60.0},{5.0,0.0}}),
+        Ellipse(
+          lineColor={64,64,64},
+          fillColor={255,255,255},
+          extent={{-12,-12},{12,12}})}),
+Documentation(info="<html>
+<p>
+This model measures thermal energy provided between a supply and return pipe.
+It measures the capacity flow rate of the heat transfer fluid and the change in its
+temperature compared to an external temperature measurement that is input into the port
+<code>TExt</code>. The sensor does not influence the fluid.
+</p>
+<p>
+The rate of heat flow is calculated as <i>Q&#775; = m&#775; c<sub>p</sub> (T - T<sub>Ext</sub>)</i>.</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+February 1, 2024, by Michael Wetter:<br/>
+Revised implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1831\">IBPSA, #1831</a>.
+</li>
+<li>
+February 1, 2024, by Jan Gall:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1831\">IBPSA, #1831</a>.
+</li>
+</ul>
+</html>"));
+end HeatMeter;
