Changeset 1019 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Aug 26, 2013, 9:21:41 AM (11 years ago)

Author:

emillour

Message:

Common dynamics; keep up with updates (seq and ) in LMDZ5 (up tio rev 1845):

• General stuff:
• makelmdz_fcm: add options -j # (compile using # threads) and -full, and to keep up

with Earth model, possibility to compile with various versions of orchidee

• bld.cfg: adaptations to enable compiling using multiple threads
• build_gcm: adaptations to enable compiling using multiple threads
• makelmdz: keep up with Earth model: possibility to compile with various versions of orchidee + cosmetic changes + library directory name change

• bibio:
• wxios.F90 : Added for possible future use of XIOS library

• filtrez:
• mkl_dft_type.f90 & mkl_dfti.f90 : MKL (for MKL FFT) interface definitions
• filtreg_mod : limit use of FFT to parallel mode
• mod_filtre_fft.F90 & mod_filtre_fft_lov.F90 : swich to use parallel_lmdz

• dyn3d:
• abort_gcm.F : add things for xios
• advtrac.F90 : minor change in CFL outputs
• ce0l.F90 : indicesol.h is now module indice_sol_mod
• comvert.h : cosmetic change on comments
• gcm.F : add xios and use module indice_sol_mod (for INCA)
• inigeom.F : move two computations outside loop

• dyn3dpar:
• parallel.F90 => parallel_lmdz.F90 : and change all the "use parallel" into "use parallel_lmdz" in all files in dyn3dpar
• comvert.h : cosmetic change on comments
• gcm.F : add xios and use module indice_sol_mod (for INCA)
• leapfrog_p.F : add xios + correction for times in Newtonian case
• ce0l.F90 : indicesol.h is now module indice_sol_mod
• inigeom.F : move two computations outside loop

EM

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (8 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -32 +32 @@
 bands=""
 scatterers=""
+job=1
+full=''
 
 LMDGCM=`/bin/pwd`
@@ -40 +42 @@
 CHEM_PATH=$LMDGCM/.void_dir
 # Path to fcm utility:
-fcm_path=$LMDGCM/tools/fcm/bin
+##fcm_path=$LMDGCM/tools/fcm/bin
+fcm_path=$(dirname $(which fcm))
 
 ########################################################################
@@ -72 +75 @@
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
 [-c false/MPI1/MPI2]       : (Earth) coupling with ocean model : MPI1/MPI2/false (default: false)
-[-v false/true]            : (Earth) with or without vegetation (default: false)
+[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
+          false       : no vegetation model
+          orchidee2.0 : compile using ORCHIDEE 2.0 (or more recent version)
+          orchidee1.9 : compile using ORCHIDEE up to the version including OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
+          true        : (obsolete; for backward compatibility) use ORCHIDEE tag 1.9-1.9.6
 [-chimie INCA/false]       : (Earth) with INCA chemistry model or without (default: false)
 [-cosp cosp/false]         : (Earth) add the cosp model (default: false)
@@ -84 +91 @@
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-link LINKS]              : additional links with other libraries
+[-j n]                     : active parallel compiling on ntask
+[-full]                    : full recompiling 
 [-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
 [-ext_src path]            : path to an additional set of routines to compile with the model
@@ -158 +167 @@
       "-ext_src")
           EXT_SRC=$2 ; shift ; shift ;;
+
+      "-j")
+          job=$2 ; shift ; shift ;;
+
+      "-full")
+          full="-full" ; shift ;;
 
       "-arch")
@@ -259 +274 @@
 fi
 
-if [[ "$veget" == "true" ]]
-then
+if [ "$veget" = "true" -o "$veget" = "orchidee1.9" -o "$veget" = "orchidee2.0" ]
+then
+#NB: option 'true': for backward compatibility. To be used with ORCHIDEE tag 1.9-1.9.6
+#    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
+#    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
+   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
    CPP_KEY="$CPP_KEY CPP_VEGET"
-   INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
-   LIB="${LIB} -L${ORCH_LIBDIR} -l${LIBPREFIX}sechiba -l${LIBPREFIX}parameters -l${LIBPREFIX}stomate -l${LIBPREFIX}parallel -l${LIBPREFIX}orglob"
+# temporary, for Orchidee versions 1.9.* (before openmp activation)
+   if [[ "$veget" == "orchidee1.9" ]] ; then
+      CPP_KEY="$CPP_KEY ORCHIDEE_NOOPENMP"
+   fi
+   if [[ "$veget" == "orchidee2.0" ]] ; then
+      orch_libs=orchidee
+   else
+      orch_libs="sechiba parameters stomate parallel orglob"
+   fi
+   LIB="${LIB} -L${ORCH_LIBDIR}"
+   for lib in ${orch_libs} ; do
+      if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
+         LIB="${LIB} -l${LIBPREFIX}$lib "
+      fi
+   done
+elif [[ "$veget" != "false" ]] ; then
+   echo "Option -v $veget does not exist"
+   echo "Use ./makelmdz_fcm -h for more information"
+   exit 
 fi
 
@@ -444 +480 @@
 fi
 
-if [[ $veget == "true" ]]
+if [[ $veget != "false" ]]
 then
   SUFF_NAME=${SUFF_NAME}_orch
@@ -497 +533 @@
 
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
-./build_gcm
+./build_gcm ${fcm_path} -j $job $full
 
 rm -rf tmp_src