From 1140a190cf2b58430bbfd1a684ee15bc43a7013f Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 19 Jun 2019 14:11:42 +0200
Subject: [PATCH] Bugfix: Adding TM as fallback for missing TX
---
.../vips/model/bremialactucaemodel/BremiaLactucaeModel.java | 5 ++++-
.../no/nibio/vips/model/bremialactucaemodel/DataMatrix.java | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java b/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
index 63d89ed..63a9a04 100755
--- a/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
+++ b/src/main/java/no/nibio/vips/model/bremialactucaemodel/BremiaLactucaeModel.java
@@ -436,7 +436,10 @@ public class BremiaLactucaeModel extends I18nImpl implements Model {
Calendar cal = Calendar.getInstance(this.timeZone);
while(startTime.compareTo(endTime) <= 0)
{
- Double txHour = this.dataMatrix.getParamDoubleValueForDate(startTime, DataMatrix.TX);
+ // Using TM as fallback for TX
+ Double txHour = this.dataMatrix.getParamValueForDate(startTime, DataMatrix.TX) != null ?
+ this.dataMatrix.getParamDoubleValueForDate(startTime, DataMatrix.TX)
+ : this.dataMatrix.getParamDoubleValueForDate(startTime, DataMatrix.TM);
maxTemp = Math.max(maxTemp, txHour);
cal.setTime(startTime);
cal.add(Calendar.HOUR_OF_DAY, 1);
diff --git a/src/main/java/no/nibio/vips/model/bremialactucaemodel/DataMatrix.java b/src/main/java/no/nibio/vips/model/bremialactucaemodel/DataMatrix.java
index 0fa8a42..20a4b38 100755
--- a/src/main/java/no/nibio/vips/model/bremialactucaemodel/DataMatrix.java
+++ b/src/main/java/no/nibio/vips/model/bremialactucaemodel/DataMatrix.java
@@ -52,6 +52,11 @@ public class DataMatrix extends DateMap{
*/
public final static String TX = "TX";
+ /**
+ * Mean temp hourly
+ */
+ public final static String TM = "TM";
+
/**
* Enough relative humidity last night? (Rule #5) 1 or 0
*/
--
GitLab