Changeset 2894 for LMDZ5/trunk

Timestamp:

May 30, 2017, 8:15:56 AM (7 years ago)

Author:

fhourdin

Message:

Nouvelles options pour la conservation de l'energie.

File:

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

LMDZ5/trunk/libf/phylmd/ener_conserv.F90

@@ -23 +23 @@
  &                             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_local_var_mod, ONLY : d_u_oro,d_v_oro,d_u_lif,d_v_lif
+USE phys_local_var_mod, ONLY : du_gwd_hines,dv_gwd_hines,dv_gwd_front,dv_gwd_rando
+USE phys_state_var_mod, ONLY : du_gwd_front,du_gwd_rando
 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
@@ -60 +62 @@
    DO k = 1, klev
    DO i = 1, klon
-     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
+      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
 !-jld ec_conser
 
@@ -94 +92 @@
       d_u(:,:)=0.
       d_v(:,:)=0.
+
+   ELSEIF (iflag_ener_conserv==3) THEN
+      d_t(:,:)=0.
+      d_u(:,:)=0.
+      d_v(:,:)=0.
+   ELSEIF (iflag_ener_conserv==4) THEN
+      d_t(:,:)=0.
+      d_u(:,:)=d_u_vdf(:,:)
+      d_v(:,:)=d_v_vdf(:,:)
+   ELSEIF (iflag_ener_conserv==5) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)
+      d_v(:,:)=d_v_vdf(:,:)
+   ELSEIF (iflag_ener_conserv==6) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)
+   ELSEIF (iflag_ener_conserv==7) THEN
+      d_t(:,:)=d_t_vdf(:,:)+d_t_ajs(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)
+   ELSEIF (iflag_ener_conserv==8) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)
+   ELSEIF (iflag_ener_conserv==9) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)+d_u_oro(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)+d_v_oro(:,:)
+   ELSEIF (iflag_ener_conserv==10) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)+d_u_oro(:,:)+d_u_lif(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)+d_v_oro(:,:)+d_v_lif(:,:)
+   ELSEIF (iflag_ener_conserv==11) THEN
+      d_t(:,:)=d_t_vdf(:,:)
+      d_u(:,:)=d_u_vdf(:,:)+d_u_ajs(:,:)+d_u_con(:,:)+d_u_oro(:,:)+d_u_lif(:,:) &
+   &  +du_gwd_hines(:,:)+du_gwd_front(:,:)+du_gwd_rando(:,:)
+      d_v(:,:)=d_v_vdf(:,:)+d_v_ajs(:,:)+d_v_con(:,:)+d_v_oro(:,:)+d_v_lif(:,:) &
+   &     +dv_gwd_hines(:,:)+dv_gwd_front(:,:)+dv_gwd_rando(:,:)
    ELSE
       abort_message = 'iflag_ener_conserv non prevu'