Index: trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90
===================================================================
--- trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90	(revision 545)
+++ trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90	(revision 546)
@@ -400,5 +400,4 @@
 
 ! Best config for norad 222 levels:
-! with yamada4 and alim at sqrt(zlev)
 
        omega=0.06
@@ -408,10 +407,19 @@
        be=1.1*be
        ad = 0.0004
-       b1inv=0.00035
        adalim=0.
-
-      b1inv=0.00025
-
+       b1inv=0.00025
+
+
+!      b1=0.0007
+!      omega=0.06
 ! Trying stuff :
+
+!      ad=0.00035
+!      ae=0.95*ae
+!      b1=0.00055
+!      omega=0.04
+!
+!      ad = 0.0003
+!      ae=0.9*ae
 
 !      omega=0.04
@@ -451,4 +459,5 @@
 !     &                       /sqrt(zlev(ig,2))
       &                       *zlev(ig,2)
+!      &                     *exp(-zlev(ig,2)/1000.)
                lalim(ig)=2
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,1)
@@ -464,4 +473,5 @@
 !     &                       /sqrt(zlev(ig,l+1))
       &                       *zlev(ig,l+1)
+!      &                     *exp(-zlev(ig,l+1)/1000.)
                 lalim(ig)=l+1
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
@@ -537,5 +547,4 @@
           do ig=1,ngridmx
              if(activecell(ig)) then
-
 !                if(l .lt. lalim(ig)) then
 !               ztva_est(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+  &
@@ -649,5 +658,5 @@
 !---------------------------------------------------------------------------
 
-      DO tic=0,5  ! internal convergence loop
+      DO tic=0,0  ! internal convergence loop
       activetmp(:)=activecell(:) .and. f_star(:,l+1)>1.e-10
       do ig=1,ngridmx
@@ -678,5 +687,4 @@
 
 ! ================ RECOMPUTE ENTR, DETR, and F FROM NEW W2 ===================
-
 
       do ig=1,ngridmx
@@ -732,5 +740,5 @@
       endif
       enddo
-
+ 
       ENDDO   ! of tic
 
@@ -1266,6 +1274,16 @@
 
 
-            if(zlay(ig,l) .le. zmax(ig)) then
-          ztvd(ig,l)=ztv(ig,l)*((zlay(ig,l)/zmax(ig))/299.7 + 0.997832)
+!             if (zbuoy(ig,l) .gt. 0.) then
+!               ztvd(ig,l)=ztva(ig,l)*0.9998
+!!               ztvd(ig,l)=ztv(ig,l)*0.997832
+!!             else
+!!               if(zlay(ig,l) .le. zmax(ig)) then            
+!!               ztvd(ig,l)=ztv(ig,l)*((zlay(ig,l)/zmax(ig))/299.7 + 0.997832)
+!!               endif
+!             endif
+
+            if(zlay(ig,l) .le. zmax(ig)) then            
+          ztvd(ig,l)=min(ztv(ig,l),ztv(ig,l)*((zlay(ig,l)/zmax(ig))/400. + 0.997832))
+!          ztvd(ig,l)=min(ztv(ig,l),ztv(ig,l)*((zlay(ig,l)/zmax(ig))/299.7 + 0.997832))
              else
           ztvd(ig,l)=ztv(ig,l)