Merge branch 'master' into issue1462_PartialSource_each

ibpsa · Apr 1, 2021 · 2773165 · 2773165
2 parents 569a453 + 7ea9f25
commit 2773165
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 7 deletions.
diff --git a/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo b/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo
@@ -70,7 +70,9 @@ model Cooling "Active beam unit for cooling"
   // Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
 
   // Ports
   Modelica.Fluid.Interfaces.FluidPort_a watCoo_a(
@@ -297,6 +299,12 @@ DOE(2015) EnergyPlus documentation v8.4.0 - Engineering Reference.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 April 14, 2020, by Michael Wetter:<br/>
 Changed <code>homotopyInitialization</code> to a constant.<br/>
 This is for

diff --git a/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo b/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo
@@ -31,7 +31,9 @@ partial model PartialEightPortInterface
   // Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
   Medium1.MassFlowRate m1_flow = port_a1.m_flow
     "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)";
   Modelica.SIunits.Pressure dp1(displayUnit="Pa")
@@ -135,6 +137,12 @@ mass transfer and pressure drop equations.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 July 12, 2019, by Michael Wetter:<br/>
 Corrected wrong medium in declaration of <code>m4_flow</code>.
 </li>

diff --git a/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo b/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo
@@ -17,7 +17,10 @@ partial model PartialFourPortInterface
   // Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
+
 
   Medium1.MassFlowRate m1_flow = port_a1.m_flow
     "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)";
@@ -81,6 +84,12 @@ mass transfer and pressure drop equations.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 November 3, 2016, by Michael Wetter:<br/>
 Moved computation of pressure drop to variable assignment so that
 the model won't mix graphical with textual modeling if used as a base

diff --git a/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo b/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo
@@ -14,7 +14,9 @@ partial model PartialTwoPortInterface
   // Diagnostics
    parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
 
   Modelica.SIunits.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
     "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
@@ -65,6 +67,12 @@ IBPSA.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 November 3, 2016, by Michael Wetter:<br/>
 Renamed protected parameter <code>m_flow_start</code> to avoid
 a name clash with

diff --git a/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo b/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo
@@ -21,10 +21,14 @@ partial model PartialTwoPortTransport
   // Diagnostics
   parameter Boolean show_T = true
     "= true, if temperatures at port_a and port_b are computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
   parameter Boolean show_V_flow = true
     "= true, if volume flow rate at inflowing port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
 
   // Variables
   Medium.MassFlowRate m_flow(
@@ -122,6 +126,12 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 September 15, 2016, by Michael Wetter:<br/>
 Removed wrong annotation, which caused an error in the pedantic model check
 of Dymola 2017 FD01.

diff --git a/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo b/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo
@@ -34,7 +34,9 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
   // Diagnostics
    parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+    annotation(
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
 
   Medium.ThermodynamicState sta_a=
       Medium.setState_phX(port_a.p,
@@ -71,6 +73,12 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
+March 30, 2021, by Michael Wetter:<br/>
+Added annotation <code>HideResult=true</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1459\">IBPSA, #1459</a>.
+</li>
+<li>
 January 31, 2019, by Michael Mans:<br/>
 Added optional temperature state calculation as diagnostics option.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1092\">#1092</a>.