diff --git a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java index 4b4c7e7496848fbaeb07424d91d761af3fb87518..8b7fa8681f5290daa518f3f91769edf71ce56cb2 100644 --- a/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java +++ b/src/main/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModel.java @@ -156,7 +156,38 @@ public class SeptoriaReferenceHumidityModel implements Model { @Override public String getModelDescription(String language) { - return "TODO"; + return "<p>The reference humidity model was developed as a supplement to " + + "the Humidity model. In this model 20 consecutive hours are " + + "required to fulfil a risk period. One constraint in this " + + "method is that you can have 19 consecutive risk hours or, " + + "fx 14 hours with risk then one hour below the Rh threshold " + + "and then maybe 14 hours again with risk hours. In one of " + + "these situations, the model will indicate a risk. In the " + + "reference model the definition of Humid hours was introduced. " + + "The Rh threshold was avoided as humid hours do not need to be " + + "consecutive. The running sum of humid hours across three days " + + "indicate that the Septoria risk is higher than if you have " + + "three days with humid conditions than two or one. The operation " + + "of the model should include weather forecast data and should " + + "run 6 days ahead from current day if you include a 7-day weather " + + "forecast (60 hours from national met office and until 7 days from ECMWF)</p>" + + +"<p>The model was tested against the Humidity model in a Danish " + + "Septoria project funded by the GUDP. The threshold of 40 was " + + "defined as high risk as this coincided with periods when the " + + "humidity model recommended to apply fungicide (if not already protected). " + + "The humidity model includes a decision model about when to spray, " + + "protection periods ect. The reference model was used to quality " + + "control the recommendations in a way that, if the reference humidity " + + "hours were higher than 40 (no thresholds) then the user should " + + "check the raw data for calculation of the Humidity model (threshold, " + + "20 consecutive hours). If 2-3 periods of 17, 18, or 19 consecutive " + + "hours appear, then one can consider to protect the crop based on the " + + "reference model alone. </p>" + + + "<p>The Humidity model is considered as a DSS with several components. " + + "The reference humidity model is considered as a weather based submodel " + + "for the risk of Septoria, Easy to map and calculate based on weather data alone.</p>"; } @Override diff --git a/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java b/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java index afca9d66998e5f3cc226e7c18d527764d2928055..bf14852d0a0d303c6e16be138256d156b2d70af5 100644 --- a/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java +++ b/src/test/java/no/nibio/vips/model/septoriareferencehumiditymodel/SeptoriaReferenceHumidityModelTest.java @@ -80,7 +80,7 @@ public class SeptoriaReferenceHumidityModelTest { System.out.println("getModelId"); SeptoriaReferenceHumidityModel instance = new SeptoriaReferenceHumidityModel(); ModelId result = instance.getModelId(); - assertEquals(result, SeptoriaReferenceHumidityModel.MODEL_ID); + assertEquals(result, SeptoriaReferenceHumidityModel.MODEL_ID); }