max evap depth moved to constants

ARPA-SIMC · Jun 17, 2024 · bc34a3f · bc34a3f
1 parent ab9887d
commit bc34a3f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/agrolib/criteriaModel/water1D.cpp b/agrolib/criteriaModel/water1D.cpp
@@ -399,7 +399,7 @@ double computeEvaporation(std::vector<soil::Crit1DLayer> &soilLayers, double max
         double layerDepth = soilLayers[i].depth + soilLayers[i].thickness / 2.0;
 
         double coeffDepth = MAXVALUE((layerDepth - minDepth) / (MAX_EVAPORATION_DEPTH - minDepth), 0);
-        // evaporation coefficient: 1 at depthMin, ~0.1 at MAX_EVAPORATION_DEPTH
+        // evaporation coefficient: 1 at depthMin, ~0.1 at maximum depth for evaporation
         coeffEvap[i-1] = exp(-2 * coeffDepth);
 
         sumCoeff += coeffEvap[i-1];

diff --git a/agrolib/criteriaModel/water1D.h b/agrolib/criteriaModel/water1D.h
@@ -7,8 +7,6 @@
         #include "soil.h"
     #endif
 
-    #define MAX_EVAPORATION_DEPTH 0.25
-
     class Crit3DCrop;
 
     void initializeWater(std::vector<soil::Crit1DLayer> &soilLayers);

diff --git a/agrolib/mathFunctions/commonConstants.h b/agrolib/mathFunctions/commonConstants.h
@@ -92,6 +92,9 @@
     #define MEAN_GEOMETRIC 0
     #define MEAN_LOGARITHMIC 1
 
+    // maximum soil depth for evaporation computation [m]
+    #define MAX_EVAPORATION_DEPTH 0.25
+
     //#define BOUNDARY_SURFACE 1
     #define BOUNDARY_RUNOFF 2
     #define BOUNDARY_FREEDRAINAGE 3