Changeset 2471 for LMDZ5/branches/testing/libf/phylmd/dyn1d/1DUTILS.h

Timestamp:

Mar 18, 2016, 12:09:23 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2434:2457 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/dyn1d/1DUTILS.h (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/dyn1d/1DUTILS.h

@@ -4344 +4344 @@
 !
    INTEGER k,i
-   REAL zx_qs, rh, tnew, d_rh
+   REAL zx_qs, rh, tnew, d_rh, rhnew
 
 ! Declaration des constantes et des fonctions thermodynamiques
@@ -4361 +4361 @@
         print *,'temp ',t
         print *,'hum ',q
+!
         DO k = 1,klev
          DO i = 1,klon
-!!           IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN
+           IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN
             IF (t(i,k).LT.RTT) THEN
                zx_qs = qsats(t(i,k))/(pplay(i,k))
@@ -4374 +4375 @@
             d_rh = 1./tau*(rh_targ(i,k)-rh)
 !
-            tnew = t(i,k)+d_t(i,k)
+            tnew = t(i,k)+d_t(i,k)*dtime
+!jyg<
+!   Formule pour q :
+!                         d_q = (1/tau) [rh_targ*qsat(T_new) - q] 
+!
+!  Cette formule remplace d_q = (1/tau) [rh_targ - rh] qsat(T_new)
+!   qui n'était pas correcte.
+!
             IF (tnew.LT.RTT) THEN
                zx_qs = qsats(tnew)/(pplay(i,k))
@@ -4380 +4388 @@
                zx_qs = qsatl(tnew)/(pplay(i,k))
             ENDIF
-            d_q(i,k) = d_q(i,k) + d_rh*zx_qs
-!
-            print *,' k,d_t,rh,d_rh,d_q ',    &
-                      k,d_t(i,k),rh,d_rh,d_q(i,k)
-!!           ENDIF
+!!            d_q(i,k) = d_q(i,k) + d_rh*zx_qs
+            d_q(i,k) = d_q(i,k) + (1./tau)*(rh_targ(i,k)*zx_qs - q(i,k))
+            rhnew = (q(i,k)+d_q(i,k)*dtime)/zx_qs
+!
+            print *,' k,d_t,rh,d_rh,rhnew,d_q ',    &
+                      k,d_t(i,k),rh,d_rh,rhnew,d_q(i,k)
+           ENDIF
 !
          ENDDO