Changeset 1036 for trunk/LMDZ.MARS/libf/aeronomars/concentrations.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/aeronomars/concentrations.F (modified) (4 diffs)

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

@@ -1 @@
-      SUBROUTINE concentrations(pplay,pt,pdt,pq,pdq,ptimestep)
+      SUBROUTINE concentrations(nq,pplay,pt,pdt,pq,pdq,ptimestep)
                                              
+      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_n2, igcm_ar,
+     &                      igcm_h2o_vap, igcm_n, igcm_no, igcm_no2,
+     &                      igcm_n2d, igcm_co2plus, igcm_oplus,
+     &                      igcm_o2plus, igcm_coplus, igcm_cplus,
+     &                      igcm_nplus, igcm_noplus, igcm_n2plus,
+     &                      igcm_hplus, igcm_hco2plus, mmol
       implicit none
 
@@ -22 +30 @@
 #include "comdiurn.h"
 #include "chimiedata.h"
-#include "tracer.h"
+!#include "tracer.h"
 #include "conc.h"
 
 !     input/output
 
-      real pplay(ngridmx,nlayermx)
-      real pt(ngridmx,nlayermx)
-      real pdt(ngridmx,nlayermx)
-      real pq(ngridmx,nlayermx,nqmx)
-      real pdq(ngridmx,nlayermx,nqmx)
-      real ptimestep
+      integer,intent(in) :: nq ! number of tracers
+      real,intent(in) :: pplay(ngridmx,nlayermx)
+      real,intent(in) :: pt(ngridmx,nlayermx)
+      real,intent(in) :: pdt(ngridmx,nlayermx)
+      real,intent(in) :: pq(ngridmx,nlayermx,nq)
+      real,intent(in) :: pdq(ngridmx,nlayermx,nq)
+      real,intent(in) :: ptimestep
 
 !     local variables
 
       integer       :: i, l, ig, iq
-      integer, save :: nbq, niq(nqmx)
-      real          :: ni(nqmx), ntot
-      real          :: zq(ngridmx, nlayermx, nqmx)
+      integer, save :: nbq
+      integer,allocatable,save :: niq(:)
+      real          :: ni(nq), ntot
+      real          :: zq(ngridmx, nlayermx, nq)
       real          :: zt(ngridmx, nlayermx)
-      real, save    :: aki(nqmx)
-      real, save    :: cpi(nqmx)
+      real,allocatable,save    :: aki(:)
+      real,allocatable,save    :: cpi(:)
 
       logical, save :: firstcall = .true.
@@ -48 +58 @@
       if (firstcall) then
 
+         ! allocate local saved arrays:
+         allocate(aki(nq))
+         allocate(cpi(nq))
+         allocate(niq(nq))
 !        find index of chemical tracers to use
 !        initialize thermal conductivity and specific heat coefficients
@@ -217 +231 @@
          endif
          
-            
+         ! tell the world about it:
+         write(*,*) "concentrations: firstcall, nbq=",nbq
+         write(*,*) "  niq(1:nbq)=",niq(1:nbq)
+         write(*,*) "  aki(1:nbq)=",aki(1:nbq)
+         write(*,*) "  cpi(1:nbq)=",cpi(1:nbq)
 
          firstcall = .false.