From ea20d26ee6980e9bdaf30034953c1e74bf857060 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 22 Jan 2019 12:28:25 +0100
Subject: [PATCH] Weather parameter refactoring
---
.../model/septoriahumiditymodel/SeptoriaHumidityModel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
index cef4fe3..8cbd4e7 100644
--- a/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriahumiditymodel/SeptoriaHumidityModel.java
@@ -141,7 +141,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
{
r.setValue(SeptoriaHumidityModel.MODEL_ID.toString(), DataMatrix.SPP, "1");
}
- r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.LEAF_WETNESS, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.BT)));
+ r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.LEAF_WETNESS_DURATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.BT)));
r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.RELATIVE_HUMIDITY_MEAN, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.UM)));
r.setValue(CommonNamespaces.NS_WEATHER, WeatherElements.PRECIPITATION, String.valueOf(this.dataMatrix.getParamDoubleValueForDate(currentDate, DataMatrix.RR)));
@@ -416,7 +416,7 @@ public class SeptoriaHumidityModel extends I18nImpl implements Model {
this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.UM, o.getValue());
}
break;
- case WeatherElements.LEAF_WETNESS:
+ case WeatherElements.LEAF_WETNESS_DURATION:
if(o.getLogIntervalId().equals(WeatherObservation.LOG_INTERVAL_ID_1H))
{
this.dataMatrix.setParamDoubleValueForDate(o.getTimeMeasured(), DataMatrix.BT, o.getValue());
--
GitLab