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

trunk/LMDZ.MARS/libf/aeronomars/moldiff.F

@@ -1 @@
-      subroutine moldiff(pplay,pplev,pt,pdt,pq,pdq,ptimestep,
+      subroutine moldiff(ngrid,nlayer,nq,
+     &                   pplay,pplev,pt,pdt,pq,pdq,ptimestep,
      &                   zzlay,pdteuv,pdtconduc,pdqdiff)
 
-      use tracer_mod, only: nqmx, igcm_co2, igcm_co, igcm_o, igcm_o1d,
+      use tracer_mod, only: igcm_co2, igcm_co, igcm_o, igcm_o1d,
      &                      igcm_o2, igcm_o3, igcm_h, igcm_h2, igcm_oh,
      &                      igcm_ho2, igcm_h2o2, igcm_n2, igcm_ar,
      &                      igcm_h2o_vap, mmol
+      use conc_mod, only: rnew, mmean
       implicit none
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
-#include "callkeys.h"
-#include "comdiurn.h"
-#include "chimiedata.h"
+!#include "callkeys.h"
+!#include "comdiurn.h"
+!#include "chimiedata.h"
 !#include "tracer.h"
-#include "conc.h"
+!#include "conc.h"
 
 
@@ -21 +23 @@
 c Input/Output
 c
+      integer,intent(in) :: ngrid ! number of atmospheric columns
+      integer,intent(in) :: nlayer ! number of atmospheric layers
+      integer,intent(in) :: nq ! number of advected tracers
       real ptimestep
-      real pplay(ngridmx,nlayermx)
-      real zzlay(ngridmx,nlayermx)
-      real pplev(ngridmx,nlayermx+1)
-      real pq(ngridmx,nlayermx,nqmx)
-      real pdq(ngridmx,nlayermx,nqmx)
-      real pt(ngridmx,nlayermx)
-      real pdt(ngridmx,nlayermx)
-      real pdteuv(ngridmx,nlayermx)
-      real pdtconduc(ngridmx,nlayermx)
-      real pdqdiff(ngridmx,nlayermx,nqmx)
+      real pplay(ngrid,nlayer)
+      real zzlay(ngrid,nlayer)
+      real pplev(ngrid,nlayer+1)
+      real pq(ngrid,nlayer,nq)
+      real pdq(ngrid,nlayer,nq)
+      real pt(ngrid,nlayer)
+      real pdt(ngrid,nlayer)
+      real pdteuv(ngrid,nlayer)
+      real pdtconduc(ngrid,nlayer)
+      real pdqdiff(ngrid,nlayer,nq)
 c
 c Local
@@ -42 +47 @@
       real del1,del2, tmean ,dalfinvdz, d
       real hh,dcoef,dcoef1,ptfac, ntot, dens, dens2, dens3
-      real hp(nlayermx)
-      real tt(nlayermx)
-      real qq(nlayermx,ncompmoldiff)
-      real dmmeandz(nlayermx)
-      real qnew(nlayermx,ncompmoldiff)
-      real zlocal(nlayermx)
+      real hp(nlayer)
+      real tt(nlayer)
+      real qq(nlayer,ncompmoldiff)
+      real dmmeandz(nlayer)
+      real qnew(nlayer,ncompmoldiff)
+      real zlocal(nlayer)
       real alf(ncompmoldiff-1,ncompmoldiff-1)
-      real alfinv(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
+      real alfinv(nlayer,ncompmoldiff-1,ncompmoldiff-1)
       real indx(ncompmoldiff-1)
-      real b(nlayermx,ncompmoldiff-1)
+      real b(nlayer,ncompmoldiff-1)
       real y(ncompmoldiff-1,ncompmoldiff-1)
-      real aa(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real bb(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real cc(nlayermx,ncompmoldiff-1,ncompmoldiff-1)
-      real atri(nlayermx-2)
-      real btri(nlayermx-2)
-      real ctri(nlayermx-2)
-      real rtri(nlayermx-2)
-      real qtri(nlayermx-2)
+      real aa(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real bb(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real cc(nlayer,ncompmoldiff-1,ncompmoldiff-1)
+      real atri(nlayer-2)
+      real btri(nlayer-2)
+      real ctri(nlayer-2)
+      real rtri(nlayer-2)
+      real qtri(nlayer-2)
       real alfdiag(ncompmoldiff-1)
       real wi(ncompmoldiff), flux(ncompmoldiff), pote
@@ -211 +216 @@
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 
-      nz=nlayermx
-
-      do ig=1,ngridmx
+      nz=nlayer
+
+      do ig=1,ngrid
 
         do l=2,nz-1
@@ -291 +296 @@
             write(*,*) 'ig, l=',ig, l
             write(*,*) 'No molecular diffusion this time !'
-            call zerophys(ngridmx*nlayermx*nqmx,pdqdiff)
+            pdqdiff(1:ngrid,1:nlayer,1:nq)=0
             return
 c           stop