From e2b464265b3d501f023372f71e435f4a44d4da2a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 20 Apr 2020 17:03:58 +0200
Subject: [PATCH] Adding weather data hole fixing to avoid trouble when
splicing historical data from certain sources (LMT and MeteoBot) and
forecasts
---
.../model/preprocessor/BremiaLactucaeModelPreprocessor.java | 2 +-
.../model/preprocessor/SeptoriaApiicolaModelPreprocessor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java
index 50092ba5..3b7784b1 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java
@@ -67,7 +67,7 @@ public class BremiaLactucaeModelPreprocessor extends ModelRunPreprocessor {
},
configuration.getDateStartInTimeZone(),
configuration.getDateEndInTimeZone());
- observations = wUtil.checkForAndFixHourlyTimeSeriesHoles(observations);
+ observations = wUtil.checkForAndFixHourlyTimeSeriesHolesMultiParameter(observations);
List<WeatherObservation> BTg = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION_GROUND_LEVEL)));
List<WeatherObservation> BT = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION)));
List<WeatherObservation> TX = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.TEMPERATURE_MAXIMUM)));
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java
index 8186262e..d034b5c3 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java
@@ -77,7 +77,7 @@ public class SeptoriaApiicolaModelPreprocessor extends ModelRunPreprocessor {
},
configuration.getDateStartInTimeZone(),
configuration.getDateEndInTimeZone());
- observations = wUtil.checkForAndFixHourlyTimeSeriesHoles(observations);
+ observations = wUtil.checkForAndFixHourlyTimeSeriesHolesMultiParameter(observations);
List<WeatherObservation> BT = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION)));
List<WeatherObservation> TM = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.TEMPERATURE_MEAN)));
List<WeatherObservation> RR = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.PRECIPITATION)));
--
GitLab