Changeset 486 for LMDZ.3.3/branches/rel-LF/libf/phylmd/cv3_routines.F

Timestamp:

Dec 15, 2003, 6:50:41 PM (20 years ago)

Author:

lmdzadmin

Message:

Phasage avec la version de Ionela
IM/LF

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/cv3_routines.F (modified) (11 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/cv3_routines.F

@@ +1 @@
+c
+c $Header$
+c
       SUBROUTINE cv3_param(nd,delt)
       implicit none
@@ -1459 +1462 @@
       real asum(nloc,nd),bsum(nloc,nd),csum(nloc,nd)
       real wgh
+      real zm(nloc,na)
       logical lwork(nloc)
 
@@ -1498 +1502 @@
        enddo
       enddo
+      zm(:,:)=0.
 
 c=====================================================================
@@ -1579 +1584 @@
       vent(il,i,i)=v(il,nk(il))
       elij(il,i,i)=clw(il,i)
-      sij(il,i,i)=1.0
+cMAF      sij(il,i,i)=1.0
+      sij(il,i,i)=0.0
       end if
  740  continue
@@ -1753 +1759 @@
         vent(il,i,i)=v(il,nk(il))
         elij(il,i,i)=clw(il,i)
-        sij(il,i,i)=1.0
+cMAF        sij(il,i,i)=1.0
+        sij(il,i,i)=0.0
        endif
       enddo ! il
@@ -1767 +1774 @@
 
 789   continue
-      
+c      
+c MAF: renormalisation de MENT
+      do jm=1,nd
+        do im=1,nd
+          do il=1,ncum
+          zm(il,im)=zm(il,im)+(1.-sij(il,im,jm))*ment(il,im,jm)
+         end do
+        end do
+      end do
+c
+      do jm=1,nd
+        do im=1,nd
+          do il=1,ncum
+          if(zm(il,im).ne.0.) then
+          ment(il,im,jm)=ment(il,im,jm)*m(il,im)/zm(il,im)
+          endif
+         end do
+       end do
+      end do
+c
       do jm=1,nd
        do im=1,nd
@@ -2079 +2105 @@
       do j=1,ntra
       trap(il,i,j)=trap(il,i+1,j)*mp(il,i+1)
-     :            +trap(il,i,j)*(mp(il,i)-mp(il,i+1))
+ctestmaf     :            +trap(il,i,j)*(mp(il,i)-mp(il,i+1))
+     :            +tra(il,i,j)*(mp(il,i)-mp(il,i+1))
       trap(il,i,j)=trap(il,i,j)/mp(il,i)
       end do
@@ -2636 +2663 @@
           ftra(il,i,j)=ftra(il,i,j)+0.01*grav*dpinv
      :     *(mp(il,i+1)*(trap(il,i+1,j)-tra(il,i,j))
-     :     -mp(il,i)*(trap(il,i,j)-trap(il,i-1,j)))
+     :     -mp(il,i)*(trap(il,i,j)-tra(il,i-1,j)))
          else
           ftra(il,i,j)=ftra(il,i,j)+0.1*dpinv
      :     *(mp(il,i+1)*(trap(il,i+1,j)-tra(il,i,j))
-     :     -mp(il,i)*(trap(il,i,j)-trap(il,i-1,j)))
+     :     -mp(il,i)*(trap(il,i,j)-tra(il,i-1,j)))
          endif
         endif ! i
@@ -2692 +2719 @@
         ex=0.1*ment(il,inb(il),inb(il)) 
      :      *(traent(il,inb(il),inb(il),j)-tra(il,inb(il),j))
-     :      /(ph(i l,inb(il))-ph(il,inb(il)+1))
+     :      /(ph(il,inb(il))-ph(il,inb(il)+1))
         ftra(il,inb(il),j)=ftra(il,inb(il),j)-ex
         ftra(il,inb(il)-1,j)=ftra(il,inb(il)-1,j)
@@ -2792 +2819 @@
       enddo
 
-      do i=1,nl
+      do i=2,nl
        do k=i,nl
         do il=1,ncum
-         if (i.ge.icb(il).and.i.le.inb(il).and.k.le.inb(il)) then
+ctest         if (i.ge.icb(il).and.i.le.inb(il).and.k.le.inb(il)) then
+         if (i.le.inb(il).and.k.le.inb(il)) then
             upwd(il,i)=upwd(il,i)+m(il,k)+up1(il,k,i)
             dnwd(il,i)=dnwd(il,i)+dn1(il,k,i)
@@ -3024 +3052 @@
 
         do 2100 j=1,ntra
-c oct3         do 2110 k=1,nl
          do 2110 k=1,nd ! oct3
           do 2120 i=1,ncum