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

Making sure Leaf W and wind speed values are within correct period

parent c8307c64
No related branches found
No related tags found
No related merge requests found
...@@ -191,18 +191,21 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{ ...@@ -191,18 +191,21 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{
List<WeatherObservation> FM2 = new ArrayList<>(); List<WeatherObservation> FM2 = new ArrayList<>();
for(WeatherObservation o:observations) for(WeatherObservation o:observations)
{ {
switch(o.getElementMeasurementTypeId()) if(o.getTimeMeasured().compareTo(firstTimestamp) >=0)
{ {
case WeatherElements.LEAF_WETNESS: switch(o.getElementMeasurementTypeId())
BT.add(o); {
break; case WeatherElements.LEAF_WETNESS:
BT.add(o);
case WeatherElements.WIND_SPEED_2M: break;
FM2.add(o);
break; case WeatherElements.WIND_SPEED_2M:
default: FM2.add(o);
// Let it pass in silence break;
break; default:
// Let it pass in silence
break;
}
} }
} }
...@@ -253,7 +256,10 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{ ...@@ -253,7 +256,10 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{
} }
else else
{ {
throw new ConfigValidationException("Incorrect number of weather data. TM.size() = " + TM.size() + ", BT.size()=" + BT.size() + ", RR.size()=" + RR.size() ); throw new ConfigValidationException("Incorrect number of weather data. "
+ "TM.size() = " + TM.size() + " (first/last at " + TM.get(0).getTimeMeasured() + "/" + TM.get(TM.size()-1).getTimeMeasured() + "), "
+ "BT.size()=" + BT.size() + " (first/last at " + BT.get(0).getTimeMeasured() + "/" + BT.get(BT.size()-1).getTimeMeasured() + ", "
+ "RR.size()=" + RR.size() + " (first/last at " + RR.get(0).getTimeMeasured() + "/" + RR.get(RR.size()-1).getTimeMeasured() + ")");
} }
} }
List<WeatherObservation> retVal = new ArrayList<>(); List<WeatherObservation> retVal = new ArrayList<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment