diff --git a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java old mode 100644 new mode 100755 index ccf3c37b4e3742affb9944db3632d41168a135ce..32b82d6c5a32d719351b4cb980eccca22860fc30 --- a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java +++ b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java @@ -207,6 +207,15 @@ public class OatFloweringModel extends I18nImpl implements Model{ ObjectMapper mapper = new ObjectMapper(); List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){}); + + // Must be complete set of daily mean temperatures + WeatherUtil wUtil = new WeatherUtil(); + Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE); + if(potentialHole != null) + { + throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole); + } + for(WeatherObservation o:observations) { switch(o.getElementMeasurementTypeId()) @@ -221,17 +230,9 @@ public class OatFloweringModel extends I18nImpl implements Model{ // TODO: Throw validation error? break; } - - // Must be complete set of daily mean temperatures - WeatherUtil wUtil = new WeatherUtil(); - Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE); - if(potentialHole != null) - { - throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole); - } - } + if(config.getConfigParameter("dateOfSowing") != null) { this.dateOfSowing = mapper.convertValue(config.getConfigParameter("dateOfSowing"), new TypeReference<Date>(){});