Changeset 1499 for trunk/LMDZ.MARS/makegcm_ifort

Timestamp:

Nov 19, 2015, 4:04:48 PM (9 years ago)

Author:

emillour

Message:

Mars GCM:

• Added option "-cpp" so that users can add the definition of specific precompiling flags in makegcm_* scripts (and added default BLAS and LAPACK flags for ifort on Gnome and Ada).
• Put calls to dgesv (Lapack) routine in photochemistry_asis.F90 under the LAPACK preprocessing flag. Moved secondary routines in photochemistry.F and photochemistry_asis.F90 into the main (via contains instruction) to avoid multiple definitions of routines with identical names.

EM

File:

• trunk/LMDZ.MARS/makegcm_ifort (modified) (6 diffs)

trunk/LMDZ.MARS/makegcm_ifort

@@ -9 +9 @@
 set phys="PHYS=$physique"
 set include='-I$(LIBF)/grid -I$(LIBF)/misc -I. -I$(LIBF)/dynlonlat_phylonlat'
+set cpp_def=''
 set ntrac = 1
 set filtre=filtrez
@@ -50 +51 @@
 hostname | grep 'ada' > /dev/null
 if ( $? == 0 ) then
-   echo "*** NETCDF preset *** CICLAD cluster"
+   echo "*** NETCDF preset *** Ada cluster"
    setenv NCDFLIB /smplocal/pub/NetCDF/4.1.3/seq/lib
    setenv NCDFINC /smplocal/pub/NetCDF/4.1.3/seq/include
@@ -165 +166 @@
 set optim90=""
 set oplink=""
+
+hostname | grep 'n201' > /dev/null
+if ( $? == 0 ) then
+   #on Gnome Lapack & Blas available via ifort's MKL
+   set cpp_def="$cpp_def -DBLAS -DLAPACK"
+endif
+hostname | grep 'ada' > /dev/null
+if ( $? == 0 ) then
+   #on Ada Lapack & Blas available via ifort's MKL
+   set cpp_def="$cpp_def -DBLAS -DLAPACK"
+endif
 
 ########################################################################
@@ -331 +343 @@
            are located in directories that are not referenced by default.
 
+-cpp FLAG  Add preprocessing definition of FLAG
+
 -adjnt     Compiles the adjoint model to the dynamical code.
 
@@ -376 +390 @@
      case -include
         set include="$include -I$2" ; shift ; shift ; goto top
+
+     case -cpp
+        set cpp_def="$cpp_def -D$2" ; shift ; shift ; goto top
 
      case -adjnt
@@ -755 +772 @@
 else if $LINUX then
 # Ehouarn : adapt to gfortran
- set optim="$optim -I${libo}"
- set optim90="$optim90 -I${libo}"
- set optimtru90="$optimtru90 -I${libo}"
+ set optim="$optim -I${libo} $cpp_def"
+ set optim90="$optim90 -I${libo} $cpp_def"
+ set optimtru90="$optimtru90 -I${libo} $cpp_def"
 # Ehouarn: remove set mod_loc_dir def below; mod_loc_dir=$localdir (set above)
 # set mod_loc_dir=$libo