Merge pull request #1393 from open-ideas/issue1384_moveFile

Issue1384 move files
open-ideas · Nov 13, 2024 · dc6ddeb · dc6ddeb
2 parents 82957bb + 0169e97
commit dc6ddeb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
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