Skip to content
Snippets Groups Projects
Commit 6354fbfc authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Weather parameter refactoring

parent 9a6d687a
Branches
Tags
No related merge requests found
Pipeline #60 failed
...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment