Changeset 2886 for LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

Timestamp:

May 20, 2017, 9:41:16 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2865:2885 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/physiq_mod.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

@@ -156 +156 @@
 !!!       d_s_the, d_dens_the, &            ! due to thermals
        !                                  
+       ptconv, &
        wbeff, convoccur, zmax_th, &
        sens, flwp, fiwp,  &
@@ -599 +600 @@
     LOGICAL,SAVE :: ok_adjwk=.FALSE.
     !$OMP THREADPRIVATE(ok_adjwk) 
+    INTEGER,SAVE :: iflag_adjwk=0            !jyg
+    !$OMP THREADPRIVATE(iflag_adjwk)         !jyg
     REAL,SAVE :: oliqmax=999.,oicemax=999.
     !$OMP THREADPRIVATE(oliqmax,oicemax) 
@@ -876 +879 @@
     save iflag_cld_th
     !$OMP THREADPRIVATE(iflag_cld_th)
-    logical ptconv(klon,klev)
+!IM logical ptconv(klon,klev)  !passe dans phys_local_var_mod
     !IM cf. AM 081204 BEG
     logical ptconvth(klon,klev)
@@ -1201 +1204 @@
        CALL suphel ! initialiser constantes et parametres phys.
        CALL getin_p('random_notrig_max',random_notrig_max)
-       CALL getin_p('ok_adjwk',ok_adjwk)
+       CALL getin_p('ok_adjwk',ok_adjwk) 
+       IF (ok_adjwk) iflag_adjwk=2  ! for compatibility with older versions
+       ! iflag_adjwk: ! 0 = Default: no convective adjustment of w-region
+                      ! 1 => convective adjustment but state variables are unchanged
+                      ! 2 => convective adjustment and state variables are changed
+       CALL getin_p('iflag_adjwk',iflag_adjwk)
        CALL getin_p('oliqmax',oliqmax)
        CALL getin_p('oicemax',oicemax)
@@ -2423 +2431 @@
        ! after the call to the convective scheme.
        IF (iflag_wake>=1) then
-          IF (ok_adjwk) THEN
+          IF (iflag_adjwk >= 1) THEN
              limbas(:) = 1
              CALL ajsec(paprs, pplay, t_w, q_w, limbas, &
@@ -2441 +2449 @@
                 ENDDO
              ENDDO
-             CALL add_wake_tend &
+             IF (iflag_adjwk == 2) THEN
+               CALL add_wake_tend &
                  (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
-          ENDIF  ! (ok_adjwk)
+             ENDIF  ! (iflag_adjwk == 2)
+          ENDIF  ! (iflag_adjwk >= 1)
        ENDIF ! (iflag_wake>=1)
        !>jyg
@@ -2525 +2535 @@
           !    Add the tendency due to the dry adjustment of the wake profile
           IF (iflag_wake>=1) THEN
-             DO k=1,klev
-                DO i=1,klon
-                   ftd(i,k) = ftd(i,k) + wake_s(i)*d_t_adjwk(i,k)/dtime
-                   fqd(i,k) = fqd(i,k) + wake_s(i)*d_q_adjwk(i,k)/dtime
-                   d_t_con(i,k) = d_t_con(i,k) + wake_s(i)*d_t_adjwk(i,k)
-                   d_q_con(i,k) = d_q_con(i,k) + wake_s(i)*d_q_adjwk(i,k)
-                ENDDO
-             ENDDO
-          ENDIF
+            IF (iflag_adjwk == 2) THEN
+              DO k=1,klev
+                 DO i=1,klon
+                    ftd(i,k) = ftd(i,k) + wake_s(i)*d_t_adjwk(i,k)/dtime
+                    fqd(i,k) = fqd(i,k) + wake_s(i)*d_q_adjwk(i,k)/dtime
+                    d_t_con(i,k) = d_t_con(i,k) + wake_s(i)*d_t_adjwk(i,k)
+                    d_q_con(i,k) = d_q_con(i,k) + wake_s(i)*d_q_adjwk(i,k)
+                 ENDDO
+              ENDDO
+            ENDIF  ! (iflag_adjwk = 2)
+          ENDIF   ! (iflag_wake>=1)
           !>jyg
           !