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
c61ee5a5
Commit
c61ee5a5
authored
1 year ago
by
Eric Duminil
Browse files
Options
Download
Email Patches
Plain Diff
273.15 für Celsius -> Kelvin
parent
7c4c42bf
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
+8283
-8283
tree-water-demand/all_values.csv
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+2
-2
...src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
with
8285 additions
and
8285 deletions
+8285
-8285
tree-water-demand/all_values.csv
+
8283
-
8283
View file @
c61ee5a5
This diff is collapsed.
Click to expand it.
tree-water-demand/src/main/java/de/hft/stuttgart/water/TreeWaterDemand.java
+
2
-
2
View file @
c61ee5a5
...
...
@@ -168,7 +168,7 @@ public class TreeWaterDemand {
double
delta
=
delta
(
temperature
,
saturationVaporPressure
);
double
g
=
g
(
netRadiation
,
shortWaveRadiation
>
0
);
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
));
}
...
...
@@ -214,7 +214,7 @@ public class TreeWaterDemand {
if
(
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
);
}
...
...
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