Changeset 1036 for trunk/LMDZ.MARS/libf/phymars/physdem.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/physdem.F (modified) (10 diffs)

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

@@ -3 +3 @@
      .                   alb,ith,pzmea,pzstd,pzsig,pzgam,pzthe)
 
+      use infotrac, only: nqtot, tnom
       implicit none
 c
@@ -32 +33 @@
 #include "netcdf.inc"
 #include "dimphys.h"
-#include "advtrac.h"
+!#include "advtrac.h"
 #include "callkeys.h"
 c
@@ -585 +586 @@
 !                    qsurf02, ...)
       count=0
-      do iq=1,nqmx
+      do iq=1,nqtot
         txt= " "
         write(txt,'(a1,i2.2)')'q',iq
@@ -596 +597 @@
         endif
       enddo
-      if (count.eq.nqmx) then
+      if (count.eq.nqtot) then
         write(*,*) "physdem0:tracers seem to follow old naming ",
      &             "convention (qsurf01,qsurf02,...)"
@@ -602 +603 @@
         write(*,*) "     but you should run newstart to rename them"
         oldtracernames=.true.
-      endif ! of if (count.eq.nqmx)
+      endif ! of if (count.eq.nqtot)
 
       IF(nq.GE.1) THEN
@@ -693 +694 @@
      .                   phystep,time,
      .                   tsurf,tsoil,co2ice,emis,q2,qsurf)
+      use infotrac, only: nqtot, tnom
       implicit none
 c
@@ -720 +722 @@
 #include "netcdf.inc"
 #include "dimphys.h"
-#include "advtrac.h"
+!#include "advtrac.h"
 #include "callkeys.h"
 c
@@ -918 +920 @@
       IF (firstcall) THEN
         count=0
-        do iq=1,nqmx
+        do iq=1,nqtot
           txt= " "
           write(txt,'(a1,i2.2)')'q',iq
@@ -929 +931 @@
           endif
         enddo
-        if (count.eq.nqmx) then
+        if (count.eq.nqtot) then
           write(*,*) "physdem1:tracers seem to follow old naming ",
      &               "convention (qsurf01,qsurf02,...)"
@@ -935 +937 @@
           write(*,*) "     but you should run newstart to rename them"
           oldtracernames=.true.
-        endif ! of if (count.eq.nqmx)
+        endif ! of if (count.eq.nqtot)
       ENDIF ! of if(firstcall)
       
       ! If computing water cycle with ice, move surface ice
-      ! back to qsurf(nqmx)
+      ! back to qsurf(nqtot)
       IF (oldtracernames .and. water) THEN
        !"loop" to avoid potential out-of-bounds on arrays
-        write(*,*)'physdem1: moving surface water ice to index ',nqmx
-        do iq=nqmx,nqmx
+        write(*,*)'physdem1: moving surface water ice to index ',nqtot
+        do iq=nqtot,nqtot
           qsurf(1:ngridmx,iq)=qsurf(1:ngridmx,iq-1)
           qsurf(1:ngridmx,iq-1)=0