Changeset 2839 for LMDZ5/branches/testing/libf/phylmd/reevap.F90

Timestamp:

Mar 30, 2017, 4:16:38 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/reevap.F90 (modified) (4 diffs)

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

@@ -2 +2 @@
    &         d_t_eva,d_q_eva,d_ql_eva,d_qs_eva)
 
-
+    ! flag to include modifications to ensure energy conservation (if flag >0)
+    USE add_phys_tend_mod, only : fl_cor_ebil 
+    
     IMPLICIT none
     !>======================================================================
@@ -22 +24 @@
     ! Re-evaporer l'eau liquide nuageuse
     !
-
+!print *,'rrevap ; fl_cor_ebil:',fl_cor_ebil,' iflag_ice_thermo:',iflag_ice_thermo,' RVTMP2',RVTMP2
     DO k = 1, klev  ! re-evaporation de l'eau liquide nuageuse
        DO i = 1, klon
+        if (fl_cor_ebil .GT. 0) then
+          zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
+          zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k)))
+        else
           zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*q_seri(i,k))
           !jyg<
@@ -30 +36 @@
           !                  A verifier !!!
           zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*q_seri(i,k))
+        end if
           IF (iflag_ice_thermo .EQ. 0) THEN
              zlsdcp=zlvdcp
@@ -39 +46 @@
 
              zdelta = MAX(0.,SIGN(1.,RTT-t_seri(i,k)))
+  zdelta = 0.
              zb = MAX(0.0,ql_seri(i,k))
              za = - MAX(0.0,ql_seri(i,k)) &