Skip to content

Commit 9a1a8ff

Browse files
authored
Merge pull request UdK-VPT#139 from UdK-VPT/dev_new_weatherdata_incl_long_file
New weather data for Potsdam incl long file
2 parents a89f7fd + 60b3b37 commit 9a1a8ff

File tree

45 files changed

+202158
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+202158
-55
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2003_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2003_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2003_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2004_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2004_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2004_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2005_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2005_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2005_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2006_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2006_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2006_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2007_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2007_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2007_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2008_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2008_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2008_DWD_ASCII;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2009_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2009_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>source: DWD</html>"));
23+
end Germany_Potsdam2009_DWD_ASCII;
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2009to2018_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2009_to_2018_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>
23+
source: DWD <p>
24+
beginning of year: <br>
25+
2009: 0 h, 0 s <br>
26+
2010: 8760 h, 31536000 s <br>
27+
2011: 17520 h, 63072000 s <br>
28+
2012: 26280 h, 94608000 s <br>
29+
2013: 35064 h, 126230400 s <br>
30+
2014: 43824 h, 157766400 s <br>
31+
2015: 52584 h, 189302400 s <br>
32+
2016: 61344 h, 220838400 s <br>
33+
2017: 70128 h, 252460800 s <br>
34+
2018: 78888 h, 283996800 s <br>
35+
</html>"));
36+
end Germany_Potsdam2009to2018_DWD_ASCII;
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2009to2018_DWD_NetCDF
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileNetCDF(
4+
info="Source: DWD",
5+
fileName=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2009_to_2018_DWD.nc"))
6+
annotation(Documentation(info="<html>
7+
source: DWD <p>
8+
beginning of year: <br>
9+
2009: 0 h, 0 s <br>
10+
2010: 8760 h, 31536000 s <br>
11+
2011: 17520 h, 63072000 s <br>
12+
2012: 26280 h, 94608000 s <br>
13+
2013: 35064 h, 126230400 s <br>
14+
2014: 43824 h, 157766400 s <br>
15+
2015: 52584 h, 189302400 s <br>
16+
2016: 61344 h, 220838400 s <br>
17+
2017: 70128 h, 252460800 s <br>
18+
2018: 78888 h, 283996800 s <br>
19+
</html>"));
20+
end Germany_Potsdam2009to2018_DWD_NetCDF;
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
within BuildingSystems.Climate.WeatherDataDWD;
2+
block Germany_Potsdam2009to2018andTRY_DWD_ASCII
3+
extends BuildingSystems.Climate.WeatherData.BaseClasses.WeatherDataFileASCII(
4+
info="Source: DWD",
5+
filNam=Modelica.Utilities.Files.loadResource("modelica://BuildingSystems/Climate/weather/Germany_Potsdam_2009_to_2018_and_TRY_DWD.txt"),
6+
final tabNam="tab1",
7+
final timeFac = 1.0/3600.0,
8+
final deltaTime = 1800.0,
9+
final columns={
10+
5, // beam horizontal radiation
11+
6, // diffuse horizontal radiation
12+
3, // air temperature
13+
8, // wind speed
14+
9, // wind direction
15+
4, // relative humidity
16+
7 // cloud cover
17+
},
18+
final scaleFac = {1.0,1.0,1.0,1.0,1.0,0.01,1.0},
19+
final latitudeDeg = 52.47,
20+
final longitudeDeg = 13.4,
21+
final longitudeDeg_0 = 1.0);
22+
annotation(Documentation(info="<html>
23+
source: DWD <p>
24+
beginning of year: <br>
25+
2009: 0 h, 0 s <br>
26+
2010: 8760 h, 31536000 s <br>
27+
2011: 17520 h, 63072000 s <br>
28+
2012: 26280 h, 94608000 s <br>
29+
2013: 35064 h, 126230400 s <br>
30+
2014: 43824 h, 157766400 s <br>
31+
2015: 52584 h, 189302400 s <br>
32+
2016: 61344 h, 220838400 s <br>
33+
2017: 70128 h, 252460800 s <br>
34+
2018: 78888 h, 283996800 s <br>
35+
TRY: 87648 h, 315532800 s <br>
36+
</html>"));
37+
end Germany_Potsdam2009to2018andTRY_DWD_ASCII;

0 commit comments

Comments
 (0)