Changeset 2340

Timestamp:

Aug 18, 2015, 5:27:50 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Bug fix: Adding the tendencies from wakes to dry adjustement tendencies should only be done if wakes are computed.
EM + JYG

File:

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

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -984 +984 @@
   pde_u(:,:) = 0.
   aam=0.
+  d_t_adjwk(:,:)=0
+  d_q_adjwk(:,:)=0
 
   alp_bl_conv(:)=0.
@@ -2154 +2156 @@
         CALL ajsec(paprs, pplay, t_wake, q_wake, limbas, &
                   d_t_adjwk, d_q_adjwk)
-      ELSE
+      ENDIF
+!
       DO k=1,klev
-         DO i=1,klon
-           d_t_adjwk(i,k) = 0.
-           d_q_adjwk(i,k) = 0.
-         ENDDO
-      ENDDO
-     ENDIF
-!
-     DO k=1,klev
         DO i=1,klon
           IF (wake_s(i) .GT. 1.e-3) THEN
@@ -2172 +2167 @@
           ENDIF
         ENDDO
-     ENDDO
+      ENDDO
      ENDIF ! (iflag_wake>=1)
 !>jyg
@@ -2368 +2363 @@
 !jyg<
 !    Add the tendency due to the dry adjustment of the wake profile
-       DO k=1,klev
+      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
+            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
 !>jyg
 !