Changeset 2638 for LMDZ5/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Sep 29, 2016, 1:18:14 PM (8 years ago)

Author:

jyg

Message:

Some improvements to commit 2635 concerning wake
variables in physiq_mod.F90.

File:

• LMDZ5/trunk/libf/phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -1124 +1124 @@
     if (first) then 
 
+     CALL iophys_ini
+
        !CR:nvelles variables convection/poches froides
 
@@ -1401 +1403 @@
              ! 11/09/06 rajout initialisation ALE et ALP du wake et PBL(YU)
              !        print*,'apres ini_wake iflag_cld_th=', iflag_cld_th
+             !
+             ! Initialize tendencies of wake state variables (for some flag values
+             ! they are not computed).
+             d_deltat_wk(:,:) = 0.
+             d_deltaq_wk(:,:) = 0.
+             d_deltat_wk_gw(:,:) = 0.
+             d_deltaq_wk_gw(:,:) = 0.
+             d_deltat_vdf(:,:) = 0.
+             d_deltaq_vdf(:,:) = 0.
+             d_deltat_the(:,:) = 0.
+             d_deltaq_the(:,:) = 0.
+             d_deltat_ajs_cv(:,:) = 0.
+             d_deltaq_ajs_cv(:,:) = 0.
+             d_s_wk(:) = 0.
+             d_dens_wk(:) = 0.
           endif
 
@@ -2420 +2437 @@
              CALL ajsec(paprs, pplay, t_w, q_w, limbas, &
                   d_t_adjwk, d_q_adjwk)
-          ENDIF
-          !
-          DO k=1,klev
-             DO i=1,klon
-                IF (wake_s(i) .GT. 1.e-3) THEN
-                   t_w(i,k) = t_w(i,k) + d_t_adjwk(i,k)
-                   q_w(i,k) = q_w(i,k) + d_q_adjwk(i,k)
-                   d_deltat_ajs_cv(i,k) = d_t_adjwk(i,k)
-                   d_deltaq_ajs_cv(i,k) = d_q_adjwk(i,k)
-                ELSE
-                   d_deltat_ajs_cv(i,k) = 0.
-                   d_deltaq_ajs_cv(i,k) = 0.
-                ENDIF
+             !
+             DO k=1,klev
+                DO i=1,klon
+                   IF (wake_s(i) .GT. 1.e-3) THEN
+                      t_w(i,k) = t_w(i,k) + d_t_adjwk(i,k)
+                      q_w(i,k) = q_w(i,k) + d_q_adjwk(i,k)
+                      d_deltat_ajs_cv(i,k) = d_t_adjwk(i,k)
+                      d_deltaq_ajs_cv(i,k) = d_q_adjwk(i,k)
+                   ELSE
+                      d_deltat_ajs_cv(i,k) = 0.
+                      d_deltaq_ajs_cv(i,k) = 0.
+                   ENDIF
+                ENDDO
              ENDDO
-          ENDDO
-          CALL add_wake_tend &
-              (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
+             CALL add_wake_tend &
+                 (d_deltat_ajs_cv, d_deltaq_ajs_cv, dsig0, ddens0, wkoccur1, 'ajs_cv', abortphy) 
+          ENDIF  ! (ok_adjwk)
        ENDIF ! (iflag_wake>=1)
        !>jyg
        !
+        
+!!      print *,'physiq. q_w(1,k), q_x(1,k) ', &
+!!             (k, q_w(1,k), q_x(1,k),k=1,25)
+
 !jyg<
        CALL alpale( debut, itap, dtime, paprs, omega, t_seri,   &
@@ -2885 +2906 @@
                 ENDDO
              ENDDO
-          ENDIF
-!
-          CALL add_wake_tend &
-              (d_deltat_the, d_deltaq_the, dsig0, ddens0, wkoccur1, 'the', abortphy) 
-!
+          !
+             CALL add_wake_tend &
+                 (d_deltat_the, d_deltaq_the, dsig0, ddens0, wkoccur1, 'the', abortphy) 
+          !
+          ENDIF  ! (mod(iflag_pbl_split/2,2) .EQ. 1)
           !
           CALL add_phys_tend(d_u_ajs,d_v_ajs,d_t_ajs,d_q_ajs,  &