Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
Model_DOWNCASTMO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIPS
Models
Java
Model_DOWNCASTMO
Commits
6354fbfc
Commit
6354fbfc
authored
6 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Weather parameter refactoring
parent
9a6d687a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#60
failed
6 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
+3
-3
3 additions, 3 deletions
...java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
with
3 additions
and
3 deletions
src/main/java/no/nibio/vips/model/downcastmodel/DOWNCASTModel.java
+
3
−
3
View file @
6354fbfc
...
@@ -415,7 +415,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
...
@@ -415,7 +415,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
// Between 06:00 and 12:00 the current date
// Between 06:00 and 12:00 the current date
while
(
currentPossibleInfectionHour
.
compareTo
(
period4Limit
)
<=
0
)
while
(
currentPossibleInfectionHour
.
compareTo
(
period4Limit
)
<=
0
)
{
{
Double
BTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentPossibleInfectionHour
,
WeatherElements
.
LEAF_WETNESS_GROUND_LEVEL
);
Double
BTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentPossibleInfectionHour
,
WeatherElements
.
LEAF_WETNESS_
DURATION_
GROUND_LEVEL
);
if
(
BTg
==
null
)
if
(
BTg
==
null
)
{
{
...
@@ -527,7 +527,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
...
@@ -527,7 +527,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
Date
currentHour
=
firstHourAfterSporulation
;
Date
currentHour
=
firstHourAfterSporulation
;
while
(
currentHour
.
compareTo
(
lastPossibleInfectionTimeAfterSporulation
)
<=
0
)
while
(
currentHour
.
compareTo
(
lastPossibleInfectionTimeAfterSporulation
)
<=
0
)
{
{
Double
currentBTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentHour
,
WeatherElements
.
LEAF_WETNESS_GROUND_LEVEL
);
Double
currentBTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentHour
,
WeatherElements
.
LEAF_WETNESS_
DURATION_
GROUND_LEVEL
);
if
(
currentBTg
>=
12
||
last5LeafWetnessValues
!=
null
&&
!
last5LeafWetnessValues
.
isEmpty
())
if
(
currentBTg
>=
12
||
last5LeafWetnessValues
!=
null
&&
!
last5LeafWetnessValues
.
isEmpty
())
{
{
if
(
last5LeafWetnessValues
==
null
)
if
(
last5LeafWetnessValues
==
null
)
...
@@ -561,7 +561,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
...
@@ -561,7 +561,7 @@ public class DOWNCASTModel extends I18nImpl implements Model {
currentHour
=
cal
.
getTime
();
currentHour
=
cal
.
getTime
();
for
(
int
j
=
0
;
j
<
8
;
j
++)
for
(
int
j
=
0
;
j
<
8
;
j
++)
{
{
currentBTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentHour
,
WeatherElements
.
LEAF_WETNESS_GROUND_LEVEL
);
currentBTg
=
this
.
dataMatrix
.
getParamDoubleValueForDate
(
currentHour
,
WeatherElements
.
LEAF_WETNESS_
DURATION_
GROUND_LEVEL
);
if
(
currentBTg
>=
48
||
last3LeafWetnessValues
!=
null
)
if
(
currentBTg
>=
48
||
last3LeafWetnessValues
!=
null
)
{
{
if
(
last3LeafWetnessValues
==
null
)
if
(
last3LeafWetnessValues
==
null
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment