Skip to content

Commit 24eea8f

Browse files
jelgerjansenjelgerjansen
authored
Merge pull request open-ideas#1463 from open-ideas/issue1462_NoGitLFS
Issue1462 no git lfs
2 parents d77c3e9 + 19eb9ad commit 24eea8f

File tree

17 files changed

+1002290
-18
lines changed

17 files changed

+1002290
-18
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@
1212
# Denote all files that are truly binary and should not be modified.
1313
*.png binary
1414
*.jpg binary
15-
IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements.txt filter=lfs diff=lfs merge=lfs -text

‎IDEAS/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_Electrical.mo‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
model PVT_UN_Electrical
33
"Electrical Behavior of Unglazed Rear-Non-Insulated PVT Collector"
44
extends Modelica.Icons.Example;
5-
65
replaceable package Medium = IDEAS.Media.Antifreeze.PropyleneGlycolWater (
76
property_T = 293.15,
87
X_a = 0.43);
8+
parameter String week = "week1";
99
parameter Modelica.Units.SI.Temperature T_start = 17.086651 + 273.15 "Initial temperature (from measurement data)";
1010
parameter Real eleLosFac = 0.07;
1111

1212
inner Modelica.Blocks.Sources.CombiTimeTable meaDat(
1313
tableOnFile=true,
1414
tableName="data",
15-
fileName=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements.txt"),
15+
fileName=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_"+week+".txt"),
1616
columns=1:26) annotation (Placement(transformation(extent={{-92,24},{-72,44}})));
1717

1818
Modelica.Thermal.HeatTransfer.Celsius.ToKelvin TFluKel annotation (Placement(transformation(extent={{-87,-1},
@@ -100,6 +100,11 @@ even under challenging real-world conditions.
100100
revisions="<html>
101101
<ul>
102102
<li>
103+
September 3, 2025, by Jelger Jansen:<br/>
104+
Introduce <code>week</code> parameter to change the weather dataset.
105+
This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1462\">#1462</a>.
106+
</li>
107+
<li>
103108
July 7, 2025, by Lone Meertens:<br/>
104109
First implementation PVT model.
105110
This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1436\">#1436</a>.

‎IDEAS/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_Thermal.mo‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ model PVT_UN_Thermal
55
replaceable package Medium = IDEAS.Media.Antifreeze.PropyleneGlycolWater (
66
property_T = 293.15,
77
X_a = 0.43);
8+
parameter String week = "week1";
89
parameter Modelica.Units.SI.Temperature T_start = 17.086651 + 273.15 "Initial temperature (from measurement data)";
910
parameter Real eleLosFac = 0.07;
1011

1112
inner Modelica.Blocks.Sources.CombiTimeTable meaDat(
1213
tableOnFile=true,
1314
tableName="data",
14-
fileName=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements.txt"),
15+
fileName=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_"+week+".txt"),
1516
columns=1:26) annotation (Placement(transformation(extent={{-92,24},{-72,44}})));
1617

1718
Modelica.Thermal.HeatTransfer.Celsius.ToKelvin TFluKel annotation (Placement(transformation(extent={{-87,-1},
@@ -109,6 +110,11 @@ This filtered metric better reflects the model's accuracy under realistic operat
109110
revisions="<html>
110111
<ul>
111112
<li>
113+
September 3, 2025, by Jelger Jansen:<br/>
114+
Introduce <code>week</code> parameter to change the weather dataset.
115+
This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1462\">#1462</a>.
116+
</li>
117+
<li>
112118
July 7, 2025, by Lone Meertens:<br/>
113119
First implementation PVT model.
114120
This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1436\">#1436</a>.

‎IDEAS/Fluid/PVTCollectors/Validation/PVT_UN/package.mo‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@ an uncovered and uninsulated PVT collector,
99
based on experimental data from a long-term outdoor test campaign in Austria (Veynandt et al., 2023).
1010
</p>
1111
<p>
12-
The dataset spans 58 consecutive summer days with 5-second resolution, capturing a wide range of operating conditions.
12+
The full dataset spans 58 consecutive summer days with 5-second resolution, capturing a wide range of operating conditions.
1313
Notably, the test period includes days with several hours of very high wind speeds, reaching up to <i>10–12&nbsp;m/s</i>,
1414
which significantly affect convective heat losses.
1515
</p>
1616
<p>
17+
The full dataset was split into 8 weeks to limit the file size per dataset.
18+
The validation models allow to change the week via the parameter <code>week</code>.
19+
The user can also merge the files together into one dataset and
20+
change the <code>fileName</code> parameter in the <code>meaDat</code> block
21+
to simulate the all 58 summer days in one run.
22+
</p>
23+
<p>
1724
The package includes two models:
1825
</p>
1926
<ul>

‎IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_week1.txt‎

Lines changed: 120962 additions & 0 deletions
Large diffs are not rendered by default.

‎IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_week2.txt‎

Lines changed: 120962 additions & 0 deletions
Large diffs are not rendered by default.

‎IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_week3.txt‎

Lines changed: 120962 additions & 0 deletions
Large diffs are not rendered by default.

‎IDEAS/Resources/Data/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_measurements_week4.txt‎

Lines changed: 120962 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)