Index: branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/arch_template.cfg
===================================================================
--- branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/arch_template.cfg	(revision 5799)
+++ branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/arch_template.cfg	(revision 5929)
@@ -2,70 +2,49 @@
 ##---------------------------------------------------
 
-## Copy to root (./config) and rename it by keeping '.cfg' extension, then fill in according to your (super)computer
-## Rules for completion:
-   ## Undefined variables (=)   are mandatory
-   ## Void         " "    (='') " " optional
-## Look into other  configuration file for examples
-## It will be called by its name without the extension
+## Copy to root, rename it and then fill in according to your (super)computer environment
+## Rules for completion: undefined variables (=) are mandatory & void variables (='') are optional
+## Look into other configuration file for examples
 
 
 ## Default settings
 ##---------------------------------------------------
+# (Super)Computer environment (${TRUS_XIOS} is already defined in the user configuration file)
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
+## If `module` is available, ${TRUS_ENVI}.env will be sourced
+## If not (scheduled jobs), it will be ${TRUS_ENVI}.path or finally ${TRUS_ENVI}
 
-## (Super)Computer environment (can be void if $PATH is already setted)
-   ## If `module` command is available, arch-${TRUS_HPCC}.env will be sourced.
-   ## If not (scheduled jobs by `cron`/`at` commands), it will be arch-${TRUS_HPCC}.path or any file given
-TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}     # ${TRUS_XIOS} is defined from user configuration file
-
-## Number of compiling processes
-[ -z "${TRUS_NPRO}" ] && TRUS_NPRO=1
-
-## Command to compare 2 netCDF restart files in argument (think to load software in $PATH by any way)
+## Comparison command with restart files as argument (think to append $PATH by any way)
 TRUS_CDOD='cdo diffn'
 
-
-## Job commands
-##---------------------------------------------------
-
-## Use with `eval ${JOB_....}` because they will certainly need to have job ID as argument ("\${JOB_ID}")
-## It will be taken on the fly from standard output returned at the submission of the job
-
-TRUS_JSUB=	 ## Submit a job and get his ID in return (assigned to ${JOB_ID}). Use absolute path,
-                 ## ./batch folder has been created to contain your submission script but it won't be copied into ${TRUS_TEST}
-        	    ## ex: `llsubmit ${TRUS_DIRE}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'`
-TRUS_JSTA=   	 ## Test state of the submitted job (true -> pending/running or false -> completed/crashed)
-                    ## ex: "llq | grep \${JOB_ID}"
-TRUS_JKIL=   	 ## Kill the submitted job
-                    ## ex: "llcancel   \${JOB_ID}"
-
-## Computational performances of finished job
-TRUS_JTIM=''	 ## Get CPU elapsed time
-                    ## ex: `grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}'`
-TRUS_JPME=''   	 ## Get max physical memory
-                    ## ex: `grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f3 | awk '{print \$3     ,\$4 }'`
-TRUS_JVME=''   	 ## Get " " virtual    ""  
-
-## Get job informations to fill in a logfile during computation
-TRUS_JINF=''   	 ## ex: "llq -x \${JOB_ID}"
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO=     ## Number of compiling processes
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT=     ## Timeout for computation (s)
 
 
-## Available softwares/librairies
+## (Super)computer environment
 ##---------------------------------------------------
+## Job commands will almost always be used with `eval ${TRUS_JXXX}` because
+## they will certainly need job ID number as argument for working
+TRUS_JSPT=       ## Submission script contained ./batch folder, will be copied to testing folder
+TRUS_JSUB=	 ## Submit a job and get his ID on the fly (assigned to ${TRUS_JIDN})
+        	   ## ex: `llsubmit ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'`
+TRUS_JSTA=   	 ## Test state of the submitted job (true -> pending/running or false -> completed/crashed)
+                   ## ex: "llq | grep \${TRUS_JIDN}"
+TRUS_JKIL=   	 ## Kill the submitted job
+                   ## ex: "llcancel   \${TRUS_JIDN}"
 
-## Fortran compiler version (use with `${TRUS_CMPF} --version`)
-TRUS_CMPF=''     ## ex: 'ifort'|'gfortran'|'pgfortran'|...
+## Computational performances of job (respectively elapsed time, max physical & virtual memory)
+TRUS_JTIM=''       ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}"
+TRUS_JPME=''       ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f3 | awk '{print \$3     ,\$4 }"
+TRUS_JVME=''       ## ex: "grep IdrisMemMPI NEMO_CI_\${TRUS_JIDN} | cut -d, -f2 | awk '{print \$3     ,\$4 }"
 
-## Software releases (string pattern to match just before the number in $PATH):
-TRUS_CDOR=''   	 ## CDO (Climate Data Operators)
-               	    ## ex: 'cdo'|'nco'|...
-TRUS_MPIR=''   	 ## MPI    libraries            
-               	    ## ex: 'openmpi'|'mpich'|...
-TRUS_CDFR=''  	 ## NetCDF    " "               
-               	    ## ex: 'netcdf'|'netcdf-parallel'|...
+TRUS_JINF=''   	 ## Get job informations to fill in a logfile during computation
+                   ## ex: "llq -x \${TRUS_JIDN}"
 
+## Compiler (use with `${TRUS_CMPV} --version`)
+TRUS_CMPV=''       ## ex: 'ifort'|'gfortran'|'pgfortran'|...
 
-## Personal settings
-##---------------------------------------------------
-
-## Timeout for computation (s)
-[ -z "${TRUS_TOUT}" ] && TRUS_TOUT=
+## Software/libraries (string pattern to match just before the release number in $PATH)
+## Respectively CDO (Climate Data Operators) / MPI libraries / NetCDF libraries
+TRUS_CDOR=''       ## ex: 'cdo/'|'netcdf-utils-'
+TRUS_MPIR=''       ## ex: 'intel/impi/'|'bullxmpi/'
+TRUS_CDFR=''       ## ex: 'netcdf/'|'netcdf-'
