From 34ac3f78309175b6e2b4970404b1741e9e0c9900 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 28 Apr 2022 13:30:46 +0200
Subject: [PATCH] Filling holes of DC with previous value(s)
---
.gitignore | 5 +++++
.../java/no/nibio/model/maizepheno/MaizePhenologyModel.java | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
create mode 100755 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..7af2838
--- /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 cc676e7..d077b01 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");
--
GitLab