Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/vlz_fi.F

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/vlz_fi.F (modified) (12 diffs)

trunk/LMDZ.MARS/libf/phymars/vlz_fi.F

@@ -1 @@
-      SUBROUTINE vlz_fi(ngrid,q,pente_max,masse,w,wq)
+      SUBROUTINE vlz_fi(ngrid,nlay,q,pente_max,masse,w,wq)
 c
 c     Auteurs:   P.Le Van, F.Hourdin, F.Forget 
@@ -16 +16 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 
 c
@@ -23 +23 @@
 c   Arguments:
 c   ----------
-      integer ngrid
-      real masse(ngrid,llm),pente_max
-      REAL q(ngrid,llm)
-      REAL w(ngrid,llm)
-      REAL wq(ngrid,llm+1)
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlay ! number of atmospheric layers
+      real masse(ngrid,nlay),pente_max
+      REAL q(ngrid,nlay)
+      REAL w(ngrid,nlay)
+      REAL wq(ngrid,nlay+1)
 c
 c      Local 
@@ -35 +36 @@
 c
 
-      real dzq(ngridmx,llm),dzqw(ngridmx,llm),adzqw(ngridmx,llm),dzqmax
+      real dzq(ngrid,nlay),dzqw(ngrid,nlay),adzqw(ngrid,nlay),dzqmax
       real newmasse
       real sigw, Mtot, MQtot
@@ -47 +48 @@
 c    sens de W
 
-      do l=2,llm
+      do l=2,nlay
          do ij=1,ngrid
             dzqw(ij,l)=q(ij,l-1)-q(ij,l)
@@ -54 +55 @@
       enddo
 
-      do l=2,llm-1
+      do l=2,nlay-1
          do ij=1,ngrid
 #ifdef CRAY
@@ -73 +74 @@
       do ij=1,ngrid
          dzq(ij,1)=0.
-         dzq(ij,llm)=0.
+         dzq(ij,nlay)=0.
       enddo
 c ---------------------------------------------------------------
@@ -83 +84 @@
 c      No flux at the model top:
        do ij=1,ngrid
-          wq(ij,llm+1)=0.
+          wq(ij,nlay+1)=0.
        enddo
 
@@ -89 +90 @@
 c      ===============================
 
-       do l = 1,llm          ! loop different than when w<0
+       do l = 1,nlay          ! loop different than when w<0
         do  ij = 1,ngrid
 
@@ -107 +108 @@
             Mtot = masse(ij,m)
             MQtot = masse(ij,m)*q(ij,m)
-            if(m.ge.llm)goto 88
+            if(m.ge.nlay)goto 88
             do while(w(ij,l).gt.(Mtot+masse(ij,m+1)))
                 m=m+1
                 Mtot = Mtot + masse(ij,m)
                 MQtot = MQtot + masse(ij,m)*q(ij,m)
-                if(m.ge.llm)goto 88
+                if(m.ge.nlay)goto 88
             end do
  88         continue
-            if (m.lt.llm) then
+            if (m.lt.nlay) then
                 sigw=(w(ij,l)-Mtot)/masse(ij,m+1)
                 wq(ij,l)=(MQtot + (w(ij,l)-Mtot)*
@@ -137 +138 @@
        end do
 
-       do l = 1,llm-1  ! loop different than when w>0
+       do l = 1,nlay-1  ! loop different than when w>0
         do  ij = 1,ngrid
          if(w(ij,l+1).le.0)then
@@ -176 +177 @@
  99    continue
 
-      do l=1,llm
+      do l=1,nlay
          do ij=1,ngrid