Changeset 2051 for LMDZ5/trunk/libf

Timestamp:

May 22, 2014, 5:30:38 PM (11 years ago)

Author:

musat

Message:

Calcul de bils_ech seulement si iflag_ener_conserv >=1
IM

• This line, and those below, will be ignored--

M ener_conserv.F90
M phys_output_write_mod.F90

Location:

LMDZ5/trunk/libf/phylmd

Files:

• ener_conserv.F90 (modified) (4 diffs)
• phys_output_write_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/ener_conserv.F90

@@ -153 +153 @@
 
       bils_ec(:)=0.
-      bils_ech(:)=0.
       bils_tke(:)=0.
       bils_diss(:)=0.
@@ -161 +160 @@
       DO k=1,klev
         bils_ec(:)=bils_ec(:)-d_t_ec(:,k)*masse(:,k)
-        bils_ech(:)=bils_ech(:)-d_t_ech(:,k)*masse(:,k)
         bils_tke(:)=bils_tke(:)+0.5*(dtke(:,k)+dtke(:,k+1))*masse(:,k)
         bils_diss(:)=bils_diss(:)-d_t_diss(:,k)*masse(:,k)
@@ -175 +173 @@
       ENDDO
       bils_ec(:)=rcpd*bils_ec(:)/pdtphys
-      bils_ech(:)=rcpd*bils_ech(:)/pdtphys
       bils_tke(:)=bils_tke(:)/pdtphys
       bils_diss(:)=rcpd*bils_diss(:)/pdtphys
@@ -181 +178 @@
       bils_enthalp(:)=rcpd*bils_enthalp(:)/pdtphys
       bils_latent(:)=rlvtt*bils_latent(:)/pdtphys
+
+IF (iflag_ener_conserv>=1) THEN
+      bils_ech(:)=0.
+      DO k=1,klev
+        bils_ech(:)=bils_ech(:)-d_t_ech(:,k)*masse(:,k)
+      ENDDO
+      bils_ech(:)=rcpd*bils_ech(:)/pdtphys
+ENDIF
+
 RETURN
 

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -467 +467 @@
        CALL histwrite_phy(o_bils_diss, bils_diss)
        CALL histwrite_phy(o_bils_ec, bils_ec)
-       CALL histwrite_phy(o_bils_ech, bils_ech)
+       IF (iflag_ener_conserv>=1) THEN
+         CALL histwrite_phy(o_bils_ech, bils_ech)
+       ENDIF
        CALL histwrite_phy(o_bils_tke, bils_tke)
        CALL histwrite_phy(o_bils_kinetic, bils_kinetic)