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

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

@@ -6 +6 @@
      $                  fluxsurf_sw,zls)
                                                    
+       use tracer_mod, only: noms
        IMPLICIT NONE
 c=======================================================================
@@ -61 +62 @@
 #include "paramet.h"
 #include "callkeys.h"
-#include "tracer.h"
+!#include "tracer.h"
 
 c-----------------------------------------------------------------------
@@ -195 +196 @@
          if (tracer) then
 c          Prepare Special treatment if one of the tracer is CO2 gas
-           do iq=1,nqmx
+           do iq=1,nq
              if (noms(iq).eq."co2") then
                 ico2=iq
@@ -238 +239 @@
       END DO
          
-      DO iq=1,nqmx         
+      DO iq=1,nq
       DO l=1,nlayer
          DO ig=1,ngrid
@@ -531 +532 @@
              zu(l)   =pu(ig,l)   +pdu( ig,l)  *ptimestep
              zv(l)   =pv(ig,l)   +pdv( ig,l)  *ptimestep
-            do iq=1,nqmx
+            do iq=1,nq
              zq(l,iq)=pq(ig,l,iq)+pdq(ig,l,iq)*ptimestep
             enddo
@@ -564 +565 @@
             zum(1) = 0  
             zvm(1) = 0  
-            do iq=1,nqmx
+            do iq=1,nq
               zqm(1,iq)=0. ! most tracer do not condense !
             enddo
@@ -577 +578 @@
             call vl1d(zu ,2.,masse,w,zum) 
             call vl1d(zv ,2.,masse,w,zvm) 
-            do iq=1,nqmx
+            do iq=1,nq
              do l=1,nlayer
               zq1(l)=zq(l,iq)
@@ -602 +603 @@
             zum(nlayer+1)= zu(nlayer)  ! should not be used, but...
             zvm(nlayer+1)= zv(nlayer)  ! should not be used, but...
-            do iq=1,nqmx
+            do iq=1,nq
              zqm(nlayer+1,iq)= zq(nlayer,iq)
             enddo
@@ -637 +638 @@
 
 c           Tendencies on Q
-            do iq=1,nqmx
+            do iq=1,nq
 !              if (noms(iq).eq.'co2') then 
               if (iq.eq.ico2) then 
@@ -668 +669 @@
              if(pq(ig,1,ico2)+(pdq(ig,1,ico2)+pdqc(ig,1,ico2))*ptimestep
      &       .lt.qco2min) then 
-                do iq=1,nqmx
+                do iq=1,nq
                   zq(1,iq)=pq(ig,1,iq)
      &                     +(pdq(ig,1,iq)+pdqc(ig,1,iq))*ptimestep
@@ -675 +676 @@
                 Sm(1)  = masse(1)
                 do l =2,nlayermx
-                  do iq=1,nqmx
+                  do iq=1,nq
                      zq(l,iq)=pq(ig,l,iq)
      &                        +(pdq(ig,l,iq)+pdqc(ig,l,iq))*ptimestep
@@ -693 +694 @@
                  end do
  99              continue 
-                 do iq=1,nqmx
+                 do iq=1,nq
                    qmix=zq(nmix,iq) 
      &             +(Smq(nmix-1,iq)-zq(nmix,iq)*Sm(nmix-1))/mixmas