Changeset 1036 for trunk/LMDZ.MARS/makegcm_ifort

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/makegcm_ifort (modified) (3 diffs)

trunk/LMDZ.MARS/makegcm_ifort

@@ -184 +184 @@
 # Ehouarn 'ifort' compiler
    #NB: on gnome -O3 ==> NaNs ...
-   set optim=" -O2 -fp-model precise -ip -mkl=sequential -align all "
-   set optim90=" -O2 -fp-model precise -ip -mkl=sequential -align all "
-   set optimtru90=" -O2 -fp-model precise -ip -mkl=sequential -align all "
+   set optim="-auto -O2 -fp-model precise -ip -mkl=sequential -align all "
+   set optim90="-auto -O2 -fp-model precise -ip -mkl=sequential -align all "
+   set optimtru90="-auto -O2 -fp-model precise -ip -mkl=sequential -align all "
 #   set opt_link=" -Mfree -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Bstatic "
 #   set mod_loc_dir=$LIBOGCM
@@ -531 +531 @@
 # Build the appropriate 'dimensions.h' file
 cd dimension
-./makdim $ntrac $dim
+./makdim $dim
 # echo contents of dimensions.h to standard output
 cat $libf/grid/dimensions.h
@@ -557 +557 @@
 echo dimension $dimension dim $dim
 if ( $dimension == 1 ) then
-  echo pas de dynamique
-  set dyn="L_DYN= DYN= L_FILTRE= DIRMAIN=phy$physique "
+  echo "No dynamics"
+##  set dyn="L_DYN= DYN= L_FILTRE= DIRMAIN=phy$physique "
+## NB: we still need to have L_DYN=libdyn3d to reach routines and module
+## objects which are located in dyn3d
+  set dyn="L_DYN=-ldyn3d DYN= L_FILTRE= DIRMAIN=phy$physique "
 endif
 endif