Merge branch 'master' into 1860_weeklyschedule

ibpsa · Apr 3, 2024 · 5ff19c9 · 5ff19c9
2 parents f53f16d + 05edf84
commit 5ff19c9
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 21 deletions.
diff --git a/IBPSA/Controls/SetPoints/SupplyReturnTemperatureReset.mo b/IBPSA/Controls/SetPoints/SupplyReturnTemperatureReset.mo
@@ -15,7 +15,7 @@ block SupplyReturnTemperatureReset
 
   parameter Boolean use_TRoo_in = false
     "Get the room temperature set point from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
   parameter Modelica.Units.SI.Temperature TRoo=293.15
     "Fixed value of room temperature set point"
     annotation (Dialog(enable=not use_TRoo_in));
@@ -86,8 +86,14 @@ shift the heating curve.
 </html>", revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 January 03, 2020, by Jianjun Hu:<br/>
-Changed name from <code>HotWaterTemperatureReset</code> to 
+Changed name from <code>HotWaterTemperatureReset</code> to
 <code>SupplyReturnTemperatureReset</code>.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1273\">#1273</a>.

diff --git a/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo b/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo
@@ -46,7 +46,7 @@ model EvaporatorCondenser
 protected
   parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(sta_default)
-    "Density, used to compute fluid volume";
+    "Specific heat capacity";
 
   Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
     "Heat flow sensor"

diff --git a/IBPSA/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/IBPSA/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
@@ -166,7 +166,7 @@ equation
     Documentation(info="<html>
 This example demonstrates the use of the flow model with four different configuration.
 At steady-state, all flow models have the same mass flow rate and pressure difference.
-</html>"), revisions="<html>
+</html>", revisions="<html>
 <ul>
 <li>
 March 21, 2023, by Hongxiang Fu:<br/>
@@ -175,5 +175,5 @@ This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, #1704</a>.
 </li>
 </ul>
-</html>");
+</html>"));
 end ControlledFlowMachine;
diff --git a/IBPSA/Fluid/Sources/BaseClasses/Outside.mo b/IBPSA/Fluid/Sources/BaseClasses/Outside.mo
@@ -5,7 +5,7 @@ partial model Outside
 
   parameter Boolean use_C_in = false
     "Get the trace substances from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
   parameter Medium.ExtraProperty C[Medium.nC](
     final quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
     "Fixed values of trace substances"
@@ -129,6 +129,12 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 January 09, 2023, by Jianjun Hu:<br/>
 Changed base class to constrain medium to moist air.<br/>
 This is for

diff --git a/IBPSA/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo b/IBPSA/Fluid/Sources/BaseClasses/PartialSource_Xi_C.mo
@@ -5,13 +5,13 @@ partial model PartialSource_Xi_C
 
   parameter Boolean use_X_in = false
     "Get the composition (all fractions) from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(tab="Advanced"));
+    annotation(Evaluate=true, Dialog(tab="Advanced"));
   parameter Boolean use_Xi_in = false
     "Get the composition (independent fractions) from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Boolean use_C_in = false
     "Get the trace substances from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.MassFraction X[Medium.nX](
     final quantity=Medium.substanceNames) = Medium.X_default
     "Fixed value of composition"
@@ -120,6 +120,12 @@ Otherwise the parameter value is used.
 </html>", revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 September 19, 2019, by Michael Wetter:<br/>
 Refactored handling of mass fractions which was needed to handle media such as
 <a href=\"modelica://Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents\">

diff --git a/IBPSA/Fluid/Sources/Boundary_pT.mo b/IBPSA/Fluid/Sources/Boundary_pT.mo
@@ -5,14 +5,14 @@ model Boundary_pT
 
   parameter Boolean use_p_in = false
     "Get the pressure from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.AbsolutePressure p = Medium.p_default
     "Fixed value of pressure"
     annotation (Dialog(enable = not use_p_in, group="Fixed inputs"));
 
   parameter Boolean use_T_in= false
     "Get the temperature from the input connector"
-    annotation(Evaluate=true, HideResult=true,Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.Temperature T = Medium.T_default
     "Fixed value of temperature"
     annotation (Dialog(enable = not use_T_in,group="Fixed inputs"));
@@ -130,6 +130,12 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 February 25, 2020, by Michael Wetter:<br/>
 Changed icon to display its operating state.<br/>
 This is for

diff --git a/IBPSA/Fluid/Sources/Boundary_ph.mo b/IBPSA/Fluid/Sources/Boundary_ph.mo
@@ -5,14 +5,14 @@ model Boundary_ph
 
   parameter Boolean use_p_in = false
     "Get the pressure from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.AbsolutePressure p = Medium.p_default
     "Fixed value of pressure"
     annotation (Dialog(enable = not use_p_in, group="Fixed inputs"));
 
   parameter Boolean use_h_in= false
     "Get the specific enthalpy from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.SpecificEnthalpy h = Medium.h_default
     "Fixed value of specific enthalpy"
     annotation (Dialog(enable = not use_h_in, group="Fixed inputs"));
@@ -125,6 +125,12 @@ with exception of boundary pressure, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 Juni 7, 2019, by Michael Wetter:<br/>
 Added constant boolean expressions to avoid a potential string comparison in an equation section.<br/>
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1148\">#1148</a>.

diff --git a/IBPSA/Fluid/Sources/MassFlowSource_T.mo b/IBPSA/Fluid/Sources/MassFlowSource_T.mo
@@ -5,13 +5,13 @@ model MassFlowSource_T
 
   parameter Boolean use_m_flow_in = false
     "Get the mass flow rate from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Modelica.Units.SI.MassFlowRate m_flow=0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable=not use_m_flow_in, group="Fixed inputs"));
   parameter Boolean use_T_in= false
     "Get the temperature from the input connector"
-    annotation(Evaluate=true, HideResult=true,Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.Temperature T = Medium.T_default
     "Fixed value of temperature"
     annotation (Dialog(enable = not use_T_in,group="Fixed inputs"));
@@ -105,6 +105,12 @@ with exception of boundary flow rate, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 January 25, 2019, by Michael Wetter:<br/>
 Refactored use of base classes.<br/>
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\">#1072</a>.

diff --git a/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo b/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo
@@ -5,10 +5,10 @@ model MassFlowSource_WeatherData
   extends IBPSA.Fluid.Sources.BaseClasses.PartialAirSource(final verifyInputs=true);
   parameter Boolean use_m_flow_in = false
     "Get the mass flow rate from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
   parameter Boolean use_C_in = false
     "Get the trace substances from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
   parameter Modelica.Units.SI.MassFlowRate m_flow=0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable=not use_m_flow_in));
@@ -187,6 +187,12 @@ with exception of boundary flow rate, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 January 09, 2023, by Jianjun Hu:<br/>
 Changed base class to constrain medium to moist air.<br/>
 This is for

diff --git a/IBPSA/Fluid/Sources/MassFlowSource_h.mo b/IBPSA/Fluid/Sources/MassFlowSource_h.mo
@@ -5,14 +5,14 @@ model MassFlowSource_h
 
   parameter Boolean use_m_flow_in = false
     "Get the mass flow rate from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Modelica.Units.SI.MassFlowRate m_flow=0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable=not use_m_flow_in, group="Fixed inputs"));
 
   parameter Boolean use_h_in= false
     "Get the specific enthalpy from the input connector"
-    annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
+    annotation(Evaluate=true, Dialog(group="Conditional inputs"));
   parameter Medium.SpecificEnthalpy h = Medium.h_default
     "Fixed value of specific enthalpy"
     annotation (Dialog(enable = not use_h_in, group="Fixed inputs"));
@@ -101,6 +101,12 @@ with exception of boundary flow rate, do not have an effect.
 revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 February 2nd, 2018 by Filip Jorissen<br/>
 Made <code>medium</code> conditional and refactored inputs.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">#882</a>.

diff --git a/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo b/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo
@@ -13,7 +13,7 @@ model TraceSubstancesFlowSource
   parameter String substanceName = "CO2" "Name of trace substance";
   parameter Boolean use_m_flow_in = false
     "Get the trace substance mass flow rate from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
 
   parameter Modelica.Units.SI.MassFlowRate m_flow=0
     "Fixed mass flow rate going out of the fluid port"
@@ -105,6 +105,12 @@ which is more efficient than using this model.
 </html>", revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 November 14, 2019, by Michael Wetter:<br/>
 Rewrote assignment of <code>C_in_internal</code> to avoid an initial algorithm section.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1250\">#1250</a>.

diff --git a/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo b/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo
@@ -3,7 +3,7 @@ partial block HumidityRatioVaporPressure
   "Humidity ratio for given water vapor pressure"
   extends Modelica.Blocks.Icons.Block;
   parameter Boolean use_p_in = true "Get the pressure from the input connector"
-    annotation(Evaluate=true, HideResult=true);
+    annotation(Evaluate=true);
 
   parameter Modelica.Units.SI.Pressure p=101325 "Fixed value of pressure"
     annotation (Dialog(enable=not use_p_in));
@@ -36,6 +36,12 @@ and the value provided by the input connector is used instead.
 </html>", revisions="<html>
 <ul>
 <li>
+March 11, 2024, by Michael Wetter:<br/>
+Corrected use of <code>HideResult</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1850\">#1850</a>.
+</li>
+<li>
 May 29, 2014, by Michael Wetter:<br/>
 Removed undesirable annotation <code>Evaluate=true</code>.
 </li>