Merge branch 'issue1343_BoptestMultizoneOffice' to include the commit…

…s of PR 1343 and 1349 (issue open-ideas#1343) in the master branch
kldjonge · Jan 25, 2024 · 0f6da49 · 0f6da49
2 parents 982e4bb + cb49212
commit 0f6da49
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
@@ -25,8 +25,8 @@ model PartialZone "Building zone model"
    annotation(Dialog(tab="Airflow", group="Airtightness"));
   parameter Modelica.Fluid.Types.Dynamics energyDynamicsAir=Modelica.Fluid.Types.Dynamics.FixedInitial
     "Type of energy balance for air model: dynamic (3 initialization options) or steady state";
-  parameter Real mSenFac = 5 "Correction factor for thermal capacity of zone air."
-    annotation(Dialog(tab="Airflow",group="Air model"));
+  parameter Real mSenFac(min=0.1) = 5 "Correction factor for thermal capacity of zone air."
+    annotation(Dialog(tab="Advanced",group="Air model"));
 
   parameter Boolean linIntRad=sim.linIntRad
     "Linearized computation of long wave radiation"
@@ -510,6 +510,12 @@ end for;
 </html>", revisions="<html>
 <ul>
 <li>
+January 8, 2024, by Jelger Jansen:<br/>
+Added min attribute to <code>mSenFac</code>.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1343\">
+#1343</a>
+</li>
+<li>
 May 29, 2022, by Filip Jorissen:<br/>
 Unprotected component for OM compatibility.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">

diff --git a/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo b/IDEAS/Buildings/Components/Interfaces/RectangularZoneTemplateInterface.mo
@@ -184,9 +184,6 @@ partial model RectangularZoneTemplateInterface
     "= true, if exterior radiative heat transfer for windows should be linearised"
     annotation(Dialog(tab="Advanced", group="Radiative heat exchange"));
 
-  parameter Real mSenFac(min=0.1)=5
-    "Factor for scaling the sensible thermal mass of the zone air"
-    annotation(Dialog(tab="Advanced",group="Air model"));
   parameter SI.TemperatureDifference dT_nominal_bou=-1
     "Nominal temperature difference for boundary walls, used for linearisation, negative temperatures indicate the solid is colder"
     annotation(Dialog(tab="Advanced", group="Convective heat transfer"));
@@ -1512,7 +1509,12 @@ components cannot be propagated.
 </p>
 </html>", revisions="<html>
 <ul>
-
+<li>
+January 8, 2024, by Jelger Jansen:<br/>
+Removed duplicate declaration of <code>mSenFac</code>.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1343\">
+#1343</a>
+</li>
 <li>
 August 2, 2022, by Filip Jorissen:<br/>
 Added cavity support for horizontal internal walls (floor/ceiling)

diff --git a/IDEAS/Fluid/Actuators/Valves/Simplified/ThreeWayValveMotor.mo b/IDEAS/Fluid/Actuators/Valves/Simplified/ThreeWayValveMotor.mo
@@ -39,12 +39,6 @@ protected
 
     parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
       "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
-    parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
-      m_flow_nominal) "Small mass flow rate for regularization of zero flow"
-      annotation (Dialog(tab="Advanced"));
-    parameter Boolean show_T = false
-      "= true, if actual temperature at port is computed"
-      annotation(Dialog(tab="Advanced",group="Diagnostics"));
 
     Medium.ThermodynamicState sta_a=
         Medium.setState_phX(port_a.p,
@@ -107,6 +101,13 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+December 13, 2024, by Jelger Jansen:<br/>
+Removed duplicate declaration of <code>m_flow_small</code> 
+and <code>show_T</code>.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1343\">
+#1343</a>
+</li>
+<li>
 July 29, 2020, by Filip Jorissen:<br/>
 Removed duplicate definition of <code>LumpedVolumeDeclarations</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1158\">