Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/convadj.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/convadj.F (modified) (5 diffs)

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

@@ -31 +31 @@
 !     ------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -63 +63 @@
 
       INTEGER ig,i,l,l1,l2,jj
-      INTEGER jcnt, jadrs(ngridmx)
-
-      REAL sig(nlayermx+1),sdsig(nlayermx),dsig(nlayermx)
-      REAL zu(ngridmx,nlayermx),zv(ngridmx,nlayermx)
-      REAL zh(ngridmx,nlayermx)
-      REAL zu2(ngridmx,nlayermx),zv2(ngridmx,nlayermx)
-      REAL zh2(ngridmx,nlayermx), zhc(ngridmx,nlayermx)
+      INTEGER jcnt, jadrs(ngrid)
+
+      REAL sig(nlay+1),sdsig(nlay),dsig(nlay)
+      REAL zu(ngrid,nlay),zv(ngrid,nlay)
+      REAL zh(ngrid,nlay)
+      REAL zu2(ngrid,nlay),zv2(ngrid,nlay)
+      REAL zh2(ngrid,nlay), zhc(ngrid,nlay)
       REAL zhm,zsm,zdsm,zum,zvm,zalpha,zhmc
 
@@ -75 +75 @@
       INTEGER iq,ico2
       save ico2
-      REAL zq(ngridmx,nlayermx,nq), zq2(ngridmx,nlayermx,nq)
+      REAL zq(ngrid,nlay,nq), zq2(ngrid,nlay,nq)
       REAL zqm(nq),zqco2m
       real m_co2, m_noco2, A , B
@@ -82 +82 @@
       real mtot1, mtot2 , mm1, mm2
        integer l1ref, l2ref
-      LOGICAL vtest(ngridmx),down,firstcall
+      LOGICAL vtest(ngrid),down,firstcall
       save firstcall
       data firstcall/.true./
@@ -94 +94 @@
 
       IF (firstcall) THEN 
-        IF(ngrid.NE.ngridmx) THEN
-           PRINT*
-           PRINT*,'STOP in convadj'
-           PRINT*,'ngrid    =',ngrid
-           PRINT*,'ngridmx  =',ngridmx
-        ENDIF
+
         ico2=0
         if (tracer) then