Changeset 621 for trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90

Timestamp:

Apr 16, 2012, 12:00:40 PM (13 years ago)

Author:

acolaitis

Message:

Thermals. Finally corrected advection scheme... The bug was coming from a non conservation of fluxes, not from the advection scheme itself.

File:

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

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

@@ -175 +175 @@
       data firstcall/.true./
       REAL zhc(ngridmx,nlayermx)
-      REAL zdzfull(ngridmx,nlayermx)
       REAL ratiom(ngridmx,nlayermx)
 
@@ -411 +410 @@
        ad = 0.0004
        adalim=0.
+
        b1inv=0.00025
+!       b1inv=b1
+
 !       b1inv = 0.0003
 
@@ -1228 +1230 @@
       zdthladj(:,:)=0.
 
+      if (1 .eq. 0) then
+      call thermcell_dqup(ngridmx,nlayermx,ptimestep     &
+     &     ,fm,entr,  &
+     &    masse,ztv,zdthladj)
+      else
+
+
       do ig=1,ngridmx
          if(lmax(ig) .gt. 1) then
@@ -1244 +1253 @@
          endif
       enddo
+
+      endif
 
 ! ------------------------------------------------------------------
@@ -1528 +1539 @@
       if (ico2.ne.0) then
 !      if (nqmx .ne. 0.) then
-      do l=1,nlayermx
-         zdzfull(:,l)=zlev(:,l+1)-zlev(:,l)
-      enddo
-
-      modname='tracer'
       call thermcell_dqup(ngridmx,nlayermx,ptimestep     &
-     &     ,fm,entr,fraca,  &
-     &    masse,pq(:,:,ico2),pdqadj(:,:,ico2),modname,zdzfull)
+     &     ,fm,entr,  &
+     &    masse,pq(:,:,ico2),pdqadj(:,:,ico2))
 !      endif