Merge commit '9ea136c052291d626c445391f0bffc75641e37ea'

ARPA-SIMC · Dec 7, 2023 · 63efa74 · 63efa74
2 parents 26529d8 + 9ea136c
commit 63efa74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/agrolib/criteriaModel/water1D.cpp b/agrolib/criteriaModel/water1D.cpp
@@ -411,9 +411,9 @@ double computeEvaporation(std::vector<soil::Crit3DLayer> &soilLayers, double max
         isWaterSupply = false;
         sumEvap = 0.0;
 
-        for (int i=1; i<=nrEvapLayers; i++)
+        for (int i=1; i <= nrEvapLayers; i++)
         {
-            evapLayerThreshold = soilLayers[i].FC - coeffEvap[i-1] * (soilLayers[i].FC - soilLayers[i].HH);
+            evapLayerThreshold = soilLayers[i].HH + (1 - coeffEvap[i-1]) * (soilLayers[i].FC - soilLayers[i].HH) * 0.5;
             evapLayer = (coeffEvap[i-1] / sumCoeff) * residualEvaporation;
 
             if (soilLayers[i].waterContent > (evapLayerThreshold + evapLayer))

diff --git a/agrolib/crop/crop.cpp b/agrolib/crop/crop.cpp
@@ -648,7 +648,7 @@ double Crit3DCrop::getMaxEvaporation(double ET0)
 {
     double evapMax = ET0 * (1.0 - getCoveredSurfaceFraction());
     // TODO check evaporation on wet bare soil
-    return evapMax * 0.66;
+    return evapMax * 0.67;
 }