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
c61ee5a5
Commit
c61ee5a5
authored
Jul 07, 2023
by
Eric Duminil
Browse files
273.15 für Celsius -> Kelvin
parent
7c4c42bf
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
tree-water-demand/all_values.csv
View file @
c61ee5a5
This diff is collapsed.
Click to expand it.
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
View file @
c61ee5a5
...
@@ -168,7 +168,7 @@ public class TreeWaterDemand {
...
@@ -168,7 +168,7 @@ public class TreeWaterDemand {
double
delta
=
delta
(
temperature
,
saturationVaporPressure
);
double
delta
=
delta
(
temperature
,
saturationVaporPressure
);
double
g
=
g
(
netRadiation
,
shortWaveRadiation
>
0
);
double
g
=
g
(
netRadiation
,
shortWaveRadiation
>
0
);
double
n
=
0.408
*
delta
*
(
netRadiation
-
g
)
double
n
=
0.408
*
delta
*
(
netRadiation
-
g
)
+
gamma
*
(
37
/
(
temperature
+
273
))
*
windSpeed
*
(
saturationVaporPressure
-
actualVaporPressure
);
+
gamma
*
(
37
/
(
temperature
+
273
.15
))
*
windSpeed
*
(
saturationVaporPressure
-
actualVaporPressure
);
return
n
/
(
delta
+
gamma
*
(
1
+
0.34
*
windSpeed
));
return
n
/
(
delta
+
gamma
*
(
1
+
0.34
*
windSpeed
));
}
}
...
@@ -214,7 +214,7 @@ public class TreeWaterDemand {
...
@@ -214,7 +214,7 @@ public class TreeWaterDemand {
if
(
rsRsoQuotient
>
1
)
{
if
(
rsRsoQuotient
>
1
)
{
rsRsoQuotient
=
1
;
rsRsoQuotient
=
1
;
}
}
return
sigma
*
Math
.
pow
(
temperature
+
273.1
6
,
4
)
*
(
0.34
-
0.14
*
Math
.
sqrt
(
actualVaporPressure
))
return
sigma
*
Math
.
pow
(
temperature
+
273.1
5
,
4
)
*
(
0.34
-
0.14
*
Math
.
sqrt
(
actualVaporPressure
))
*
(
1.35
*
rsRsoQuotient
-
0.35
);
*
(
1.35
*
rsRsoQuotient
-
0.35
);
}
}
...
...
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