Changeset 2850 for LMDZ5/trunk

Timestamp:

Apr 13, 2017, 7:38:40 PM (8 years ago)

Author:

jyg

Message:

ener_conserv with q_l and q_s arguments

File:

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

LMDZ5/trunk/libf/phylmd/ener_conserv.F90

@@ -1 +1 @@
 subroutine ener_conserv(klon,klev,pdtphys, &
- &    puo,pvo,pto,pqo,pun,pvn,ptn,pqn,dtke,masse,exner,d_t_ec)
+ &                      puo,pvo,pto,pqo,pql0,pqs0, &
+ &                      pun,pvn,ptn,pqn,pqln,pqsn,dtke,masse,exner,d_t_ec)
 
 !=============================================================
@@ -19 +20 @@
 
 ! From module
-USE phys_local_var_mod, ONLY : d_u_vdf,d_v_vdf,d_t_vdf,d_u_ajs,d_v_ajs,d_t_ajs,d_u_con,d_v_con,d_t_con,d_t_diss
+USE phys_local_var_mod, ONLY : d_u_vdf,d_v_vdf,d_t_vdf,d_u_ajs,d_v_ajs,d_t_ajs, &
+ &                             d_u_con,d_v_con,d_t_con,d_t_diss
 USE phys_local_var_mod, ONLY : d_t_eva,d_t_lsc,d_q_eva,d_q_lsc
 USE phys_output_var_mod, ONLY : bils_ec,bils_ech,bils_tke,bils_kinetic,bils_enthalp,bils_latent,bils_diss
@@ -32 +34 @@
 INTEGER, INTENT(IN) :: klon,klev
 REAL, INTENT(IN) :: pdtphys
-REAL, DIMENSION(klon,klev),INTENT(IN) :: puo,pvo,pto,pqo
-REAL, DIMENSION(klon,klev),INTENT(IN) :: pun,pvn,ptn,pqn
-REAL, DIMENSION(klon,klev),INTENT(IN) :: masse,exner
-REAL, DIMENSION(klon,klev+1),INTENT(IN) :: dtke
-REAL, DIMENSION(klon,klev),INTENT(OUT) :: d_t_ec
-      integer k,i
+REAL, DIMENSION(klon,klev), INTENT(IN)      :: puo,pvo,pto,pqo,pql0,pqs0
+REAL, DIMENSION(klon,klev), INTENT(IN)      :: pun,pvn,ptn,pqn,pqln,pqsn
+REAL, DIMENSION(klon,klev), INTENT(IN)      :: masse,exner
+REAL, DIMENSION(klon,klev+1), INTENT(IN)    :: dtke
+!
+REAL, DIMENSION(klon,klev), INTENT(OUT)     :: d_t_ec
 
 ! Local
+      integer k,i
 REAL, DIMENSION(klon,klev+1) :: fluxu,fluxv,fluxt
 REAL, DIMENSION(klon,klev+1) :: dddu,dddv,dddt
@@ -56 +59 @@
    DO k = 1, klev
    DO i = 1, klon
-      ZRCPD = RCPD*(1.0+RVTMP2*pqn(i,k))
+      ZRCPD = RCPD*(1.0+RVTMP2*(pqn(i,k)+pqln(i,k)+pqsn(i,k)))
       d_t_ec(i,k)=0.5/ZRCPD &
  &      *(puo(i,k)**2+pvo(i,k)**2-pun(i,k)**2-pvn(i,k)**2)