From 500d66442577548b675ff376c0449e62a90e53a4 Mon Sep 17 00:00:00 2001
From: bhabesh <bhabesh.mukhopadhyay@nibio.no>
Date: Tue, 10 Mar 2020 09:23:38 +0100
Subject: [PATCH] Correction of DSV calculation

Correction of DSV calculation to ensure temperature and leaf wetness duration are within prescribe dew model table
---
 .../vips/model/alternariamodel/AlternariaModel.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
index 5f7e4d0..c79f8b6 100644
--- a/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
+++ b/src/main/java/no/nibio/vips/model/alternariamodel/AlternariaModel.java
@@ -480,14 +480,14 @@ public class AlternariaModel extends I18nImpl implements Model{
         if ((temp >= 18  && temp <= 20) && (lw <= 3 ))                  dsvResult =     0;
         if ((temp >= 18  && temp <= 20) && (lw >= 4  && lw <= 8 ))      dsvResult =     1;
         if ((temp >= 18  && temp <= 20) && (lw >= 9  && lw <= 15))      dsvResult =     2;
-        if ((temp >= 18  && temp <= 20) && (lw <= 16 && lw <= 22))      dsvResult =     3;
+        if ((temp >= 18  && temp <= 20) && (lw >= 16 && lw <= 22))      dsvResult =     3;
         if ((temp >= 18  && temp <= 20) && (lw >= 23))                  dsvResult =     4;
         
         if ((temp >= 21  && temp <= 25) && (lw <= 2 ))                  dsvResult =     0;
-        if ((temp >= 21  && temp <= 25) && (lw <= 3  && lw <= 5 ))      dsvResult =     1;
-        if ((temp >= 21  && temp <= 25) && (lw <= 6  && lw <= 12))      dsvResult =     2;
-        if ((temp >= 21  && temp <= 25) && (lw <= 13 && lw <= 20))      dsvResult =     3;
-        if ((temp >= 21  && temp <= 25) && (lw >= 23))                  dsvResult =     4;
+        if ((temp >= 21  && temp <= 25) && (lw >= 3  && lw <= 5 ))      dsvResult =     1;
+        if ((temp >= 21  && temp <= 25) && (lw >= 6  && lw <= 12))      dsvResult =     2;
+        if ((temp >= 21  && temp <= 25) && (lw >= 13 && lw <= 20))      dsvResult =     3;
+        if ((temp >= 21  && temp <= 25) && (lw >= 21))                  dsvResult =     4;
         
         if ((temp >= 26  && temp <= 29) && (lw <= 3))                   dsvResult =     0;
         if ((temp >= 26  && temp <= 29) && (lw >= 4  && lw <= 8))       dsvResult =     1;
-- 
GitLab