Changeset 1036 for trunk/LMDZ.MARS/libf/phymars/convadj.F

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/phymars/convadj.F (modified) (4 diffs)

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

@@ -6 +6 @@
      &                   pdqadj)
 
+      use tracer_mod, only: noms, ! tracer names
+     &                      igcm_h2o_vap ! index of water vapor tracer
       implicit none
 
@@ -33 +35 @@
 #include "comcstfi.h"
 #include "callkeys.h"
-#include "tracer.h"
+!#include "tracer.h"
 
 
@@ -73 +75 @@
       INTEGER iq,ico2
       save ico2
-      REAL zq(ngridmx,nlayermx,nqmx), zq2(ngridmx,nlayermx,nqmx)
-      REAL zqm(nqmx),zqco2m
+      REAL zq(ngridmx,nlayermx,nq), zq2(ngridmx,nlayermx,nq)
+      REAL zqm(nq),zqco2m
       real m_co2, m_noco2, A , B
       save A, B
@@ -101 +103 @@
         if (tracer) then
 !     Prepare Special treatment if one of the tracers is CO2 gas
-           do iq=1,nqmx
+           do iq=1,nq
              if (noms(iq).eq."co2") then
                 ico2=iq