diff --git a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java index 9f703007971ace0bfa97132a9ef34be1c764cb62..1fd776767c0d71dd572e4e0133076084f62b2bfd 100644 --- a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java +++ b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java @@ -322,10 +322,18 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{ } private Boolean isWetConditionsMet(Date startOfYesterdayData, Date endOfCurrentDay) throws ModelExcecutionException { + // Check if leaf wetness data series ends sometime today + Date lastLeafWetnessTime = this.dataMatrix.getLastDateWithParameterValue(DataMatrix.BT); + if(endOfCurrentDay.after(lastLeafWetnessTime)) + { + endOfCurrentDay = lastLeafWetnessTime; + } + + // Check conditions Calendar cal = Calendar.getInstance(timeZone); Date currentHour = startOfYesterdayData; Integer consecutiveWetHours = 0; - while(currentHour.before(endOfCurrentDay)) + while(currentHour.compareTo(endOfCurrentDay) <= 0) { Double hourLeafWetness = this.dataMatrix.getParamDoubleValueForDate(currentHour, DataMatrix.BT); if(hourLeafWetness == null)