Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue1384 move files #1393

Merged
merged 5 commits into from
Nov 13, 2024
Merged

Issue1384 move files #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4dde2f
move files to correct location
lucasverleyen Nov 11, 2024
064f02e
update file paths in examples
lucasverleyen Nov 11, 2024
81b860a
move files to correct location
lucasverleyen Nov 13, 2024
364f331
remove default string
lucasverleyen Nov 13, 2024
0169e97
update paths and add string (since no default anymore)
lucasverleyen Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions IDEAS/Fluid/Taps/Examples/TapProfile.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions IDEAS/Fluid/Taps/TapProfile.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
0 IDEAS/Resources/DHW/DHW_1year_2adults.txt → ...Fluid/Taps/Examples/DHW_1year_2adults.txt
View file
Open in desktop
File renamed without changes.
0 ...urces/DHW/DHW_1year_2adults_2children.txt → .../Examples/DHW_1year_2adults_2children.txt
View file
Open in desktop
File renamed without changes.
0 IDEAS/Resources/DHW/README.md → ...ources/Data/Fluid/Taps/Examples/README.md
View file
Open in desktop
File renamed without changes.
Loading