Changeset 3250 for LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/transp.F90

Timestamp:

Mar 12, 2018, 2:42:42 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Integration of transport diagnostics for the CMIP6 data request

File:

• LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/transp.F90 (modified) (3 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/transp.F90

@@ -1 +1 @@
 
-! $Header$
+! $Id$
 
-SUBROUTINE transp(paprs, tsol, t, q, u, v, geom, vtran_e, vtran_q, utran_e, &
-    utran_q)
+SUBROUTINE transp(paprs, tsol, t, q, ql, qs, u, v, geom, vtran_e, vtran_q, utran_e, &
+    utran_q, vtran_w, utran_w)
 
   USE dimphy
@@ -16 +16 @@
 
   REAL paprs(klon, klev+1), tsol(klon)
-  REAL t(klon, klev), q(klon, klev), u(klon, klev), v(klon, klev)
+  REAL t(klon, klev), q(klon, klev), ql(klon, klev), qs(klon, klev)
+  REAL u(klon, klev), v(klon, klev)
   REAL utran_e(klon), utran_q(klon), vtran_e(klon), vtran_q(klon)
+  REAL utran_w(klon), vtran_w(klon)
 
   INTEGER i, l
@@ -28 +30 @@
     vtran_e(i) = 0.0
     vtran_q(i) = 0.0
+    utran_w(i) = 0.0
+    vtran_w(i) = 0.0
   END DO
 
   DO l = 1, klev
     DO i = 1, klon
-      e = rcpd*t(i, l) + rlvtt*q(i, l) + geom(i, l)
+!      e = rcpd*t(i, l) + rlvtt*q(i, l) + geom(i, l)
+      e = rcpd*t(i, l) + geom(i, l)
       utran_e(i) = utran_e(i) + u(i, l)*e*(paprs(i,l)-paprs(i,l+1))/rg
       utran_q(i) = utran_q(i) + u(i, l)*q(i, l)*(paprs(i,l)-paprs(i,l+1))/rg
+      utran_w(i) = utran_w(i) + u(i, l)*(q(i, l)+ql(i, l)+qs(i, l))           &
+                                       *(paprs(i,l)-paprs(i,l+1))/rg
       vtran_e(i) = vtran_e(i) + v(i, l)*e*(paprs(i,l)-paprs(i,l+1))/rg
       vtran_q(i) = vtran_q(i) + v(i, l)*q(i, l)*(paprs(i,l)-paprs(i,l+1))/rg
+      vtran_w(i) = vtran_w(i) + v(i, l)*(q(i, l)+ql(i, l)+qs(i, l))           &
+                                       *(paprs(i,l)-paprs(i,l+1))/rg
     END DO
   END DO