Changeset 2007 for LMDZ5/trunk/libf/phylmd/add_phys_tend.F90

Timestamp:

Apr 6, 2014, 2:20:38 PM (10 years ago)

Author:

fhourdin

Message:

Modification pour garantir la conservation des espèces traces.

Modification for tracer conservation

Jean-Yves Grandpeix

File:

• LMDZ5/trunk/libf/phylmd/add_phys_tend.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/add_phys_tend.F90

@@ -18 +18 @@
 use phys_state_var_mod
 IMPLICIT none
-#include "iniprint.h"
-#include "YOMCST.h"
+  include "iniprint.h"
+  include "YOMCST.h"
+  include "clesphys.h"
 
 ! Arguments :
@@ -117 +118 @@
       DO j = 1, jqbad
         i=jqadrs(j)
-        IF (.NOT.done(i)) THEN                  !jyg
           if(prt_level.ge.debug_level) THEN
            print*,'WARNING  : EAU POUR LE POINT i rlon rlat =',i,rlon(i),rlat(i),text
@@ -125 +125 @@
            ENDDO
           endif
+          IF (ok_conserv_q) THEN
 !jyg<20140228 Corrections pour conservation de l'eau
-          DO k = 1, klev
-            zqp(k) = max(q_seri(i,k),1.e-15)
-          ENDDO
-          zq_int  = 0.
-          zqp_int = 0.
-          DO k = 1, klev
-            zq_int  = zq_int  + q_seri(i,k)*(paprs(i,k)-paprs(i,k+1))/Rg
-            zqp_int = zqp_int + zqp(k)     *(paprs(i,k)-paprs(i,k+1))/Rg
-          ENDDO
-          if(prt_level.ge.debug_level) THEN
-           print*,' cas q_seri<1.e-15 i k zq_int zqp_int zq_int/zqp_int :', &
-                                i, kqadrs(j), zq_int, zqp_int, zq_int/zqp_int
-          endif
-          DO k = 1, klev
-            zq_new = zqp(k)*zq_int/zqp_int
-            zdq(i,k) = zdq(i,k) + zq_new - q_seri(i,k)
-            q_seri(i,k) = zq_new
-          ENDDO
-          done(i) = .true.
-        ENDIF !(.NOT.done(i))
-
-!         DO k = 1, klev
-!           zq=q_seri(i,k)+zdq(i,k)
-!           if (zq.lt.1.e-15) then
-!              if (q_seri(i,k).lt.1.e-15) then
-!               if(prt_level.ge.debug_level) THEN
-!                print*,' cas q_seri<1.e-15 i k q_seri zq zdq :',i,k,q_seri(i,k),zq,zdq(i,k)
-!               endif
-!               q_seri(i,k)=1.e-15
-!               zdq(i,k)=(1.e-15-q_seri(i,k))
+            IF (.NOT.done(i)) THEN                  !jyg
+              DO k = 1, klev
+                zqp(k) = max(q_seri(i,k),1.e-15)
+              ENDDO
+              zq_int  = 0.
+              zqp_int = 0.
+              DO k = 1, klev
+                zq_int  = zq_int  + q_seri(i,k)*(paprs(i,k)-paprs(i,k+1))/Rg
+                zqp_int = zqp_int + zqp(k)     *(paprs(i,k)-paprs(i,k+1))/Rg
+              ENDDO
+              if(prt_level.ge.debug_level) THEN
+               print*,' cas q_seri<1.e-15 i k zq_int zqp_int zq_int/zqp_int :', &
+                                    i, kqadrs(j), zq_int, zqp_int, zq_int/zqp_int
+              endif
+              DO k = 1, klev
+                zq_new = zqp(k)*zq_int/zqp_int
+                zdq(i,k) = zdq(i,k) + zq_new - q_seri(i,k)
+                q_seri(i,k) = zq_new
+              ENDDO
+              done(i) = .true.
+            ENDIF !(.NOT.done(i))
+          ELSE 
+!jyg>
+            DO k = 1, klev
+              zq=q_seri(i,k)+zdq(i,k)
+              if (zq.lt.1.e-15) then
+                 if (q_seri(i,k).lt.1.e-15) then
+                  if(prt_level.ge.debug_level) THEN
+                   print*,' cas q_seri<1.e-15 i k q_seri zq zdq :',i,k,q_seri(i,k),zq,zdq(i,k)
+                  endif
+                  q_seri(i,k)=1.e-15
+                  zdq(i,k)=(1.e-15-q_seri(i,k))
+                 endif
+              endif
+!              zq=q_seri(i,k)+zdq(i,k)
+!              if (zq.lt.1.e-15) then
+!                 zdq(i,k)=(1.e-15-q_seri(i,k))
 !              endif
-!           endif
-!!           zq=q_seri(i,k)+zdq(i,k)
-!!           if (zq.lt.1.e-15) then
-!!              zdq(i,k)=(1.e-15-q_seri(i,k))
-!!           endif
-!         ENDDO
+            ENDDO
+!jyg<20140228
+          ENDIF   !  (ok_conserv_q)
 !jyg>
-      ENDDO
+      ENDDO ! j = 1, jqbad
 ENDIF
 !