Changeset 2425 for LMDZ5/branches

Timestamp:

Jan 13, 2016, 9:42:47 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Undoing revision 2414 that wasn't supposed to be done like this on the testing branch
Thanks Catherine! ;-)
LF

Location:

LMDZ5/branches/testing/libf/phylmd

Files:

• conf_phys_m.F90 (modified) (4 diffs)
• fisrtilp.F90 (modified) (2 diffs)
• fisrtilp.h (modified) (2 diffs)

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

@@ -202 +202 @@
     LOGICAL, SAVE :: ok_conserv_q_omp
     INTEGER, SAVE :: iflag_fisrtilp_qsat_omp
-    INTEGER, SAVE :: iflag_bergeron_omp
     LOGICAL,SAVE :: ok_strato_omp
     LOGICAL,SAVE :: ok_hines_omp, ok_gwd_rando_omp
@@ -755 +754 @@
 
     !Config  Key  = iflag_fisrtilp_qsat
-    !Config  Desc = Flag de fisrtilp
-    !Config  Def  = 0
-    !Config  Help = Flag  pour la pluie grande-échelle les options suivantes existent :
-    !Config         >1 nb iterations pour converger dans le calcul de qsat
+    !Config  Desc = Flag de convection
+    !Config  Def  = 1
+    !Config  Help = Flag  pour la convection les options suivantes existent :
+    !Config         -1 pour Kinetic energy correction
+    !Config         1  conservation kinetic and enthalpy
     iflag_fisrtilp_qsat_omp = 0
     CALL getin('iflag_fisrtilp_qsat',iflag_fisrtilp_qsat_omp)
-
-    !Config  Key  = iflag_bergeron
-    !Config  Desc = Flag de fisrtilp
-    !Config  Def  = 0
-    !Config  Help = Flag  pour la pluie grande-échelle les options suivantes existent :
-    !Config         0 pas d effet Bergeron
-    !Config         1 effet Bergeron pour T<0
-    iflag_bergeron_omp = 0
-    CALL getin('iflag_bergeron',iflag_bergeron_omp)
 
     !
@@ -1967 +1958 @@
     ok_conserv_q = ok_conserv_q_omp
     iflag_fisrtilp_qsat = iflag_fisrtilp_qsat_omp
-    iflag_bergeron = iflag_bergeron_omp
 
     epmax = epmax_omp
@@ -2238 +2228 @@
     write(lunout,*)'ok_conserv_q=',ok_conserv_q
     write(lunout,*)'iflag_fisrtilp_qsat=',iflag_fisrtilp_qsat
-    write(lunout,*)'iflag_bergeron=',iflag_bergeron
     write(lunout,*)' epmax = ', epmax
     write(lunout,*)' ok_adj_ema = ', ok_adj_ema

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

@@ -123 +123 @@
   PARAMETER (ztfondue=278.15)
   REAL dzfice(klon)
-  REAL zsolid
-  
   !
   LOGICAL appel1er
@@ -934 +932 @@
                *(paprs(i,k)-paprs(i,k+1))/(RG*dtime) 
            zifl(i) = zifl(i)+ MAX(zcond(i)*zfice(i)-zoliqi(i),0.0) &
-                    *(paprs(i,k)-paprs(i,k+1))/(RG*dtime)
+                    *(paprs(i,k)-paprs(i,k+1))/(RG*dtime)  
      !      zrfl(i) = zrfl(i)+  zpluie                         &
      !          *(paprs(i,k)-paprs(i,k+1))/(RG*dtime) 
      !      zifl(i) = zifl(i)+  zice                    &
-     !               *(paprs(i,k)-paprs(i,k+1))/(RG*dtime)
-         
-!CR : on prend en compte l'effet Bergeron dans les flux de precipitation
-           if ((iflag_bergeron.eq.1).and.(zt(i).LT.273.15)) then
-              zsolid = zrfl(i)
-              zifl(i) = zifl(i)+zrfl(i)
-              zrfl(i) = 0.
-              zt(i)=zt(i)+zsolid*(RG*dtime)/(paprs(i,k)-paprs(i,k+1)) &
-                      *(RLSTT-RLVTT)/RCPD/(1.0+RVTMP2*zq(i))
-           endif
-!RC                                    
+     !               *(paprs(i,k)-paprs(i,k+1))/(RG*dtime)                                    
 
          ENDIF                      

LMDZ5/branches/testing/libf/phylmd/fisrtilp.h

@@ -15 +15 @@
       INTEGER iflag_pdf
       INTEGER iflag_fisrtilp_qsat
-      INTEGER iflag_bergeron
 
       common/comfisrtilp/                                               &
@@ -27 +26 @@
      &     ,reevap_ice                                                  &
      &     ,iflag_fisrtilp_qsat                                         &
-     &     ,iflag_bergeron                                              &
      &     ,iflag_pdf