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

Merge branch 'develop' into 'master'

Develop

See merge request !24
parents 8ef76e6c 3d137b7b
No related branches found
No related tags found
1 merge request!24Develop
......@@ -29,9 +29,18 @@
<url>https://nexus.bedatadriven.com/content/groups/public/</url>
</repository>
<repository>
<id>osgeo</id>
<name>OSGEO</name>
<url>https://download.osgeo.org/webdav/geotools/</url>
<id>osgeo</id>
<name>OSGeo Release Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
<snapshots><enabled>false</enabled></snapshots>
<releases><enabled>true</enabled></releases>
</repository>
<repository>
<id>osgeo-snapshot</id>
<name>OSGeo Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/snapshot/</url>
<snapshots><enabled>true</enabled></snapshots>
<releases><enabled>false</enabled></releases>
</repository>
<repository>
<id>unidata-releases</id>
......
......@@ -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)));
......
......@@ -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)));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment