diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000000000000000000000000000000000000..7af283851de240798d152814f62a85dfc8037044 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +target/ +classes/ +.project +.classpath +.settings/ diff --git a/src/main/java/no/nibio/model/maizepheno/MaizePhenologyModel.java b/src/main/java/no/nibio/model/maizepheno/MaizePhenologyModel.java index cc676e7514fe3291524153f1003a44cbe2055df4..d077b01731917be4cd14d9b1a0c1816b8e19c99d 100644 --- a/src/main/java/no/nibio/model/maizepheno/MaizePhenologyModel.java +++ b/src/main/java/no/nibio/model/maizepheno/MaizePhenologyModel.java @@ -91,7 +91,9 @@ public class MaizePhenologyModel extends I18nImpl implements Model{ Result result = new ResultImpl(); result.setValidTimeStart(currentDate); Double TMD = this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.TMD); - Double dailyContribution = this.getDailyContribution(TMD); + Double dailyContribution = TMD != null ? this.getDailyContribution(TMD) // Default: All is well + : retVal.size() > 0 ? Double.valueOf(retVal.get(retVal.size()-1).getValue(MaizePhenologyModel.MODEL_ID.toString(), DataMatrix.DAILY_HEAT_SUM_CONTRIBUTION)) // Simple copy from yesterday + : 0.0; // Panic heatSum += dailyContribution != null ? dailyContribution : 0.0; result.setValue(CommonNamespaces.NS_WEATHER, DataMatrix.TMD, TMD != null ? dFormat.format(TMD) : "null");