Changeset 2886 for LMDZ5/branches/testing/libf/phylmd/ener_conserv.F90

Timestamp:

May 20, 2017, 9:41:16 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2865:2885 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/ener_conserv.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/ener_conserv.F90

@@ -24 +24 @@
 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
+USE add_phys_tend_mod, ONLY : fl_cor_ebil 
 
 IMPLICIT none
@@ -59 +60 @@
    DO k = 1, klev
    DO i = 1, klon
-      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)
-      ENDDO
-      ENDDO
+     IF (fl_cor_ebil .GT. 0) then
+       ZRCPD = RCPD*(1.0+RVTMP2*(pqn(i,k)+pqln(i,k)+pqsn(i,k)))
+     ELSE
+       ZRCPD = RCPD*(1.0+RVTMP2*pqn(i,k))
+     ENDIF
+     d_t_ec(i,k)=0.5/ZRCPD &
+ &     *(puo(i,k)**2+pvo(i,k)**2-pun(i,k)**2-pvn(i,k)**2)
+   ENDDO
+   ENDDO
 !-jld ec_conser