Changeset 356

Timestamp:

Nov 7, 2011, 3:32:08 PM (13 years ago)

Author:

acolaitis

Message:

LMDZ.MARS Minor commit to clean some junk

File:

• trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90 (modified) (6 diffs)

trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90

@@ -63 +63 @@
       INTEGER ig,k,l,ll,iq
       INTEGER lmax(ngridmx),lmin(ngridmx),lalim(ngridmx)
-      INTEGER lmix(ngridmx)
-      INTEGER lmix_bis(ngridmx)
       REAL linter(ngridmx)
-      REAL zmix(ngridmx)
       REAL zmax(ngridmx)
       REAL ztva(ngridmx,nlayermx),zw_est(ngridmx,nlayermx+1),ztva_est(ngridmx,nlayermx)
@@ -124 +121 @@
       REAL denom(ngridmx)
       REAL zlevinter(ngridmx)
-
-! =========================================
-
-! ============= DRY VARIABLES =============
-
-       REAL zw2_dry(ngridmx,nlayermx+1)
-       REAL f_star_dry(ngridmx,nlayermx+1)
-       REAL ztva_dry(ngridmx,nlayermx+1)
-       REAL wmaxa_dry(ngridmx)
-       REAL wa_moy_dry(ngridmx,nlayermx+1)
-       REAL linter_dry(ngridmx),zlevinter_dry(ngridmx)
-       INTEGER lmix_dry(ngridmx),lmax_dry(ngridmx)
 
 ! =========================================
@@ -325 +310 @@
 
 ! Initialisation des variables entieres
-      lmix(:)=1
-      lmix_bis(:)=2
       wmaxa(:)=0.
       lalim(:)=1
@@ -627 +610 @@
         if (wa_moy(ig,l+1).gt.wmaxa(ig)) then
 !   lmix est le niveau de la couche ou w (wa_moy) est maximum
-!on rajoute le calcul de lmix_bis
-            lmix(ig)=l+1
             wmaxa(ig)=wa_moy(ig,l+1)
         endif
@@ -668 +649 @@
 
 !-------------------------------------------------------------------------------
-! Calcul des caracteristiques du thermique:zmax,zmix,wmax
+! Calcul des caracteristiques du thermique:zmax,wmax
 !-------------------------------------------------------------------------------
 
@@ -738 +719 @@
        endif
        enddo
-
-! def de  zmix continu (profil parabolique des vitesses)
-      do ig=1,ngridmx
-           if (lmix(ig).gt.1) then
-! test
-              if (((zw2(ig,lmix(ig)-1)-zw2(ig,lmix(ig)))  &
-     &        *((zlev(ig,lmix(ig)))-(zlev(ig,lmix(ig)+1)))  &
-     &        -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
-     &        *((zlev(ig,lmix(ig)-1))-(zlev(ig,lmix(ig))))).gt.1e-10)  &
-     &        then
-!
-            zmix(ig)=((zw2(ig,lmix(ig)-1)-zw2(ig,lmix(ig)))  &
-     &        *((zlev(ig,lmix(ig))*zlev(ig,lmix(ig)))-(zlev(ig,lmix(ig)+1)*zlev(ig,lmix(ig)+1)))  &
-     &        -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
-     &        *((zlev(ig,lmix(ig)-1)*zlev(ig,lmix(ig)-1))-(zlev(ig,lmix(ig))*zlev(ig,lmix(ig)))))  &
-     &        /(2.*((zw2(ig,lmix(ig)-1)-zw2(ig,lmix(ig)))  &
-     &        *((zlev(ig,lmix(ig)))-(zlev(ig,lmix(ig)+1)))  &
-     &        -(zw2(ig,lmix(ig))-zw2(ig,lmix(ig)+1))  &
-     &        *((zlev(ig,lmix(ig)-1))-(zlev(ig,lmix(ig))))))
-              else
-              zmix(ig)=zlev(ig,lmix(ig))
-              print*,'pb zmix'
-              endif
-          else
-              zmix(ig)=0.
-          endif
-!test
-         if ((zmax(ig)-zmix(ig)).le.0.) then
-            zmix(ig)=0.9*zmax(ig)
-         endif
-      enddo
-!
-! calcul du nouveau lmix correspondant
-      do ig=1,ngridmx
-         do l=1,nlayermx
-            if (zmix(ig).ge.zlev(ig,l).and.  &
-     &          zmix(ig).lt.zlev(ig,l+1)) then
-              lmix(ig)=l
-             endif
-          enddo
-      enddo
-
 
 ! Attention, w2 est transforme en sa racine carree dans cette routine