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
e5919908
Commit
e5919908
authored
1 year ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
Bugfix: Eq. 37
parent
636e41dc
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tree-water-demand/all_values.csv
+3464
-3464
tree-water-demand/all_values.csv
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+2
-1
...src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
with
3466 additions
and
3465 deletions
+3466
-3465
tree-water-demand/all_values.csv
+
3464
-
3464
View file @
e5919908
This diff is collapsed.
Click to expand it.
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+
2
-
1
View file @
e5919908
...
@@ -206,7 +206,7 @@ public class TreeWaterDemand {
...
@@ -206,7 +206,7 @@ public class TreeWaterDemand {
double
extraterrestrialRadiation
){
double
extraterrestrialRadiation
){
// divide by 24 for hourly
// divide by 24 for hourly
double
sigma
=
4.903
E
-
9
/
24
;
double
sigma
=
4.903
E
-
9
/
24
;
double
rso
=
(
0.75
+
2
*
10
E
-
5
*
altitude
)
*
extraterrestrialRadiation
;
double
rso
=
(
0.75
+
2
E
-
5
*
altitude
)
*
extraterrestrialRadiation
;
double
rsRsoQuotient
=
0.5
;
double
rsRsoQuotient
=
0.5
;
if
(
rso
!=
0
)
{
if
(
rso
!=
0
)
{
rsRsoQuotient
=
rs
/
rso
;
rsRsoQuotient
=
rs
/
rso
;
...
@@ -219,6 +219,7 @@ public class TreeWaterDemand {
...
@@ -219,6 +219,7 @@ public class TreeWaterDemand {
}
}
// ExtraterrestrialRadiation
// ExtraterrestrialRadiation
// unit is apparently [MJ / (m².h)]
private
static
double
ra
(
int
dayOfYear
,
double
hourOfDay
,
double
lz
,
double
lm
,
double
latitude
)
{
private
static
double
ra
(
int
dayOfYear
,
double
hourOfDay
,
double
lz
,
double
lm
,
double
latitude
)
{
double
dr
=
1
+
0.033
*
Math
.
cos
(
2
*
Math
.
PI
*
dayOfYear
/
365
d
);
double
dr
=
1
+
0.033
*
Math
.
cos
(
2
*
Math
.
PI
*
dayOfYear
/
365
d
);
double
b
=
(
2
*
Math
.
PI
*
(
dayOfYear
-
81
))
/
364
;
double
b
=
(
2
*
Math
.
PI
*
(
dayOfYear
-
81
))
/
364
;
...
...
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