Changeset 7251

Timestamp:

2021-07-20T19:14:19+02:00 (3 years ago)

Author:

agnes.ducharne

Message:

Same correction as in r6465 in the trunk: Correct the adjustments to evap_bare_lim_ns in diffuco_bare.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/diffuco.f90 (modified) (5 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/diffuco.f90

@@ -391 +391 @@
     !
 
-    CALL diffuco_bare (kjpindex, evap_bare_lim, evap_bare_lim_ns, vbeta2, vbeta3, vbeta4)
+    CALL diffuco_bare (kjpindex, tot_bare_soil, veget_max, evap_bare_lim, evap_bare_lim_ns, vbeta2, vbeta3, vbeta4)
 
   !! 6. Combine the alpha and beta coefficients
@@ -1194 +1194 @@
 !_ ================================================================================================================================
 
-  SUBROUTINE diffuco_bare (kjpindex, evap_bare_lim, evap_bare_lim_ns, vbeta2, vbeta3, vbeta4)
+  SUBROUTINE diffuco_bare (kjpindex, tot_bare_soil, veget_max, evap_bare_lim, evap_bare_lim_ns, vbeta2, vbeta3, vbeta4)
 
     !! 0. Variable and parameter declaration
@@ -1200 +1200 @@
     !! 0.1 Input variables
     INTEGER(i_std), INTENT(in)                         :: kjpindex       !! Domain size (-)
+    REAL(r_std),DIMENSION (kjpindex), INTENT(in)       :: tot_bare_soil  !! Total evaporating bare soil fraction
+    REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: veget_max      !! Max. fraction of vegetation type (LAI->infty) 
     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: vbeta2         !! Beta for Interception 
     REAL(r_std),DIMENSION (kjpindex,nvm), INTENT (in)  :: vbeta3         !! Beta for Transpiration 
@@ -1213 +1215 @@
     !! 0.4 Local variables
     INTEGER(i_std)                                     :: ji
-
+    REAL(r_std), DIMENSION(kjpindex)                   :: vegtot
+    
 !_ ================================================================================================================================
 
@@ -1234 +1237 @@
             (un - SUM(vbeta2(ji,:)+vbeta3(ji,:)) .GT. min_sechiba) ) THEN 
           ! eventually, none of the left-hand term is close to zero
-          
-          vbeta4(ji) = MIN(evap_bare_lim(ji), un - SUM(vbeta2(ji,:)+vbeta3(ji,:))) 
-          ! so that vbeta does not exceed 1
+
+          vegtot(ji) = SUM(veget_max(ji,:)) 
+          IF (evap_bare_lim(ji) < (un - SUM(vbeta2(ji,:)+vbeta3(ji,:)))) THEN 
+             ! Standard case 
+             vbeta4(ji) = evap_bare_lim(ji) 
+          ELSE 
+             vbeta4(ji) = un - SUM(vbeta2(ji,:)+vbeta3(ji,:)) 
+             
+             ! We now have to redefine evap_bare_lim & evap_bare_lim_ns 
+             IF (evap_bare_lim(ji) .GT. min_sechiba) THEN 
+                evap_bare_lim_ns(ji,:) = evap_bare_lim_ns(ji,:) * vbeta4(ji) / evap_bare_lim(ji) 
+             ELSE ! we must re-invent evap_bare_lim_ns => uniform across soiltiles              
+                evap_bare_lim_ns(ji,:) = tot_bare_soil(ji)/vegtot(ji) 
+             ENDIF
+         
+             evap_bare_lim(ji) = vbeta4(ji) 
+             ! consistent with evap_bare_lim(ji) = 
+             ! SUM(evap_bare_lim_ns(ji,:)*soiltile(ji,:)*vegtot(ji)) 
+             ! as SUM(soiltile(ji,:)) = 1 
+          END IF
           
        ELSE ! instead of having very small vbeta4, we set everything to zero