Changeset 8320 for branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Timestamp:

2023-11-27T11:40:01+01:00 (7 months ago)

Author:

josefine.ghattas

Message:

Integrated changes done in [8289] : New default Values for irrig param, root zone def based on user-def depth.

See also ticket #857

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/hydrol.f90 (modified) (6 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/hydrol.f90

@@ -2750 +2750 @@
     INTEGER(i_std)                                      :: iiref           !! To identify the mc_lins where k_lin and d_lin
                                                                            !! need special treatment
-    REAL(r_std), DIMENSION (kjpindex,nvm)               :: cum_nroot       !! local variable to acummulate nroot
-    INTEGER(i_std), DIMENSION (kjpindex,nvm)            :: nslm_pft_root   !! Deeper layer with cum_nroot > cum_nroot_thr per PFT,
+    REAL(r_std)                                         :: cum_dh          !! Depth to bottom layer 
+    INTEGER(i_std)                                      :: nslm_root_tmp   !! Temporal, deeper root zone soil layer 
     REAL(r_std), DIMENSION (kjpindex,nslm)              :: smf             !! Soil moisture of each layer at field capacity
                                                                            !!  @tex $(kg m^{-2})$ @endtex
@@ -2906 +2906 @@
     !! 2 Compute the root density profile if not ok_dynroot
     !!   For the case with ok_dynroot, the calculations are done at each time step in hydrol_soil
-    cum_nroot(:,:) = zero
-    nslm_pft_root(:,:) = nslm
+    cum_dh = zero
     nslm_root(:) =  nslm
+    nslm_root_tmp = nslm 
+    DO jsl =1, nslm 
+       IF( ( cum_dh ) < cum_dh_thr*mille) THEN  
+          cum_dh = cum_dh + dh(jsl) 
+          nslm_root_tmp = jsl 
+       ENDIF 
+    ENDDO 
+
+
     IF (.NOT. ok_dynroot) THEN
-       !! Calculation of nroot and of new nslm_root for irrigation 
+       !! Calculation of nroot 
        !! The three following equations concerning nroot computation are derived from the integrals
        !! of equations C9 to C11 of De Rosnay's (1999) PhD thesis (page 158).
@@ -2920 +2928 @@
           DO jv = 1,nvm
              DO ji=1, kjpindex
-                
-                
                 nroot(ji,jv,jsl) = (EXP(-humcste(jv)*zz(jsl)/mille)) * &
                      & (EXP(humcste(jv)*dz(jsl)/mille/deux) - &
@@ -2927 +2933 @@
                      & (EXP(-humcste(jv)*dz(2)/mille/deux) &
                      & -EXP(-humcste(jv)*zz(nslm)/mille))
-                !We acum. nroot, and change nslm_pft_root if necessary
-                cum_nroot(ji,jv) = cum_nroot(ji,jv) + nroot(ji,jv,jsl) !
-                
-                IF(cum_nroot(ji,jv) > cum_nroot_thr .AND. nslm_pft_root(ji,jv) .GE. jsl ) THEN
-                   nslm_pft_root(ji,jv) =  jsl
-                ENDIF
              ENDDO
              
@@ -2939 +2939 @@
        ENDDO
        !Last layer
-       !No need to put and IF here, if it is the case, nslm_pft_root is already
-       ! equal to nslm,
        DO jv = 1,nvm
           DO ji=1, kjpindex
@@ -2949 +2947 @@
           ENDDO
        ENDDO
-       !New loop to compute min. soil layer per cell, using just PFT that
-       !are not natural and exist inside the cell
-       DO jv=1, nvm
-          IF(.NOT. natural(jv)) THEN
-             DO ji=1,kjpindex
-                IF(veget_max(ji, jv) > min_sechiba) THEN
-                   nslm_root(ji) = MIN(nslm_root(ji), nslm_pft_root(ji,jv))
-                ENDIF
-             ENDDO
-          ENDIF
-       ENDDO
        
     END IF
 
+    DO ji=1,kjpindex 
+       IF ( SUM(veget_max(ji, : ), MASK= .NOT. (natural(:)) ) > min_sechiba) THEN 
+          nslm_root(ji) = nslm_root_tmp 
+       ENDIF 
+    ENDDO
+ 
     ! Calculates field capacity soil moisture per soil layers
     ! then calculate field capacity soil moisture over root zone