Changeset 1036 for trunk/LMDZ.MARS/libf/dyn3d/dynetat0.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/dyn3d/dynetat0.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/dyn3d/dynetat0.F

@@ -3 +3 @@
       
       use netcdf
+      use infotrac, only: tnom
       
       IMPLICIT NONE
@@ -37 +38 @@
 #include "serre.h"
 #include "logic.h"
-#include "advtrac.h"
+!#include "advtrac.h"
 #include "control.h"
 
@@ -380 +381 @@
 !           WRITE(str3(2:3),'(i2.2)') iq
 !           ierr =  NF_INQ_VARID (nid, str3, nvarid)
-! NB: tracers are now read in using their name ('tnom' from advtrac.h)
+! NB: tracers are now read in using their name ('tnom' from infotrac)
 !           write(*,*) "  loading tracer:",trim(tnom(iq))
            ierr=nf90_inq_varid(nid,tnom(iq),nvarid)
@@ -404 +405 @@
 c        case when new tracer are added in addition to old ones
              write(*,*)'tracers 1 to ', nqold,'were already present'
-             write(*,*)'tracers ', nqold+1,' to ', nqmx,'are new'
+             write(*,*)'tracers ', nqold+1,' to ', nq,'are new'
 !             yes=' '
 !            do while ((yes.ne.'y').and.(yes.ne.'n'))
 !             write(*,*) 'Would you like to reindex tracer # 1 ->',nqold
-!             write(*,*) 'to #',nqmx-nqold+1,'->', nqmx,'   (y or n) ?'
+!             write(*,*) 'to #',nq-nqold+1,'->', nq,'   (y or n) ?'
 !             read(*,fmt='(a)') yes
 !            end do
@@ -416 +417 @@
 !                do j=1,jjp1
 !                  do i=1,iip1
-!                    do iq=nqmx,nqmx-nqold+1,-1
-!                       q(i,j,l,iq)=q(i,j,l,iq-nqmx+nqold)   
+!                    do iq=nq,nq-nqold+1,-1
+!                       q(i,j,l,iq)=q(i,j,l,iq-nq+nqold)   
 !                    end do
-!                    do iq=nqmx-nqold,1,-1
+!                    do iq=nq-nqold,1,-1
 !                       q(i,j,l,iq)= 0.
 !                    end do