From e4dde2f9914e2481db1e61514fa0a1bac8589633 Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Mon, 11 Nov 2024 16:51:36 +0100 Subject: [PATCH 1/6] move files to correct location --- IDEAS/Resources/{DHW => Data/Fluid/Taps}/DHW_1year_2adults.txt | 0 .../{DHW => Data/Fluid/Taps}/DHW_1year_2adults_2children.txt | 0 IDEAS/Resources/{DHW => Data/Fluid/Taps}/README.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename IDEAS/Resources/{DHW => Data/Fluid/Taps}/DHW_1year_2adults.txt (100%) rename IDEAS/Resources/{DHW => Data/Fluid/Taps}/DHW_1year_2adults_2children.txt (100%) rename IDEAS/Resources/{DHW => Data/Fluid/Taps}/README.md (100%) diff --git a/IDEAS/Resources/DHW/DHW_1year_2adults.txt b/IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults.txt similarity index 100% rename from IDEAS/Resources/DHW/DHW_1year_2adults.txt rename to IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults.txt diff --git a/IDEAS/Resources/DHW/DHW_1year_2adults_2children.txt b/IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults_2children.txt similarity index 100% rename from IDEAS/Resources/DHW/DHW_1year_2adults_2children.txt rename to IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults_2children.txt diff --git a/IDEAS/Resources/DHW/README.md b/IDEAS/Resources/Data/Fluid/Taps/README.md similarity index 100% rename from IDEAS/Resources/DHW/README.md rename to IDEAS/Resources/Data/Fluid/Taps/README.md From 064f02e701924bd9e44e9a776d4e63887cd3d9b3 Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Mon, 11 Nov 2024 16:51:52 +0100 Subject: [PATCH 2/6] update file paths in examples --- IDEAS/Fluid/Taps/Examples/TapProfile.mo | 2 +- IDEAS/Fluid/Taps/TapProfile.mo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IDEAS/Fluid/Taps/Examples/TapProfile.mo b/IDEAS/Fluid/Taps/Examples/TapProfile.mo index e82460dd2..9f3b52d40 100644 --- a/IDEAS/Fluid/Taps/Examples/TapProfile.mo +++ b/IDEAS/Fluid/Taps/Examples/TapProfile.mo @@ -8,7 +8,7 @@ model TapProfile "Example with two 'TapProfile' models" 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/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 index d9775783c..f8cfe5132 100644 --- a/IDEAS/Fluid/Taps/TapProfile.mo +++ b/IDEAS/Fluid/Taps/TapProfile.mo @@ -6,7 +6,7 @@ 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"))); + "modelica://IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults.txt") annotation(Dialog(loadSelector(filter="All files (*.*)", caption="Select the DHW profile file"))); Modelica.Blocks.Sources.CombiTimeTable demPro( tableOnFile=true, From c5130816e0ea8fe3df27126aa17fdaa64cdd550b Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Mon, 11 Nov 2024 17:21:35 +0100 Subject: [PATCH 3/6] correct error with medium --- IDEAS/Buildings/Components/Interfaces/PartialZone.mo | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/IDEAS/Buildings/Components/Interfaces/PartialZone.mo b/IDEAS/Buildings/Components/Interfaces/PartialZone.mo index f4f59fb09..9008164a2 100644 --- 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 @@ -513,6 +513,11 @@ end for; ", revisions="
  • +November 11, 2024 by Lucas Verleyen:
    +Change Medium to IDEAS.Media.Air and use 'constrainedby' for Modelica.Media.Interfaces.PartialMedium. +This is for #1375. +
    • +
  • April 26, 2024 by Jelger Jansen:
    Added parameter ignAss to ignore view factor asserts for non-physical unit test models. This is for #1272. From 81b860ab2aeabd66bbc84d43fd8f0c653fcf67a2 Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Wed, 13 Nov 2024 10:17:44 +0100 Subject: [PATCH 4/6] move files to correct location --- .../Data/Fluid/Taps/{ => Examples}/DHW_1year_2adults.txt | 0 .../Fluid/Taps/{ => Examples}/DHW_1year_2adults_2children.txt | 0 IDEAS/Resources/Data/Fluid/Taps/{ => Examples}/README.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename IDEAS/Resources/Data/Fluid/Taps/{ => Examples}/DHW_1year_2adults.txt (100%) rename IDEAS/Resources/Data/Fluid/Taps/{ => Examples}/DHW_1year_2adults_2children.txt (100%) rename IDEAS/Resources/Data/Fluid/Taps/{ => Examples}/README.md (100%) diff --git a/IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults.txt b/IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults.txt similarity index 100% rename from IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults.txt rename to IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults.txt diff --git a/IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults_2children.txt b/IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults_2children.txt similarity index 100% rename from IDEAS/Resources/Data/Fluid/Taps/DHW_1year_2adults_2children.txt rename to IDEAS/Resources/Data/Fluid/Taps/Examples/DHW_1year_2adults_2children.txt diff --git a/IDEAS/Resources/Data/Fluid/Taps/README.md b/IDEAS/Resources/Data/Fluid/Taps/Examples/README.md similarity index 100% rename from IDEAS/Resources/Data/Fluid/Taps/README.md rename to IDEAS/Resources/Data/Fluid/Taps/Examples/README.md From 364f331f2697a877166e4659434b0c9b278f1986 Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Wed, 13 Nov 2024 10:22:18 +0100 Subject: [PATCH 5/6] remove default string --- IDEAS/Fluid/Taps/TapProfile.mo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IDEAS/Fluid/Taps/TapProfile.mo b/IDEAS/Fluid/Taps/TapProfile.mo index f8cfe5132..b0164d68e 100644 --- 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/Data/Fluid/Taps/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, From 0169e971e082a502953f3deeb56a7bbb66ed7b5f Mon Sep 17 00:00:00 2001 From: Lucas Verleyen Date: Wed, 13 Nov 2024 10:22:43 +0100 Subject: [PATCH 6/6] update paths and add string (since no default anymore) --- IDEAS/Fluid/Taps/Examples/TapProfile.mo | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/IDEAS/Fluid/Taps/Examples/TapProfile.mo b/IDEAS/Fluid/Taps/Examples/TapProfile.mo index 9f3b52d40..6cc79bd5e 100644 --- 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/Data/Fluid/Taps/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(