Merge remote-tracking branch 'origin/master' into issue1337_Temperatu…

…reSetpoint_PartialZone
open-ideas · Nov 22, 2024 · aee9d44 · aee9d44
2 parents d4c74fc + e278596
commit aee9d44
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo
@@ -7,8 +7,8 @@ model PartialZone "Building zone model"
     useOccNumInput=occNum.useInput,
     useLigCtrInput=ligCtr.useCtrInput);
 
-    replaceable package Medium =
-    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+    replaceable package Medium = IDEAS.Media.Air constrainedby
+      Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
   parameter Boolean use_custom_n50=
     sim.interZonalAirFlowType==IDEAS.BoundaryConditions.Types.InterZonalAirFlow.None
@@ -517,6 +517,11 @@ end for;
 </html>", revisions="<html>
 <ul>
 <li>
+November 11, 2024 by Lucas Verleyen:<br/>
+Change Medium to IDEAS.Media.Air and use 'constrainedby' for Modelica.Media.Interfaces.PartialMedium.
+This is for <a href=https://github.com/open-ideas/IDEAS/issues/1375>#1375</a>.
+</li>
+<li>
 November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
 Add parameter <code>TZon_design</code> to be used when calculating <code>Q_design</code>.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>

diff --git a/IDEAS/Fluid/Taps/Examples/TapProfile.mo b/IDEAS/Fluid/Taps/Examples/TapProfile.mo
@@ -3,12 +3,14 @@ model TapProfile "Example with two 'TapProfile' models"
   extends Modelica.Icons.Example;
   package Medium = IDEAS.Media.Water;
 
-  IDEAS.Fluid.Taps.TapProfile tap1(redeclare package Medium = Medium)
+  IDEAS.Fluid.Taps.TapProfile tap1(redeclare package Medium = Medium, loadFile=
+        Modelica.Utilities.Files.loadResource(
+        "modelica://IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults.txt"))
     "DHW tap 1"
     annotation (Placement(transformation(extent={{-10,10},{10,30}})));
   IDEAS.Fluid.Taps.TapProfile tap2(redeclare package Medium = Medium, loadFile=
         Modelica.Utilities.Files.loadResource(
-        "modelica://IDEAS/Resources/DHW/DHW_1year_2adults_2children.txt"))
+        "modelica://IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults_2children.txt"))
     "DHW tap 2"
     annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
   IDEAS.Fluid.Sources.Boundary_pT bou1(

diff --git a/IDEAS/Fluid/Taps/TapProfile.mo b/IDEAS/Fluid/Taps/TapProfile.mo
@@ -5,8 +5,8 @@ model TapProfile
 
   parameter Real uniCon=1/60
     "Conversion factor to convert units from DHW profile [l/min] to [kg/s]";
-  parameter String loadFile=Modelica.Utilities.Files.loadResource(
-    "modelica://IDEAS/Resources/DHW/DHW_1year_2adults.txt") annotation(Dialog(loadSelector(filter="All files (*.*)", caption="Select the DHW profile file")));
+  parameter String loadFile
+   annotation(Dialog(loadSelector(filter="All files (*.*)", caption="Select the DHW profile file")));
 
   Modelica.Blocks.Sources.CombiTimeTable demPro(
     tableOnFile=true,

diff --git a/IDEAS/Resources/DHW/DHW_1year_2adults.txt → ...Fluid/Taps/Examples/DHW_1year_2adults.txt b/IDEAS/Resources/DHW/DHW_1year_2adults.txt → ...Fluid/Taps/Examples/DHW_1year_2adults.txt
diff --git a/...urces/DHW/DHW_1year_2adults_2children.txt → .../Examples/DHW_1year_2adults_2children.txt b/...urces/DHW/DHW_1year_2adults_2children.txt → .../Examples/DHW_1year_2adults_2children.txt
diff --git a/IDEAS/Resources/DHW/README.md → ...ources/Data/Fluid/Taps/Examples/README.md b/IDEAS/Resources/DHW/README.md → ...ources/Data/Fluid/Taps/Examples/README.md