Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Mayer
CircularGreenSimCity
Commits
87f41508
Commit
87f41508
authored
1 year ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
one more column
parent
bbfb7f67
master
eric_enrich_trees
gPMayer2-master-patch-26512
gPMayer2-master-patch-49202
No related merge requests found
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
+3
-2
...src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
with
8765 additions
and
8764 deletions
+8765
-8764
tree-water-demand/all_values.csv
+
8762
-
8762
View file @
87f41508
This diff is collapsed.
Click to expand it.
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+
3
-
2
View file @
87f41508
...
...
@@ -79,8 +79,8 @@ public class TreeWaterDemand {
Locale
.
setDefault
(
new
Locale
(
"en"
,
"US"
));
try
(
BufferedWriter
bw
=
Files
.
newBufferedWriter
(
Paths
.
get
(
"all_values.csv"
),
StandardCharsets
.
UTF_8
))
{
bw
.
write
(
"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"
);
"DateTime;Temperature;Humidity;GHI;
DayOrNight;
WindSpeed;SaturationVaporPressure;ActualVaporPressure;Psy;NetRadiation;ET0;ET0u\n"
);
bw
.
write
(
"dd/mm/yyyy HH:MM;[°C];[%];[W/m²];[
0/1];[
m/s];[kPa];[kPa];[kPa/°C];[?];[l/h];[l/h]\n"
);
for
(
int
i
=
startHours
;
i
<=
startHours
+
hours
;
i
++)
{
bw
.
write
(
String
.
format
(
"%s;"
,
counter
.
format
(
f
)));
String
[]
row
=
csvValues
.
get
(
i
+
2
);
...
...
@@ -91,6 +91,7 @@ public class TreeWaterDemand {
bw
.
write
(
String
.
format
(
"%.1f"
,
temp
));
bw
.
write
(
String
.
format
(
";%.0f"
,
humidity
));
bw
.
write
(
String
.
format
(
";%.0f"
,
incomingRadiation
));
bw
.
write
(
String
.
format
(
";%d"
,
incomingRadiation
>
0
?
1
:
0
));
// convert to MJ/h - 1 W = 0.0036 MJ/h
incomingRadiation
*=
0.0036
;
...
...
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
Menu
Explore
Projects
Groups
Snippets