Changeset 3886

Timestamp:

Apr 30, 2021, 11:45:23 PM (3 years ago)

Author:

Laurent Fairhead

Message:

By request, re-introduction of two 'bugs' so that running without the iflag_new_t2mq2m
gives exactly the same results as CMIP6 previous simulations

Location:

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd

Files:

• cdrag_mod.F90 (modified) (3 diffs)
• pbl_surface_mod.F90 (modified) (1 diff)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/cdrag_mod.F90

@@ -130 +130 @@
   INTEGER, SAVE :: iflag_corr_insta
   !$OMP THREADPRIVATE(iflag_corr_insta)
+
+  integer, save :: iflag_new_t2mq2m
+  !$OMP THREADPRIVATE(iflag_new_t2mq2m)
 
 !===================================================================c
@@ -201 +204 @@
    iflag_corr_sta=2
    iflag_corr_insta=2
- 
+   iflag_new_t2mq2m=0
+
    CALL getin_p('iflag_corr_sta',iflag_corr_sta)
    CALL getin_p('iflag_corr_insta',iflag_corr_insta)
-
+   CALL getin_p('iflag_new_t2mq2m',iflag_new_t2mq2m)
    firstcall = .FALSE.
  ENDIF
@@ -221 +225 @@
                  (1.+ RETV * max(q1(i),0.0))))           ! negative q1 set to zero 
      ztsolv = tsurf(i) * (1.0+RETV*max(qsurf(i),0.0))    ! negative qsurf set to zero
-     ztvd = (t1(i)+zgeop1(i)/RCPD/(1.+RVTMP2*max(q1(i),0.0))) &
-          *(1.+RETV*max(q1(i),0.0))                      ! negative q1 set to zero
+     IF (iflag_new_t2mq2m==0) THEN
+        ztvd = (t1(i)+zgeop1(i)/RCPD/(1.+RVTMP2*q1(i))) &
+             *(1.+RETV*max(q1(i),0.0))                   ! negative q1 set to zero
+     ELSE
+        ztvd = (t1(i)+zgeop1(i)/RCPD/(1.+RVTMP2*max(q1(i),0.0))) &
+             *(1.+RETV*max(q1(i),0.0))                   ! negative q1 set to zero
+     ENDIF
+     
      zri(i) = zgeop1(i)*(ztvd-ztsolv)/(zdu2*ztvd)
 

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/pbl_surface_mod.F90

@@ -3114 +3114 @@
     DO nsrf = 1, nbsrf
        DO i = 1, klon
-          zxqsurf(i) = zxqsurf(i) + MAX(qsurf(i,nsrf),0.0) * pctsrf(i,nsrf)
+          IF (iflag_new_t2mq2m==0) THEN
+             zxqsurf(i) = zxqsurf(i) + qsurf(i,nsrf) * pctsrf(i,nsrf)
+          ELSE
+             zxqsurf(i) = zxqsurf(i) + MAX(qsurf(i,nsrf),0.0) * pctsrf(i,nsrf)
+          ENDIF
+          
           zxsnow(i)  = zxsnow(i)  + snow(i,nsrf)  * pctsrf(i,nsrf)
        END DO