Changeset 7476 for branches

Timestamp:

2022-02-16T11:31:52+01:00 (3 years ago)

Author:

josefine.ghattas

Message:

Moved getin KFACT_ROOT_TYPE from hydrol_main to hydrol_var_init and changed it to KFACT_ROOT_CONST (logical instead of character string). See ticket #817

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• orchidee.default (modified) (2 diffs)
• src_sechiba/hydrol.f90 (modified) (5 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/orchidee.default

@@ -1564 +1564 @@
 SOIL_REFTEMP_FILE =  reftemp.nc 
 
-# KFACT_ROOT_TYPE ([mm/d]) :  keyword added for spmip exp1 and exp4 to get a constant ks over soil depth and rootzone   {spmip exp1 or exp4}
-KFACT_ROOT_TYPE =  var 
-
 # DO_PONDS ([FLAG]) :  Should we include ponds          {}
 DO_PONDS =  n 
@@ -1648 +1645 @@
 KFACT_MAX =  10.0 
 
+# KFACT_ROOT_CONST ([y/n]) :  Set constant kfact_root in every soil layer. Otherwise kfact_root increase over soil depth in the rootzone.       {}
+KFACT_ROOT_CONST =  n 
+
 # DT_ROUTING  ([seconds]) :  Time step of the routing scheme    {RIVER_ROUTING}
 DT_ROUTING  =  86400. 

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/hydrol.f90

@@ -23 +23 @@
 !!                    Here, it leads to change dimensions and indices. 
 !!                    We can also impose kfact_root=1 in all soil layers to cancel the effect of
-!!                    roots on ks profile (keyword KFACT_ROOT_TYPE).
+!!                    roots on ks profile (keyword KFACT_ROOT_CONST).
 !!                 
 !! REFERENCE(S) :
@@ -90 +90 @@
                                                                                !! moisture usage, similar to Beer et al.2007
 !$OMP THREADPRIVATE(ok_dynroot)
+  LOGICAL, SAVE                                   :: kfact_root_const          !! Control kfact_root calculation, set constant kfact_root=1 if kfact_root_const=true
+!$OMP THREADPRIVATE(kfact_root_const)
   CHARACTER(LEN=80) , SAVE                        :: var_name                  !! To store variables names for I/O
 !$OMP THREADPRIVATE(var_name)
@@ -682 +684 @@
     INTEGER(i_std)                                     :: jsl              !! Index of soil layers (unitless)
     INTEGER(i_std)                                     :: ji, jv
-    CHARACTER(LEN=80)                                  :: kfact_root_type  !! read from run.def: when equal to 'cons', it indicates that
-                                                                           !! ks does not increase in the rootzone, ie, kfact_root=1; 
-                                                                           !! else, kfact_root defined as usual
     REAL(r_std),DIMENSION (kjpindex)                   :: soilwet          !! A temporary diagnostic of soil wetness
     REAL(r_std),DIMENSION (kjpindex)                   :: snowdepth_diag   !! Depth of snow layer containing default values, only for diagnostics
@@ -754 +753 @@
     !
     !! 3.2 computes vegetations reservoirs  ==>hydrol_vegupd
-! Modif temp vuichard
     CALL hydrol_vegupd(kjpindex, veget, veget_max, soiltile, qsintveg, frac_bare, drain_upd, runoff_upd)
 
+
+    
     !! Calculate kfact_root
-    !! An exponential factor is used to increase ks near the surface depending on the amount of roots in the soil 
-    !! through a geometric average over the vegets
-    !! This comes from the PhD thesis of d'Orgeval, 2006, p82; d'Orgeval et al. 2008, Eqs. 3-4
-    !! (Calibrated against Hapex-Sahel measurements)
-    !! Since rev 2916: veget_max/2 is used instead of veget
-    kfact_root(:,:,:) = un
-    DO jsl = 1, nslm
-       DO jv = 2, nvm
-          jst = pref_soil_veg(jv)
-          DO ji = 1, kjpindex
-             IF(soiltile(ji,jst) .GT. min_sechiba) THEN
-                kfact_root(ji,jsl,jst) = kfact_root(ji,jsl,jst) * &
-                     & MAX((MAXVAL(ks_usda)/ks(ji))**(- vegetmax_soil(ji,jv,jst)/2 * (humcste(jv)*zz(jsl)/mille - un)/deux), &
-                     un) 
-             ENDIF
+    IF (kfact_root_const) THEN
+       ! Set kfact_root constant to 1
+       kfact_root(:,:,:) = un
+    ELSE
+       ! An exponential factor is used to increase ks near the surface depending on the amount of roots in the soil 
+       ! through a geometric average over the vegets
+       ! This comes from the PhD thesis of d'Orgeval, 2006, p82; d'Orgeval et al. 2008, Eqs. 3-4
+       ! (Calibrated against Hapex-Sahel measurements)
+       ! Since rev 2916: veget_max/2 is used instead of veget
+       kfact_root(:,:,:) = un
+       DO jsl = 1, nslm
+          DO jv = 2, nvm
+             jst = pref_soil_veg(jv)
+             DO ji = 1, kjpindex
+                IF (soiltile(ji,jst) .GT. min_sechiba) THEN
+                   kfact_root(ji,jsl,jst) = kfact_root(ji,jsl,jst) * &
+                        MAX((MAXVAL(ks_usda)/ks(ji))**(- vegetmax_soil(ji,jv,jst)/2 * (humcste(jv)*zz(jsl)/mille - un)/deux), &
+                        un) 
+                ENDIF
+             ENDDO
           ENDDO
        ENDDO
-    ENDDO
-
-    !! KFACT_ROOT_TYPE = cons is used to impose that kfact_root = 1 in every soil layer,
-    !! so that ks does not increase in the rootzone; else, kfact_root defined as usual
-    !Config Key   = KFACT_ROOT_TYPE
-    !Config Desc  = keyword added for spmip exp1 and exp4 to get a constant ks over soil depth and rootzone
-    !Config If    = spmip exp1 or exp4
-    !Config Def   = var
-    !Config Help  = can have two values: 'cons' or 'var'. If var then no changes, if cons then kfact_root=un
-    !Config Units = [mm/d]
-    kfact_root_type = 'var'
-    CALL getin_p("KFACT_ROOT_TYPE",kfact_root_type)
-
-    IF (kfact_root_type=='cons') THEN
-       kfact_root(:,:,:) = un
-    ENDIF
+    END IF
+
 
     !
@@ -2865 +2856 @@
     END IF
 
+
+
+    !Config Key   = KFACT_ROOT_CONST
+    !Config Desc  = Set constant kfact_root in every soil layer. Otherwise kfact_root increase over soil depth in the rootzone. 
+    !Config If    = 
+    !Config Def   = n
+    !Config Help  = Use KFACT_ROOT_CONST=true to impose kfact_root=1 in every soil layer. Otherwise kfact_root increase over soil depth in the rootzone. 
+    !Config Units = [y/n]
+    kfact_root_const = .FALSE.
+    CALL getin_p("KFACT_ROOT_CONST",kfact_root_const)
+
     
     !-