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

Adding timezone awareness to avoid trouble with daily temperature timestamps

parent 6da9a673
No related branches found
No related tags found
No related merge requests found
...@@ -19,11 +19,13 @@ ...@@ -19,11 +19,13 @@
package no.bioforsk.vips.model.oatfloweringmodel; package no.bioforsk.vips.model.oatfloweringmodel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.TimeZone;
import no.bioforsk.vips.entity.ModelConfiguration; import no.bioforsk.vips.entity.ModelConfiguration;
import no.bioforsk.vips.entity.Result; import no.bioforsk.vips.entity.Result;
import no.bioforsk.vips.entity.ResultImpl; import no.bioforsk.vips.entity.ResultImpl;
...@@ -46,6 +48,7 @@ public class OatFloweringModel extends I18nImpl implements Model{ ...@@ -46,6 +48,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
private List<WeatherObservation> TM; private List<WeatherObservation> TM;
private Date dateOfSowing; private Date dateOfSowing;
private final static TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone("Europe/Oslo");
private final static ModelId MODEL_ID = new ModelId("OATFLOWERM"); private final static ModelId MODEL_ID = new ModelId("OATFLOWERM");
...@@ -220,7 +223,7 @@ public class OatFloweringModel extends I18nImpl implements Model{ ...@@ -220,7 +223,7 @@ public class OatFloweringModel extends I18nImpl implements Model{
// Must be complete set of daily mean temperatures // Must be complete set of daily mean temperatures
WeatherUtil wUtil = new WeatherUtil(); WeatherUtil wUtil = new WeatherUtil();
Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D); Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE);
if(potentialHole != null) if(potentialHole != null)
{ {
throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole); throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment