Changeset 1036 for trunk/LMDZ.MARS/libf/aeronomars/moldiff_red.F90

Timestamp:

Sep 11, 2013, 2:34:44 PM (11 years ago)

Author:

emillour

Message:

Mars GCM: (a first step towards using parallel dynamics)

• IMPORTANT CHANGE: Implemented dynamic tracers. It is no longer necessary to compile the model with the '-t #' option, number of tracers is simply read from tracer.def file (as before). Adapted makegcm_* scripts (and co.) accordingly. Technical aspects of the switch to dynamic tracers are:
  • advtrac.h (in dyn3d) removed and replaced by module infotrac.F
  • tracer.h (in phymars) removed and replaced by module tracer_mod.F90 (which contains nqmx, the number of tracers, etc. and can be used anywhere in the physics).
• Included some side cleanups: removed unused files (in dyn3d) anldoppler2.F, anl_mcdstats.F and anl_stats-diag.F, and all the unecessary dimensions.* files in grid/dimension.
• Checked that changes are clean and that GCM yields identical results (in debug mode) to previous svn version.

EM

File:

• trunk/LMDZ.MARS/libf/aeronomars/moldiff_red.F90 (modified) (7 diffs)

trunk/LMDZ.MARS/libf/aeronomars/moldiff_red.F90

@@ -1 +1 @@
 subroutine moldiff_red(pplay,pplev,pt,pdt,pq,pdq,ptimestep,zzlay,pdteuv,pdtconduc,pdqdiff)
+
+use tracer_mod, only: nqmx, noms, mmol
 
 implicit none
@@ -9 +11 @@
 #include "comdiurn.h"
 #include "chimiedata.h"
-#include "tracer.h"
+!#include "tracer.h"
 #include "conc.h"
 #include "diffusion.h"
@@ -904 +906 @@
 
         SUBROUTINE QMNEW(Q1,DQ,Q2,dtime,nl,nq,gc,ig)
+        use tracer_mod, only: nqmx
         IMPLICIT NONE
-#include "dimensions.h"
+!#include "dimensions.h"
 
         INTEGER,INTENT(IN) :: nl,nq
@@ -939 +942 @@
 
         SUBROUTINE MMOY(massemoy,mmol,qq,gc,nl,nq)
-        IMPLICIT NONE
-#include "dimensions.h"
+        use tracer_mod, only: nqmx
+        IMPLICIT NONE
+!#include "dimensions.h"
 
         INTEGER :: nl,nq,l
@@ -1023 +1027 @@
      & qq,mmol,gc,Praf,Traf,Qraf,Mraf,Zraf,                             &
      & Nraf,Nrafk,Rraf,Rrafk,il,nl,nq,nlx,ig)
+        use tracer_mod, only: nqmx
         IMPLICIT NONE
-#include "dimensions.h"
+!#include "dimensions.h"
         
         INTEGER :: nl,nq,il,l,i,iq,nlx,iz,ig
@@ -1364 +1369 @@
         SUBROUTINE GCMGRID_P(Z,P,Q,T,Nk,Rk,qq,qnew,tt,tnew,             &
      &    pp,M,gc,nl,nq,nlx,ig)
-        IMPLICIT NONE
-#include "dimensions.h"
+        use tracer_mod, only: nqmx
+        IMPLICIT NONE
+!#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
         INTEGER,DIMENSION(1) :: indP
@@ -1465 +1471 @@
         SUBROUTINE GCMGRID_P2(Z,P,Q,T,Nk,Rk,qq,qnew,tt,tnew             &
      &   ,pp,M,gc,nl,nq,nlx,facM,ig)
+        use tracer_mod, only: nqmx
         IMPLICIT NONE
-#include "dimensions.h"
+!#include "dimensions.h"
         INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
         INTEGER,DIMENSION(1) :: indP