Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Mayer
CircularGreenSimCity
Commits
02dd05cf
Commit
02dd05cf
authored
1 year ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Adding Net Radiation to CSV
parent
75c3ad2f
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tree-water-demand/all_values.csv
+8762
-8762
tree-water-demand/all_values.csv
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+6
-2
...src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
with
8768 additions
and
8764 deletions
+8768
-8764
tree-water-demand/all_values.csv
+
8762
-
8762
View file @
02dd05cf
This diff is collapsed.
Click to expand it.
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+
6
-
2
View file @
02dd05cf
...
@@ -79,8 +79,8 @@ public class TreeWaterDemand {
...
@@ -79,8 +79,8 @@ public class TreeWaterDemand {
Locale
.
setDefault
(
new
Locale
(
"en"
,
"US"
));
Locale
.
setDefault
(
new
Locale
(
"en"
,
"US"
));
try
(
BufferedWriter
bw
=
Files
.
newBufferedWriter
(
Paths
.
get
(
"all_values.csv"
),
StandardCharsets
.
UTF_8
))
{
try
(
BufferedWriter
bw
=
Files
.
newBufferedWriter
(
Paths
.
get
(
"all_values.csv"
),
StandardCharsets
.
UTF_8
))
{
bw
.
write
(
bw
.
write
(
"DateTime;Temperature;Humidity;GHI;WindSpeed;SaturationVaporPressure;ActualVaporPressure;Psy;ET0;ET0u\n"
);
"DateTime;Temperature;Humidity;GHI;WindSpeed;SaturationVaporPressure;ActualVaporPressure;Psy;
NetRadiation;
ET0;ET0u\n"
);
bw
.
write
(
"dd/mm/yyyy HH:MM;[°C];[%];[W/m²];[m/s];[kPa];[kPa];[kPa/°C];[l/h];[l/h]\n"
);
bw
.
write
(
"dd/mm/yyyy HH:MM;[°C];[%];[W/m²];[m/s];[kPa];[kPa];[kPa/°C];[
?];[
l/h];[l/h]\n"
);
for
(
int
i
=
startHours
;
i
<=
startHours
+
hours
;
i
++)
{
for
(
int
i
=
startHours
;
i
<=
startHours
+
hours
;
i
++)
{
bw
.
write
(
String
.
format
(
"%s;"
,
counter
.
format
(
f
)));
bw
.
write
(
String
.
format
(
"%s;"
,
counter
.
format
(
f
)));
String
[]
row
=
csvValues
.
get
(
i
+
2
);
String
[]
row
=
csvValues
.
get
(
i
+
2
);
...
@@ -99,6 +99,9 @@ public class TreeWaterDemand {
...
@@ -99,6 +99,9 @@ public class TreeWaterDemand {
double
actualVaporPressure
=
actualVaporPressure
(
saturationVaporPressure
,
humidity
);
double
actualVaporPressure
=
actualVaporPressure
(
saturationVaporPressure
,
humidity
);
int
dayOfYear
=
counter
.
getDayOfYear
();
int
dayOfYear
=
counter
.
getDayOfYear
();
double
hourOfDay
=
counter
.
getHour
()
+
0.5
;
double
hourOfDay
=
counter
.
getHour
()
+
0.5
;
double
netRadiation
=
rn
(
temp
,
actualVaporPressure
,
incomingRadiation
,
height
,
dayOfYear
,
hourOfDay
,
lz
,
lm
);
double
et0
=
et0
(
temp
,
actualVaporPressure
,
incomingRadiation
,
height
,
windSpeed
,
humidity
,
dayOfYear
,
double
et0
=
et0
(
temp
,
actualVaporPressure
,
incomingRadiation
,
height
,
windSpeed
,
humidity
,
dayOfYear
,
hourOfDay
,
lz
,
lm
);
hourOfDay
,
lz
,
lm
);
double
et0u
=
et0u
(
svf
,
advection
,
et0
);
double
et0u
=
et0u
(
svf
,
advection
,
et0
);
...
@@ -107,6 +110,7 @@ public class TreeWaterDemand {
...
@@ -107,6 +110,7 @@ public class TreeWaterDemand {
bw
.
write
(
String
.
format
(
";%.5f"
,
saturationVaporPressure
));
bw
.
write
(
String
.
format
(
";%.5f"
,
saturationVaporPressure
));
bw
.
write
(
String
.
format
(
";%.5f"
,
actualVaporPressure
));
bw
.
write
(
String
.
format
(
";%.5f"
,
actualVaporPressure
));
bw
.
write
(
String
.
format
(
";%.5f"
,
gamma
(
height
)));
bw
.
write
(
String
.
format
(
";%.5f"
,
gamma
(
height
)));
bw
.
write
(
String
.
format
(
";%.5f"
,
netRadiation
));
bw
.
write
(
String
.
format
(
";%.3f"
,
et0
));
bw
.
write
(
String
.
format
(
";%.3f"
,
et0
));
bw
.
write
(
String
.
format
(
";%.3f"
,
et0u
));
bw
.
write
(
String
.
format
(
";%.3f"
,
et0u
));
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment