From 050a13d604f1245fabb95f0475db026243338c6f Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 25 Jan 2019 13:39:35 +0100
Subject: [PATCH] Refactoring weather element
---
.../no/nibio/vips/util/WeatherElements.java | 24 +++++++++++++++----
.../java/no/nibio/vips/util/WeatherUtil.java | 6 ++---
.../no/nibio/vips/util/WeatherUtilTest.java | 2 +-
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/no/nibio/vips/util/WeatherElements.java b/src/main/java/no/nibio/vips/util/WeatherElements.java
index 8919a28..d4bb958 100755
--- a/src/main/java/no/nibio/vips/util/WeatherElements.java
+++ b/src/main/java/no/nibio/vips/util/WeatherElements.java
@@ -43,13 +43,16 @@ public class WeatherElements {
*/
public static final String TEMPERATURE_INSTANTANEOUS = "TT";
/**
- * Soil temperature at 5cm, mean
+ * Soil temperatures at various depths
*/
public static final String SOIL_TEMPERATURE_5CM_MEAN ="TJM5";
+ public static final String SOIL_TEMPERATURE_10CM_MEAN ="TJM10";
+ public static final String SOIL_TEMPERATURE_25CM_MEAN ="TJM25";
+ public static final String SOIL_TEMPERATURE_50CM_MEAN ="TJM50";
/**
- * Soil temperature at 10cm, mean
+ * Dew point temperature (Celcius)
*/
- public static final String SOIL_TEMPERATURE_10CM_MEAN ="TJM10";
+ public static final String DEW_POINT_TEMPERATURE = "TD";
/**
* Aggregated rainfall (millimeters)
*/
@@ -73,11 +76,22 @@ public class WeatherElements {
/**
* Leaf wetness (Minutes per hour)
*/
- public static final String LEAF_WETNESS = "BT";
+ public static final String LEAF_WETNESS_DURATION = "BT";
/**
* Leaf wetness at ground level (Minutes per hour)
*/
- public static final String LEAF_WETNESS_GROUND_LEVEL = "BTg";
+ public static final String LEAF_WETNESS_DURATION_GROUND_LEVEL = "BTg";
+ /**
+ * Soil water content at various depths
+ */
+ public static final String SOIL_WATER_CONTENT_5CM = "VAN5";
+ public static final String SOIL_WATER_CONTENT_10CM = "VAN10";
+ public static final String SOIL_WATER_CONTENT_25CM = "VAN25";
+ public static final String SOIL_WATER_CONTENT_50CM = "VAN50";
+ /**
+ * Soil conductivity at various depths
+ */
+ public static final String SOIL_CONDUCTIVITY_5CM = "LEJ5";
/**
* Average wind speed (meters / second) for the last 60 minutes, measured at 2 meter height
*/
diff --git a/src/main/java/no/nibio/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java
index 0ab8d03..6c1499f 100755
--- a/src/main/java/no/nibio/vips/util/WeatherUtil.java
+++ b/src/main/java/no/nibio/vips/util/WeatherUtil.java
@@ -141,7 +141,7 @@ public class WeatherUtil {
}
WeatherObservation leafWetness = new WeatherObservation();
- leafWetness.setElementMeasurementTypeId(WeatherElements.LEAF_WETNESS);
+ leafWetness.setElementMeasurementTypeId(WeatherElements.LEAF_WETNESS_DURATION);
leafWetness.setLogIntervalId(WeatherObservation.LOG_INTERVAL_ID_1H);
leafWetness.setTimeMeasured(humObs.getTimeMeasured());
leafWetness.setValue(this.calculateLeafWetnessHourSimple(tempObs.getValue(), rainObs.getValue(), humObs.getValue()));
@@ -587,7 +587,7 @@ public class WeatherUtil {
{
calculatedBT.add(new WeatherObservation(
period[0],
- WeatherElements.LEAF_WETNESS,
+ WeatherElements.LEAF_WETNESS_DURATION,
WeatherObservation.LOG_INTERVAL_ID_1H,
0d
)
@@ -698,7 +698,7 @@ public class WeatherUtil {
{
WeatherObservation calculatedLeafWetness = new WeatherObservation(
temperature.get(i).getTimeMeasured(),
- WeatherElements.LEAF_WETNESS,
+ WeatherElements.LEAF_WETNESS_DURATION,
WeatherObservation.LOG_INTERVAL_ID_1H,
(double) this.calculateLeafWetnessNaerstad(lastLatentHeatFlux, precedingLeafWetnessValue, precipitation.get(i).getValue())
);
diff --git a/src/test/java/no/nibio/vips/util/WeatherUtilTest.java b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java
index 5d6ae17..b6cd185 100755
--- a/src/test/java/no/nibio/vips/util/WeatherUtilTest.java
+++ b/src/test/java/no/nibio/vips/util/WeatherUtilTest.java
@@ -327,7 +327,7 @@ public class WeatherUtilTest extends TestCase {
Q0.add(obs);
else if(obs.getElementMeasurementTypeId().equals(WeatherElements.PRECIPITATION))
RR.add(obs);
- else if(obs.getElementMeasurementTypeId().equals(WeatherElements.LEAF_WETNESS))
+ else if(obs.getElementMeasurementTypeId().equals(WeatherElements.LEAF_WETNESS_DURATION))
BT.add(obs);
}
--
GitLab