Changeset 5355 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg

Timestamp:

2015-06-04T20:09:56+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Many improvments

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg

Files:

• X64_CURIE.cfg (modified) (2 diffs)
• arch_template.cfg (modified) (1 diff)
• user_template.cfg (modified) (1 diff)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg/X64_CURIE.cfg

@@ -3 +3 @@
 # Available softwares:
 CDO=cdo 
-COMPILER=ifort
+COMPILER=intel
 MPI=bullxmpi
 NETCDF=netcdf
@@ -13 +13 @@
 JOB_DELE=ccc_mdel                          
 
-#
-[ -z "$NPROC"     ] && NPROC=1
-[ -z "$TIME_LIMI" ] && TIME_LIMI=10800 # 3h
+# Compiling & computing settings
+[ -z "$NPROC"       ] && NPROC=16
+[ -z "${TIME_LIMI}" ] && TIME_LIMI=10800 # 3h
 
 # Architecture environment (be careful with compliance with XIOS)
-ARCH_ENV=${DIR_XIOS}/arch/arch-${ARCH}.env
+ARCH_ENV=${DIR_XIOS}/arch/arch-${CFG_ARCH}.env

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg/arch_template.cfg

@@ -4 +4 @@
 
 # Available softwares:
-CDO=''                  # CDO (Climate Data Operators)     (to get application version with `$CDO      --version`)
-COMPILER=''             # ifort/gfortran/pgfortran/$FC/... ("" " " compiler      " "    ""  `$COMPILER --version`)
-MPI=''                  # MPI    libraries                 (root directory name in $LOADEDMODULES or $PATH variable)
-NETCDF=''               # NetCDF    " "                    ( ""     " "     ""  ""       ""       ""  " "     ""   )
+CDO=''                    # CDO (Climate Data Operators) (root directory name in $LOADEDMODULES or $PATH)
+COMPILER=''               # ifort/gfortran/pgfortran/... ( ""     " "     ""  ""       ""       ""  " " )
+MPI=''                    # MPI    libraries             ( ""     " "     ""  ""       ""       ""  " " )
+NETCDF=''                 # NetCDF    " "                ( ""     " "     ""  ""       ""       ""  " " )
 
 # Job commands:
-JOB_SUBM=''             # Command to submit a job && get his ID in return
-JOB_LIST=''                #   " "   to list submitted jobs  (to know if the job is in progress with his ID)
-JOB_VIEW=''             #   " "   to get job informations (to increment a log during computing from job ID)
-JOB_DELE=''             #   " "   to stop a job           (not used currently)
+JOB_SUBM=''               # Submit a job && get his ID in return
+JOB_LIST=''                  # List submitted jobs  (to know if the job is in progress with his ID)
+JOB_VIEW=''               # Get job informations (to increment a log during computing from job ID)
+JOB_DELE=''               # Stop a job           (not used currently)
 
-# 
-[ -z "$NPROC"     ] && NPROC=1          # Number of processing units for compilation
-[ -z "$TIME_LIMI" ] && TIME_LIMI=''     # Timeout in s for computation (pending & running)
+# Compiling & computing settings
+[ -z "$NPROC"       ] && NPROC=1          # Number of processing units
+[ -z "${TIME_LIMI}" ] && TIME_LIMI=''     # Timeout in s (pending & running)
 
 # Architecture environment (be careful with compliance with XIOS)
-ARCH_ENV=''                             # ${DIR_WORK}/XIOS/arch/arch-${ARCH}.env
+ARCH_ENV=''                               # ${DIR_WORK}/XIOS/arch/arch-${CFG_ARCH}.env

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg/user_template.cfg

@@ -11 +11 @@
 # NEMO overall configuration:
 [ -z "${NEMO_BRAN}" ] && NEMO_BRAN=''     # trunk, dev_v3_4_STABLE_2012, ...
-[ -z "${CONF_REFE}" ] && CONF_REFE=''     # ORCA2_LIM_PISCES, GYRE, ...
-[ -z "${CONF_TEST}" ] && CONF_TEST=''     # ${CONF_REFE}_trust, ...
+[ -z "${CONF_REFE}" ] && REFE_CONF=''     # ORCA2_LIM_PISCES, GYRE, ...
+[ -z "${CONF_TEST}" ] && TEST_CONF=''     # ${CONF_REFE}_trust, ...
 NEMO_HOME=''                              # NEMOGCM equivalent root directory to find ./ARCH,./CONFIG, ...
                                           # (${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM, ...)
 
 # Comparatives directories localization:
-DIR_REFE=''                  # ${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN}
-DIR_TEST=''                  # ${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATE_STR}
+REFE_DIR=''                  # ${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN}
+TEST_DIR=''                  # ${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATE_STR}
 
 # External softs directories: