Changeset 5799

Timestamp:

2015-10-16T16:38:37+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS18_TRUST Establishing common environment for installing & running trusting, consolidation of scripts & continuation of templates & help section improvments

Location:

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST

Files:

• banner.html (added)
• banner.txt (modified) (2 diffs)
• config/X64_ADA.cfg (modified) (1 diff)
• config/X64_CURIE.cfg (modified) (1 diff)
• config/X64_CURIE_cron.cfg (deleted)
• config/arch_template.cfg (modified) (1 diff)
• config/martin.cfg (modified) (1 diff)
• config/romr005.cfg (modified) (1 diff)
• config/user_template.cfg (modified) (1 diff)
• install_new_branch.sh (modified) (2 diffs)
• trusting.env (modified) (1 diff)
• trusting.sh (modified) (9 diffs)
• trusting_func.sh (modified) (24 diffs)
• trusting_help.txt (modified) (1 diff)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/banner.txt

@@ -1 @@
-<pre style="font: 2px/1px monospace;">
 @@@@@@O$$$$$$@@@@@@#$$$$$$&@#$$$$$$$$$$$$$$$&@O$$$$$$&@@@@@@@@@$$$$$$O@@@@@@@@@@@O$$%$O@@@@@@@@@@@@@
 @@@@@@?!!!!!!#@@@@@O!!!!!!#@$!!!!!!!!!!!!!!!#@%!!!!!!?&@@@@@@@$!!!!!!?@@@@@@@@&O#&&&&%??$#@@@@@@@@@@
@@ -31 +30 @@
 @#O&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 &&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-</pre>

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/X64_ADA.cfg

@@ -2 +2 @@
 ##---------------------------------------------------
 
-ARCH_ENV=${DIR_XIOS}/arch/arch-${TRUS_HPCC}.env
 
-CMPF='ifort'
-STR_CDOD='cdo/'
-STR_LMPI='intel/impi/'
-STR_NCDF='netcdf/'
+## Default settings
+##---------------------------------------------------
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
 
-JOB_SUBM="llsubmit ${TRUS_DIR}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'"
-JOB_STAT="llq      | grep \${JOB_ID}"
-JOB_INFO="llq -x          \${JOB_ID}"
-JOB_KILL="llcancel        \${JOB_ID}"
+TRUS_CDOD='cdo diffn'
 
-[ -z "${TRUS_NPRO}"   ] && TRUS_NPRO='16'
-[ -z "$TIMEOUT" ] && TIMEOUT='10800'
 
-JOB_TIME="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}'"
-JOB_PMEM="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f3 | awk '{print \$3,\$4}'"
-JOB_VMEM="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f2 | awk '{print \$3,\$4}'"
+## Job commands
+##---------------------------------------------------
+TRUS_JSUB="llsubmit ${TRUS_DIRE}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'"
+TRUS_JSTA="llq      | grep \${JOB_ID}"
+TRUS_JKIL="llcancel        \${JOB_ID}"
 
-CDOD='cdo diffn'
+TRUS_JTIM="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}'"
+TRUS_JPME="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f3 | awk '{print \$3     ,\$4 }'"
+TRUS_JVME="grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f2 | awk '{print \$3     ,\$4 }'"
+
+TRUS_JINF="llq -x \${JOB_ID}"
+
+
+## Available softwares/librairies
+##---------------------------------------------------
+TRUS_CMPF='ifort'
+TRUS_CDOR='cdo/'
+TRUS_MPIR='intel/impi/'
+TRUS_CDFR='netcdf/'
+
+
+## Personal settings
+##---------------------------------------------------
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16'
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
+
+PATH='/smplocal/pub/cdo/1.5.9/bin':$PATH
+#WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem'

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/X64_CURIE.cfg

@@ -2 +2 @@
 ##---------------------------------------------------
 
-ARCH_ENV=${DIR_XIOS}/arch/arch-${TRUS_HPCC}.env
 
-CMPF='ifort'
-STR_CDOD='netcdf-utils-'
-STR_LMPI='bullxmpi/'
-STR_NCDF='netcdf-'
+## Default settings
+##---------------------------------------------------
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
 
-JOB_SUBM="ccc_msub ${TRUS_DIR}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'"
-JOB_STAT="ccc_mpp   | grep  \${JOB_ID}"
-JOB_INFO="ccc_macct         \${JOB_ID}"
-JOB_KILL="ccc_mdel          \${JOB_ID}"
+TRUS_CDOD='cdo diffn'
 
-[ -z "${TRUS_NPRO}"   ] && TRUS_NPRO='16'
-[ -z "$TIMEOUT" ] && TIMEOUT='10800'
 
-JOB_TIME="ccc_macct \${JOB_ID} | awk '/opa/ {print \$9}'"
-JOB_PMEM="ccc_macct \${JOB_ID} | awk "
-JOB_VMEM="ccc_macct \${JOB_ID} | awk "
+## Job commands
+##---------------------------------------------------
+TRUS_JSUB="ccc_msub ${TRUS_DIRE}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'"
+TRUS_JSTA="ccc_mpp  | grep  \${JOB_ID}"
+TRUS_JKIL="ccc_mdel         \${JOB_ID}"
 
-CDOD='cdo diffn'
+TRUS_JTIM="ccc_macct \${JOB_ID} | awk '/opa/ {print \$9}'"
+TRUS_JPME="ccc_macct \${JOB_ID} | awk                    "
+TRUS_JVME="ccc_macct \${JOB_ID} | awk                    "
+
+TRUS_JINF="ccc_macct \${JOB_ID}"
+
+
+## Available softwares/librairies
+##---------------------------------------------------
+TRUS_CMPF='ifort'
+TRUS_CDOR='netcdf-utils-'
+TRUS_MPIR='bullxmpi/'
+TRUS_CDFR='netcdf-'
+
+
+## Personal settings
+##---------------------------------------------------
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16'
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
+
+PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/arch_template.cfg

@@ -1 @@
-## HPC configuration template
+## (Super)Computer configuration template
 ##---------------------------------------------------
 
 ## Copy to root (./config) and rename it by keeping '.cfg' extension, then fill in according to your (super)computer
-## Will be called by its name without the extension
+## 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
 
 
-## Mandatory 
+## Default settings
 ##---------------------------------------------------
 
-## (Super)Computer environment
-ARCH_ENV=''          ## *.env, *.path or modulesfile to source (let void if $PATH has already been setted)
-                          ## ex: "${DIR_XIOS}/arch/arch-${TRUS_HPCC}.env"
+## (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
 
-## Job commands (use with `eval ${JOB_....}`), may need to use "\${JOB_ID}" variable as the job ID returned from submission:
-JOB_SUBM=''          ## Submit a job and get his ID in return (will became ${JOB_ID})
-                 ## ex: `llsubmit ${TRUS_DIR}/batch/${TRUS_HPCC}.sh | grep -oe '\<[0-9]*\>'`, use absolute path
-JOB_STAT=''          ## Test state of the submitted job (true -> pending/running or false -> completed/crashed)
-                             ## ex: "llq | grep \${JOB_ID}"
-JOB_KILL=''          ## Kill the submitted job
-                             ## ex: "llcancel   \${JOB_ID}"
+## Number of compiling processes
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO=1
 
-## Compiling (number of tasks) and computation (timeout in s)
-[ -z "${TRUS_NPRO}"     ] && TRUS_NPRO='1'
-[ -z "${TIMEOUT}" ] && TIMEOUT='10800'
-
-## $CDO command to compare 2 datasets in argument
-CDOD=''                 ## Essential to check a difference between NetCDF restart files
+## Command to compare 2 netCDF restart files in argument (think to load software in $PATH by any way)
+TRUS_CDOD='cdo diffn'
 
 
-## Interest when monitoring HPC center
+## Job commands
 ##---------------------------------------------------
 
-## Software releases (string pattern to match just before the number in $LOADEDMODULES or $PATH):
-STR_CDOD=''          ## CDO (Climate Data Operators)
-                          ## ex: 'cdo'||'nco'||...
-STR_LMPI=''          ## MPI    libraries            
-                          ## ex: 'openmpi'||'mpich'||...
-STR_NCDF=''          ## NetCDF    " "               
-                          ## ex: 'netcdf'||'netcdf-parallel'||...
+## 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
 
-## Fortran compiler version (use with `$COMPILER --version`)
-CMPF=''             ## ex: 'ifort'||'gfortran'||'pgfortran'||...
+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}"
 
 
-## Optional (can be void if no alternative or need)
+## Available softwares/librairies
 ##---------------------------------------------------
 
-## Computational performances of finished job (use with `eval ${JOB_....}`)
-JOB_INFO=''          ## Get job informations to fill in a logfile during computation
-                             ## ex: "llq -x     \${JOB_ID}"
-JOB_TIME=''          ## Get CPU elapsed time
-                             ## ex: `grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f1 | awk '{print \$(NF-1),\$NF}'`
-JOB_PMEM=''          ## Get max physical memory
-                             ## ex: `grep IdrisMemMPI NEMO_CI_\${JOB_ID} | cut -d, -f3 | awk '{print \$3,\$4}'`
-JOB_VMEM=''          ## Get " " virtual    ""  
+## Fortran compiler version (use with `${TRUS_CMPF} --version`)
+TRUS_CMPF=''     ## ex: 'ifort'|'gfortran'|'pgfortran'|...
+
+## 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'|...
+
+
+## Personal settings
+##---------------------------------------------------
+
+## Timeout for computation (s)
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT=

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/martin.cfg

@@ -1 @@
-## User configuration
-##-------------------
+## Installation for overall trusting tests on Curie Supercomputer
+##---------------------------------------------------
 
-DIR_WORK=$CCCWORKDIR
-DIR_SCRA=$SCRATCHDIR/trusting
-DIR_STOR=$CCCSTOREDIR/trusting_sav
 
-if [ -z "${TRUS_WKCY}" ]; then branch='trunk'; else branch=${TRUS_WKCY}; fi
-TRUS_WKCY=${DIR_WORK}/NEMO/$branch/NEMOGCM
+## Global Directories
+##---------------------------------------------------
+TRUS_SCRA=$SCRATCHDIR/NEMO/trusting
+TRUS_STOR=$CCCSTOREDIR/NEMO/trusting_sav
+TRUS_FORC=$CCCWORKDIR/NEMO/FORC
+TRUS_XIOS=$CCCWORKDIR/XIOS/xios-1.0
+
+
+## Default settings
+##---------------------------------------------------
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
+TRUS_CKOT=( 'ARCH CONFIG NEMO EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO' )
+
 [ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES'
-TRUS_BHMK=${DIR_STOR}/${TRUS_REFE}/${TRUS_WKCY}
-TEST_DIR=${DIR_SCRA}/${TRUS_REFE}/${TRUS_WKCY}/trusting_${DATE}
+TRUS_CONF=${TRUS_REFE}'_trust'
 
-DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0
-
-TRUS_TEST=${TRUS_REFE}'_trust'
-[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_TEST='O2LP_trust'
-[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TEST='O1L3P_trust'
-
-KEYS_ADD=''; KEYS_DEL=''
-
-if [ ${TRUS_REFE} == 'ORCA2_LIM' ]; then
-    TRUS_TEST='O2LA_trust'
-    KEYS_ADD='key_add key_agrif' && KEYS_DEL='key_del key_zdftmx'
-fi
-
-TRUS_FORC=${DIR_WORK}/NEMO/FORC
 [ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
 [ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
 [ ${TRUS_REFE} == 'AMM12'             ] && TRUS_TARF='AMM12_v3.6.tar'
 
-[ -z "$TRUS_MAIL" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
+
+
+## Personal settings
+##---------------------------------------------------
+[ -z "${TRUS_WORK}" ] && TRUS_WORK=$CCCWORKDIR/NEMO
+
+TRUS_TEST=${TRUS_SCRA}/${TRUS_REFE}/${TRUS_BRAN}/trusting_${DATE}
+TRUS_BHMK=${TRUS_STOR}/${TRUS_REFE}/${TRUS_BRAN}
+
+[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_CONF='O2LP_trust'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust'
+[ ${TRUS_REFE} == 'ORCA2_LIM'         ] && TRUS_CONF='O2LA_trust'
+
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/romr005.cfg

@@ -1 @@
-## User configuration
-##-------------------
+## Installation for overall trusting tests on Ada Supercomputer
+##---------------------------------------------------
 
-DIR_WORK=$WORKDIR
-DIR_SCRA=$WORKDIR/NEMO/trusting
-DIR_STOR=$WORKDIR/NEMO/trusting_sav
 
-if [ -z "${TRUS_WKCY}" ]; then branch='trunk'; else branch=${TRUS_WKCY}; fi
-TRUS_WKCY=${DIR_WORK}/NEMO/$branch/NEMOGCM
+## Global Directories
+##---------------------------------------------------
+TRUS_SCRA=$WORKDIR/NEMO/trusting
+TRUS_STOR=$WORKDIR/NEMO/trusting_sav
+TRUS_FORC=$WORKDIR/NEMO/FORC
+TRUS_XIOS=$WORKDIR/XIOS/xios-1.0
+
+
+## Default settings
+##---------------------------------------------------
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
+TRUS_CKOT=( 'ARCH CONFIG NEMO EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO' )
+
 [ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES'
-TRUS_BHMK=${DIR_STOR}/${TRUS_REFE}/$branch
-TEST_DIR=${DIR_SCRA}/${TRUS_REFE}/$branch/trusting_${DATE}
+TRUS_CONF=${TRUS_REFE}'_trust'
 
-DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0
-
-TRUS_TEST=${TRUS_REFE}'_trust'
-[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_TEST='O2LP_trust'
-[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TEST='O1L3P_trust'
-
-KEYS_ADD=''; KEYS_DEL=''
-
-if [ ${TRUS_REFE} == 'ORCA2_LIM' ]; then
-    TRUS_TEST='O2LA_trust'
-    KEYS_ADD='key_add key_agrif' && KEYS_DEL='key_del key_zdftmx'
-fi
-
-TRUS_FORC=${DIR_WORK}/NEMO/FORC
 [ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
 [ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
 [ ${TRUS_REFE} == 'AMM12'             ] && TRUS_TARF='AMM12_v3.6.tar'
 
-[ -z "$TRUS_MAIL" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
+
+
+## Personal settings
+##---------------------------------------------------
+[ -z "${TRUS_WORK}" ] && TRUS_WORK=$WORKDIR/NEMO
+
+TRUS_TEST=${TRUS_SCRA}/${TRUS_REFE}/${TRUS_BRAN}/trusting_${DATE}
+TRUS_BHMK=${TRUS_STOR}/${TRUS_REFE}/${TRUS_BRAN}
+
+[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_CONF='O2LP_trust'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust'
+[ ${TRUS_REFE} == 'ORCA2_LIM'         ] && TRUS_CONF='O2LA_trust'
+
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/user_template.cfg

@@ -1 @@
-## User configuration
+## User configuration template
 ##---------------------------------------------------
 
 ## Copy to root (./config) and rename it by keeping '.cfg' extension, then fill in according to your installation
-## Will be called by its name without extension
+## Rules for completion:
+   ## Undefined variables (=)   are mandatory
+   ## Void         " "    (='') " " optional
+## Look into other configuration file for examples
+## It will be called by its name without extension
 
 
-## Mandatory
+## Global directories
+##---------------------------------------------------
+TRUS_SCRA=     ## Computation
+TRUS_STOR=     ## Backup
+TRUS_FORC=     ## Location of forcing archive to extract (combined use with ${TRUS_TARF}) or
+               ##    ""    "" all inputs files to copy into ${TRUS_TEST}
+TRUS_XIOS=     ## XIOS installation
+
+
+## Default settings
 ##---------------------------------------------------
 
-## Few settings can be changed from directly from command line to reduce the creation of user configuration file
+## These settings can be changed directly from command line to reduce number of user configuration file
 ## See `./trusting.sh [-h|--help]`
 
-## Directories path
-TRUS_BHMK=''           ## Benchmark folder where target files for comparison have been stored
-                         ## Inputs  (all) : CPP_*, namelist_*, *.xml et inputs_file.txt (formed by first test)
-                         ## Outputs (any) : *.stat, ocean.output, restarts
-TEST_DIR=''       ## Testing folder for computation
-                         ## ex: ".../trusting_${DATE}"
-TRUS_WKCY=''          ## Working copy of branch test
-                         ## ex: ".../NEMOGCM"
-DIR_XIOS=''       ## XIOS installation
+## SVN branch name
+[ -z "${TRUS_BRAN}" ] && TRUS_BRAN='trunk'
 
-## NEMO configurations
-TRUS_REFE=''          ## Reference configuration to test
-TRUS_TEST=''          ## Testing configuration name
+## Minimal content for code checkout/update
+TRUS_CKOT=( 'ARCH CONFIG NEMO EXTERNAL/AGRIF EXTERNAL/fcm EXTERNAL/IOIPSL TOOLS/COMPILE TOOLS/maketools TOOLS/REBUILD_NEMO' )
 
-## Forcing files
-TRUS_FORC=''          ## Directory with forcing archive to extract (combined use with ${TRUS_TARF}) or
-                      ##    " "     ""  all inputs files to copy into ${TEST_DIR}
+## Reference configuration to test
+[ -z "${TRUS_REFE}" ] && TRUS_REFE='ORCA2_LIM_PISCES'
+
+## Forcing archive, let void if not need to untar inside ${TRUS_FORC}
+[ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
+[ ${TRUS_REFE} == 'AMM12'             ] && TRUS_TARF='AMM12_v3.6.tar'
+
+## Testing configuration name
+TRUS_CONF=${TRUS_REFE}'_trust'
+
+## CPP keys to add or remove from reference configuration
+TRUS_KEYA=''; TRUS_KEYD=''
+[ ${TRUS_REFE} == 'ORCA2_LIM' ] && TRUS_KEYA='key_add key_agrif' && TRUS_KEYD='key_del key_zdftmx'
 
 
-## Possible use 
+## Personal settings
 ##---------------------------------------------------
 
-## Archive inputs name, let void if not requested
-TRUS_TARF=''
+## Folder for testing branch (intallation & compilation of testing configuration)
+[ -z "${TRUS_WORK}" ] && TRUS_WORK=
 
-## CPP keys to add or remove from reference configuration
-KEYS_ADD=''
-KEYS_DEL=''
+## Testing folder for computation
+TRUS_TEST=     ## ${TRUS_SCRA}/${TRUS_REFE}/${TRUS_BRAN}/${DATE} recommended
 
+## Benchmark folder where target files for comparison have been stored, ie:
+   ## Inputs  (all) : CPP_*, namelist_*, *.xml et inputs_list.txt (created by first test)
+   ## Outputs (any) : *.stat, ocean.output, restarts
+TRUS_BHMK=     ## ${TRUS_STOR}/${TRUS_REFE}/${TRUS_BRAN} recommended
 
-## Optional (can be void if no alternative or need)
-##---------------------------------------------------
-
-## Mailing list to notify of a failure (-p|--prod required)
-TRUS_MAIL=''
+## Mailing list to notify on failure (-p|--prod option required)
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL=''

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/install_new_branch.sh

@@ -2 +2 @@
 
 
-HELP=0; NEMO_BRAN='trunk'; NPROC=1
-SVN_URL='https://forge.ipsl.jussieu.fr/nemo/svn'
+cd $( dirname $0 )
 
+## Set defaults
+##---------------------------------------------------
+TRUS_DIRE=$PWD
+TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
+
+
+## Get options (for replacing initials settings)
+##---------------------------------------------------
 while [ $# -ne 0 ]; do
     case $1 in
-   '-b'|'--branch') NEMO_BRAN=$2; shift 2;; '-d'|'--directory') INSTALL_DIR=$2; shift 2;;
-   '-j'|'--job'   ) NPROC=$2    ; shift 2;; '-m'|'--machine'  ) NEMO_HPCC=$2  ; shift 2;;
-   '-h'|'--help'  ) HELP=1      ; shift  ;; '-u'|'--username' ) SVN_USER=$2   ; shift 2;;
-   "*"            ) HELP=1      ; shift  ;;
+   '-d'|'--debug'  ) TRUS_DBUG=1 ; shift  ;; '-j'|'--job'     ) TRUS_NPRO=$2; shift 2;;
+   '-m'|'--machine') TRUS_HPCC=$2; shift 2;; '-h'|'--help'    ) TRUS_HELP=1 ; shift  ;;
+   '-u'|'--user'   ) TRUS_USER=$2; shift 2;; '-w'|'--workdir') TRUS_WORK=$2; shift 2;;
+   "*"             ) TRUS_HELP=1 ; shift  ;;
     esac
 done
 
-if [[ -z "${INSTALL_DIR}" || -z "${NEMO_HPCC}" || $HELP == 1 ]]; then
-    echo 'Error'
+
+## Initialization (HPC & user environment)
+##---------------------------------------------------
+if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
+    cat trusting_help.txt
+
+    if [ ${TRUS_HELP} -eq 0 ]; then
+   printf "\n\n\033[0;33m"
+   printf "At least one configuration (arch or user) file is missing or misspelled:"
+   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUS_USER} ${TRUS_HPCC}
+   printf "\033[0m"
+    fi
+
+    printf "\n\nContent of 'config' folder:\n"
+    find config -name *.cfg | cut -d/ -f2 \
+   | xargs -n 4 printf "\t- %-25s\t- %-25s\t- %-25s\t- %-25s\n"
     exit 1
+else
+    . trusting.env
+    [ ${TRUS_DBUG} -eq 1 ] && set -vx
 fi
 
-if   [ ${NEMO_BRAN} == 'trunk' ]; then
-    svn_bran=${NEMO_BRAN}
-elif [ $( svn ls ${SVN_URL}/branches/2015 | grep -oe "\<${NEMO_BRAN}\>") ]; then
-    svn_bran=branches/2015/${NEMO_BRAN}
-else
-    printf "\nNEMO branch name \033[0;31m%s\033[0m given is not recognized\n\n" ${NEMO_BRAN}
-    echo 'List of existing branches on repository in branches/2015:'
-    svn ls ${SVN_URL}/branches/2015 | tr -d / | xargs -n 3 printf "%-35s\t%-35s\t%-35s\n"
-    echo
-    exit 1
-fi
 
-printf "\nInstallation of NEMO trusting monitoring in %s on %s branch for %s\n\n" \
-    ${INSTALL_DIR} ${NEMO_BRAN} ${NEMO_HPCC}
+## List last branches from NEMO Forge
+##---------------------------------------------------
+printf "\nWhat branch do you want to install in "${TRUS_WORK}" for trusting test ? "
+echo 'Enter 0 to abort'
+select branch in 'trunk' $( svn ls ${TRUS_SVNH}/branches/2015 | tr -d / | sort -r ); do
 
-echo 'Initial checkout of '${NEMO_BRAN}' branch'
-mkdir -p ${INSTALL_DIR}/${NEMO_BRAN}/NEMOGCM && cd ${INSTALL_DIR}/${NEMO_BRAN}/NEMOGCM
+    if [ $REPLY -eq 0 ]; then exit 1; else export TRUS_BRAN=$branch; fi
 
-for elmt in 'ARCH' 'CONFIG' 'NEMO' 'EXTERNAL' 'TOOLS' 'TRUST'; do
-    rev=''
-    printf "%s " $elmt
-    [ $elmt == 'TRUST' ] && svn_bran='branches/2015/dev_r5092_CNRS18_TRUST' && rev='-r 5697'
-    svn co -q $rev ${SVN_URL}/${svn_bran}/NEMOGCM/$elmt
+    printf "\nInstallation of a working copy of '%s' branch in '%s'? " ${TRUS_BRAN} ${TRUS_WORK}
+    echo 'Type [Y|y|yes] to confirm, if not back to branches list number'
+    read answer
+    [[ $answer == 'Y' || $answer == 'y' || $answer == 'yes' ]] && break
+
 done
 
-printf "\n\nCleaning EXTERNAL directory\n"
-cd EXTERNAL
-printf 'Remove '
-
-for elmt in $( find -maxdepth 1 -type d -name '[^.]*' ); do
-    if [ ! $( echo $elmt | grep "AGRIF\|IOIPSL\|fcm" ) ]; then
-   printf "%s " $elmt && rm -rf $elmt > /dev/null
-    fi
-done
-printf "\n"
+echo
 
 
-printf "\nCleaning TOOLS directory\n"
-cd ../TOOLS
-printf 'Remove '
+## First checkout of selected branch
+##---------------------------------------------------
+echo 'Initial checkout of '${TRUS_BRAN}' branch'
+mkdir -p ${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
+cd       ${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
 
-for elmt in $( find -maxdepth 1 -type d -name '[^.]*' ); do
-    if [ ! $( echo $elmt | grep "COMPILE\|maketools\|REBUILD_NEMO" ) ]; then
-   printf "%s " $elmt && rm -rf $elmt > /dev/null
+svn_bran=branches/2015/${TRUS_BRAN}
+[ ${TRUS_BRAN} == 'trunk' ] && svn_bran=${TRUS_BRAN}
+
+for elmt in ${TRUS_CKOT}; do
+    printf "%s " $elmt
+
+    if [ $elmt == 'TOOLS/maketools' ]; then
+   svn co -q ${TRUS_SVNH}/${svn_bran}/NEMOGCM/TOOLS --depth empty
+   svn up -q $elmt
+    else
+   svn co -q ${TRUS_SVNH}/${svn_bran}/NEMOGCM/$elmt $elmt
     fi
+
 done
+
 printf "\n\n"
 
-if [ $( find ../ARCH -name arch-${NEMO_HPCC}.fcm ) ]; then
+
+## Compile rebuild_nemo.exe in anticipation
+##---------------------------------------------------
+if [ $( find ARCH -name arch-${TRUS_HPCC}.fcm ) ]; then
     echo 'Compile NEMO rebuild tool'
-    ./maketools -n REBUILD_NEMO -m ${NEMO_HPCC} -j $NPROC >& /dev/null
+    cd TOOLS && ./maketools -n REBUILD_NEMO -m ${TRUS_HPCC} -j ${TRUS_NPRO} > /dev/null
     [ $? -eq 0 ] && printf "\033[0;32mOK\033[0m" || printf "\033[0;31mKO\033[0m"
     printf "\n\n"
@@ -75 +96 @@
     printf "\033[0;31mNo arch file found to compile NEMO rebuild tool\033[0m\n\n"
 fi
+
+exit 0
+

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.env

@@ -2 +2 @@
 
 
-## Patterns (UTC time-stamp & filename)
+## Patterns (UTC time-stamp & messengers filename)
 ##--------------------------------------
 dat=$( date )
 export DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" )
 export PATTERNAME=${TRUS_USER}'_'${TRUS_HPCC}
+export TRUS_SVNH='https://forge.ipsl.jussieu.fr/nemo/svn'
+
+
+## Source user configuration
+##---------------------------------------------------
+. ${TRUS_DIRE}/config/${TRUS_USER}.cfg
+export TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC
+export TRUS_WORK TRUS_BRAN TRUS_BHMK TRUS_TEST
+export TRUS_REFE TRUS_CONF TRUS_TARF TRUS_KEYA TRUS_KEYD
+export TRUS_MAIL
+
+export TRUS_NGCM=${TRUS_WORK}/${TRUS_BRAN}/NEMOGCM
+
 
 ## Source (super)computer configuration
 ##---------------------------------------------------
-. ${TRUS_DIR}/config/${TRUS_HPCC}.cfg
-export ARCH_ENV
-export JOB_INFO JOB_KILL JOB_PMEM JOB_STAT JOB_SUBM JOB_TIME JOB_VMEM
-export TRUS_NPRO    TIMEOUT
-export CDOD
-export STR_CDOD STR_LMPI STR_NCDF
-export CMPF
+. ${TRUS_DIRE}/config/${TRUS_HPCC}.cfg
+export TRUS_ENVI
+export TRUS_CDOD
+export TRUS_JSUB TRUS_JSTA TRUS_JKIL TRUS_JPME TRUS_JTIM TRUS_JVME TRUS_JINF
+export TRUS_CMPF TRUS_CDOR TRUS_MPIR TRUS_CDFR
+export TRUS_NPRO TRUS_TOUT
 
-## Source user configuration
-##---------------------------------------------------
-. ${TRUS_DIR}/config/${TRUS_USER}.cfg
-export TRUS_BHMK  TEST_DIR  TRUS_REFE TRUS_TEST
-export TRUS_WKCY DIR_XIOS
-export TRUS_FORC TRUS_TARF
-export KEYS_ADD  KEYS_DEL
-export TRUS_MAIL

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

@@ -6 +6 @@
 ## Set defaults
 ##---------------------------------------------------
-DBG=0; PROD=0; HELP=0
-TRUS_DIR=$PWD; TRUS_RSLT='FAILED'; SVN_CMD='svn status' # ('FAILED' result & no update on directories)
+TRUS_DIRE=$PWD
+TRUS_DBUG=0; TRUS_PROD=0; TRUS_HELP=0
+## No update on SVN directories & 'FAILED' result for 'Unknown error' )
+TRUS_SVNA='svn status'; TRUS_RSLT='FAILED'; TRUS_RORR=0
 xios_mode='--full'; stdout_redir='>&'
-revi=$( svn info | awk '(NR == 9) {print $NF}' )
+rev=$( svn info | awk '(NR == 9) {print $NF}' )
 
 
-## Get options for replacing initials settings
+## Get options (replacing initials settings)
 ##---------------------------------------------------
 while [ $# -ne 0 ]; do
     case $1 in
-   '-a'|'--archive') TRUS_TARF=$2  ; shift 2;; '-b'|'--branch' ) TRUS_WKCY=$2; shift 2;;
-   '-d'|'--debug'  ) set -vx; DBG=1; shift  ;; '-e'|'--email'  ) TRUS_MAIL=$2; shift 2;;
-   '-j'|'--job'    ) TRUS_NPRO=$2  ; shift 2;; '-h'|'--help'   ) HELP=1      ; shift  ;;
-   '-m'|'--machine') TRUS_HPCC=$2  ; shift 2;; '-n'|'--newconf') TRUS_TEST=$2; shift 2;;
-   '-r'|'--refconf') TRUS_REFE=$2  ; shift 2;; '-t'|'--time'   ) TIMEOUT=$2  ; shift 2;;
-   '-p'|'--prod'   ) PROD=1        ; shift  ;; '-u'|'--user'   ) TRUS_USER=$2; shift 2;;
-   '-v'|'--version') TRUS_VERS=$2  ; shift 2;; "*"             ) HELP=1      ; shift  ;;
+   '-a'|'--archive') TRUS_TARF=$2; shift 2;; '-b'|'--branch' ) TRUS_BRAN=$2; shift 2;;
+   '-d'|'--debug'  ) TRUS_DBUG=1 ; shift  ;; '-e'|'--email'  ) TRUS_MAIL=$2; shift 2;;
+   '-f'|'--forcdir') TRUS_FORC=$2; shift 2;; '-j'|'--job'    ) TRUS_NPRO=$2; shift 2;;
+   '-h'|'--help'   ) TRUS_HELP=1 ; shift  ;; '-m'|'--machine') TRUS_HPCC=$2; shift 2;;
+   '-n'|'--newconf') TRUS_CONF=$2; shift 2;; '-r'|'--refconf') TRUS_REFE=$2; shift 2;;
+   '-t'|'--time'   ) TRUS_TOUT=$2; shift 2;; '-p'|'--prod'   ) TRUS_PROD=1 ; shift  ;;
+   '-u'|'--user'   ) TRUS_USER=$2; shift 2;; '-v'|'--version') TRUS_SVNV=$2; shift 2;;
+   '-w'|'--workdir') TRUS_WORK=$2; shift 2;; "*"             ) TRUS_HELP=1 ; shift  ;;
     esac
 done
@@ -29 +32 @@
 ## Initialization (HPC & user environment)
 ##---------------------------------------------------
-if [[ ! $( find config -name ${TRUS_USER}'.cfg' && find config -name ${TRUS_HPCC}'.cfg' ) || $HELP -eq 1 ]]; then
+if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then
     cat trusting_help.txt
 
-    if [ $HELP -eq 0 ]; then
-   printf "\n\nAt least one configuration file is missing or misspelled: %s.cfg %s.cfg" \
-       ${TRUS_USER} ${TRUS_HPCC}
+    if [ ${TRUS_HELP} -eq 0 ]; then
+   printf "\n\n\033[0;33m"
+   printf "At least one configuration (arch or user) file is missing or misspelled:"
+   printf "\t'%s'.cfg\t'%s'.cfg" ${TRUS_USER} ${TRUS_HPCC}
+   printf "\033[0m"
     fi
 
-    printf "\n\nContent of config folder:"
-    find config -name *.cfg | cut -d/ -f2 | xargs -n 3 printf "%-30s\t%-30s\t%-30s\n"
+    printf "\n\nContent of 'config' folder:"
+    find config -name *.cfg | cut -d/ -f2 \
+   | xargs -n 4 printf "%-25s\t%-25s\t%-25s\n"
     exit 1
 else
     . trusting.env && . trusting_func.sh
-
-    ## DEBUG options to speed up & expand verbosity of compilation
-    [ $DBG -eq 1 ] && { xios_mode=''; stdout_redir='>'; }
+#echo $WRAPPER_LDFLAGS
+    ## DEBUG option to speed up & expand verbosity of compilation
+    [ ${TRUS_DBUG} -eq 1 ] && { set -vx; xios_mode=''; stdout_redir='>'; }
 
     ## If -v|--version option has been set, modify default SVN action on directories
-    if   [ $( echo ${TRUS_VERS} | grep  "HEAD\|up\|update"                     ) ]; then
-   SVN_CMD='svn update -r HEAD'
-    elif [ $( echo ${TRUS_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
-   SVN_CMD='svn update -r '$( echo ${TRUS_VERS} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
-    elif [ $( echo ${TRUS_VERS} | grep -o '[0-9]*'                             ) ]; then
-   SVN_CMD='svn update -r '$( echo ${TRUS_VERS} | grep -o '[0-9]*'                             )
+    if   [ $( echo ${TRUS_SVNV} | grep  "HEAD\|up\|update"                     ) ]; then
+   TRUS_SVNA='svn update -r HEAD'
+    elif [ $( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then
+   TRUS_SVNA='svn update -r     ' \
+       $( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' )
+    elif [ $( echo ${TRUS_SVNV} | grep -o '[0-9]*'                             ) ]; then
+   TRUS_SVNA='svn update -r     ' \
+       $( echo ${TRUS_SVNV} | grep -o '[0-9]*' )
     fi
 
@@ -61 +69 @@
 ##---------------------------------------------------
 echo
-cat banner.txt
+if [ -t 0 ]; then cat banner.txt; else cat banner.html; fi
 echo
 echo '****************************************************************************************************'
 echo '*                                                                                                  *'
 echo '*                           NEMO Trusting (Continuous Integration Tool)                            *'
-echo "*                                             ver.$revi                                             *"
+echo "*                                             ver.$rev                                             *"
 echo '*                                                                                                  *'
 echo '****************************************************************************************************'
 echo
-echo '  - Testing configuration   '${TRUS_TEST}' based on '${TRUS_REFE}
-echo '  - Working copy            '${TRUS_WKCY}
+echo '  - Testing configuration   '${TRUS_CONF}' based on '${TRUS_REFE}
+echo '  - SVN working copy        '${TRUS_WORK}/${TRUS_BRAN}
 echo '  - Benchmark folder        '${TRUS_BHMK}
 echo '  - (Super)Computer         '${TRUS_HPCC}
@@ -81 +89 @@
 ##---------------------------------------------------
 print_step 'Timestamped testing directory'
-mkdir -p ${TEST_DIR} ${TRUS_BHMK}
-cd ${TEST_DIR} && echo ${TEST_DIR}
+mkdir -p ${TRUS_TEST} ${TRUS_BHMK}
+cd       ${TRUS_TEST}
+echo     ${TRUS_TEST}
 init_files
 get_date
@@ -89 +98 @@
 ## Get SVN revision on XIOS & NEMO essentials directories
 ##---------------------------------------------------
-print_step "SVN action on NEMO directories: ${SVN_CMD}"
+print_step "SVN action on NEMO directories: ${TRUS_SVNA}"
 get_nemo_rev
 
@@ -99 +108 @@
 cat model.log
 env | sort > env.log
-
+#echo $WRAPPER_LDFLAGS
 
 ## XIOS compilation from scratch
 ##---------------------------------------------------
 print_step 'Compile XIOS'
-cd ${DIR_XIOS}
+cd ${TRUS_XIOS}
 eval ./make_xios ${xios_mode} --arch ${TRUS_HPCC} --job ${TRUS_NPRO} \
     ${stdout_redir} /dev/null
@@ -113 +122 @@
 ##---------------------------------------------------
 print_step "Compile ${TRUS_REFE} configuration"
-cd ${TRUS_WKCY}/CONFIG
-[[ -d ${TRUS_TEST} && $DBG -eq 0 ]] && ./makenemo -n ${TRUS_TEST} clean_config \
+cd ${TRUS_NGCM}/CONFIG
+[[ -d ${TRUS_CONF} && ${TRUS_DBUG} -eq 0 ]] && ./makenemo -n ${TRUS_CONF} clean_config \
     > /dev/null <<EOF
 y
 EOF
 
-eval ./makenemo -n ${TRUS_TEST} -r ${TRUS_REFE} -m ${TRUS_HPCC} -j ${TRUS_NPRO} \
-                   ${KEYS_ADD} ${KEYS_DEL}                                      \
+eval ./makenemo -n ${TRUS_CONF} -r ${TRUS_REFE} -m ${TRUS_HPCC} -j ${TRUS_NPRO} \
+                ${TRUS_KEYA} ${TRUS_KEYD}                                       \
     ${stdout_redir} /dev/null
-[ ! -e ${TRUS_TEST}/BLD/bin/nemo.exe ] && get_out 2 || echo 'Success'
+[ ! -e ${TRUS_CONF}/BLD/bin/nemo.exe ] && get_out 2 || echo 'Success'
 
 
@@ -128 +137 @@
 ##---------------------------------------------------
 print_step 'Set job (copying or extracting inputs)'
-cd ${TEST_DIR}
-cp   ${TRUS_WKCY}/CONFIG/${TRUS_TEST}/cpp_* .
-find ${TRUS_WKCY}/CONFIG/${TRUS_TEST}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
+cd ${TRUS_TEST}
+cp   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/cpp_* .
+find ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \
                                             -exec  cp {} . \;
 get_inputs
@@ -146 +155 @@
 ##---------------------------------------------------
 print_step 'Submit job'
-JOB_ID=$( eval ${JOB_SUBM} )
+JOB_ID=$( eval ${TRUS_JSUB} )
 [ $? -ne 0 ] && get_out 4 || echo 'Success (job ID '${JOB_ID}')'
 print_step 'Pending job'

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting_func.sh

@@ -3 +3 @@
 
 ## Messenger filenames
-FILE_DATE=mesg_01_date_$PATTERNAME.txt  ; FILE_TRUS_RSLT=mesg_02_result_$PATTERNAME.txt
+FILE_DATE=mesg_01_date_$PATTERNAME.txt  ; FILE_RSLT=mesg_02_result_$PATTERNAME.txt
 FILE_STAT=mesg_03_state_$PATTERNAME.txt ; FILE_NEMO=mesg_04_nemo_$PATTERNAME.txt
 FILE_XIOS=mesg_05_xios_$PATTERNAME.txt  ; FILE_CMPF=mesg_06_compiler_$PATTERNAME.txt
@@ -10 +10 @@
 FILE_MEMY=mesg_11_memory_$PATTERNAME.txt; FILE_NOTE=mesg_12_comments_$PATTERNAME.txt
 
-## Timestamped logfile & archive filenames
-FILE_TRUS=trusting_${DATE}_$PATTERNAME.txt; FILE_ARCH=trusting_${DATE}_$PATTERNAME.tgz
+## Trusting timestamped logfile & archive
+TRUS_FILE=trusting_${DATE}_$PATTERNAME.txt; TRUS_ARCH=trusting_${DATE}_$PATTERNAME.tgz
 
 
@@ -23 +23 @@
 
 init_files() {
-    echo 'Date'               > ${FILE_DATE}; echo 'Result'           > ${FILE_TRUS_RSLT}
+    echo 'Date'               > ${FILE_DATE}; echo 'Result'           > ${FILE_RSLT}
     echo 'State'              > ${FILE_STAT}; echo 'NEMOGCM rev.'     > ${FILE_NEMO}
     echo 'XIOS rev.'          > ${FILE_XIOS}; echo 'Fortran compiler' > ${FILE_CMPF}
@@ -31 +31 @@
 
     ## 'Failed' status with 'Unknown error' by default
-    echo $TRUS_RSLT           \
-   >> ${FILE_TRUS_RSLT}
+    echo ${TRUS_RSLT}      \
+   >> ${FILE_RSLT}
     echo 'Unknown error' \
    >> ${FILE_STAT}
@@ -47 +47 @@
 get_nemo_rev() {
     local dir rev_loc
-    local rev=0 list=( 'ARCH CONFIG NEMO EXTERNAL/AGRIF EXTERNAL/IOIPSL EXTERNAL/fcm TOOLS/COMPILE TOOLS/REBUILD_NEMO' )
+    local rev=0
 
     ## Loop on essential NEMO directories
-    for dir in $list ${DIR_XIOS}; do
+    for dir in ${TRUS_CKOT} ${TRUS_XIOS}; do
 
    ## For time being, just get revision from XIOS with no action on directory
-   if [ $dir == ${DIR_XIOS} ]; then
-       rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' )
+   if [ $dir == ${TRUS_XIOS} ]; then
+       rev_loc=$( svn info $dir | awk '/Last Changed Rev/ {print $NF}' )
        echo 'XIOS '${rev_loc} \
       >> model.log
@@ -62 +62 @@
    fi
 
-   echo $dir && ${SVN_CMD} ${TRUS_WKCY}/$dir
-   rev_loc=$( svn info ${TRUS_WKCY}/$dir | awk '(NR == 9) {print $NF}' )
+   echo $dir && ${TRUS_SVNA} ${TRUS_NGCM}/$dir
+   rev_loc=$( svn info ${TRUS_NGCM}/$dir | awk '/Last Changed Rev/ {print $NF}' )
 
    ## Keep last rev. nb
@@ -76 +76 @@
 
 get_soft_rel() {
-    local soft soft_rel
-
-    ## Sourcing environment modulefile only if module function is set
-    [[ -e ${ARCH_ENV} && $( declare -F | grep ' module' ) ]] && . ${ARCH_ENV}
-
-    for soft in $CMPF ${STR_CDOD} ${STR_LMPI} ${STR_NCDF}; do
+    local soft_rel str
+
+    if [ -n "${TRUS_ENVI}" ]; then
+        ## Sourcing environment modulefile (.env) only if module function is set
+   if [[  -e ${TRUS_ENVI}.env && $( declare -F | grep ' module' ) ]]; then
+       . ${TRUS_ENVI}.env
+   else
+       [ -e ${TRUS_ENVI}.path ] && . ${TRUS_ENVI}.path || . ${TRUS_ENVI}
+   fi
+    fi
+
+    ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter on LDFLAGS variables
+    [ $TRUS_HPCC == 'X64_ADA' ] && WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS}
+
+    for str in ${TRUS_CMPF} ${TRUS_MPIR} ${TRUS_CDFR} ${TRUS_CDOR}; do
+   [ -z "$str" ] && continue
    soft_rel=''
 
    ## Software release: next word after "$soft" in $PATH (case-insensitive)
-   soft_rel=$( echo $PATH | sed "s#.*$soft\([0-9.a-z_]*\).*#\1#i" )
+   soft_rel=$( echo $PATH | sed "s#.*$str\([0-9.a-z_]*\).*#\1#i" )
 
    ## option --version would work for main compilers (gfortran, intel, pgfortran, ...)
-   [ $soft == $COMPILER ] && soft_rel=$( $soft --version | grep -m1 -oe '\<[0-9. ]*\>' )
+   [ $str == ${TRUS_CMPF} ] && soft_rel=$( $str --version | grep -m1 -oe '\<[0-9. ]*\>' )
 
    ## Cleaning characters string to display proper soft name
-   soft=$( echo $soft | sed 's#\\##g; s#[/-]$##' )
-
-   echo $soft ${soft_rel} \
+   str=$( echo $str | sed 's#\\##g; s#[/-]$##' )
+
+   echo $str ${soft_rel} \
        >> model.log
     done
 
+    sed -n 3p model.log \
+   >> ${FILE_CMPF}
     sed -n 4p model.log \
-   >> ${FILE_CMPF}
+   >> ${FILE_LMPI}
     sed -n 5p model.log \
-   >> ${FILE_LMPI}
-    sed -n 6p model.log \
    >> ${FILE_NCDF}
 }
@@ -110 +120 @@
 
     ## List & copy files in case of personal inputs
-    [ -z "${TRUS_TARF}" ] && { cmd_iol="ls ${TRUS_FORC}/*"; cmd_iof="\cp ${TRUS_FORC}/* ."; }
+    if [ -z "${TRUS_TARF}" ]; then
+     cmd_iol="ls ${TRUS_FORC}/*"                ; cmd_iof="\cp ${TRUS_FORC}/* ."
+    fi
 
     ${cmd_iol} > inputs_list.txt
@@ -128 +140 @@
 
    ## Pass over useless file omission in benckmark directory
-   [[ -n "$dif" && "$dif" != '0' ]] && ( mesg='Different'; echo $dif; files_list+=$file' ' )
+   [[ -n "$dif" && "$dif" != '0' ]] && { mesg='Different'; echo $dif; files_list+=$file' '; }
     done
 
@@ -146 +158 @@
 
     ## Append a log file while pending
-    while [[ $( eval ${JOB_STAT} ) && ${time_elapsed} -lt $TIMEOUT ]]; do
-   printf "\n%s\n" ${outline// /#} \
+    while [[ $( eval ${TRUS_JSTA} ) && ${time_elapsed} -lt ${TRUS_TOUT} ]]; do
+   printf "\n%s\n" ${outline// /#}          \
        >> computation.log
-   eval ${JOB_INFO}                \
+   [ -n "${TRUS_JINF}" ] && eval ${JOB_INFO} \
        >> computation.log
    sleep ${time_increment}
@@ -158 +170 @@
 
     ## Kill remaining job & stop the test if it's too long
-    [ ${time_elapsed} -eq $TIMEOUT ] && { eval ${JOB_DELE} &> /dev/null; get_out 6; }
+    [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${JOB_DELE} &> /dev/null; get_out 6; }
 }
 
@@ -168 +180 @@
     for file in 'ocean.output' *.stat; do
    ## Stop if no benchmark files (ocean.output, eventual stat files)
-   [ ! -e ${TRUS_BHMK}/$file ] && { export TRUS_RSLT='FAILED'; get_out 7; }
+   [ ! -e ${TRUS_BHMK}/$file ] && { TRUS_RSLT='FAILED'; get_out 7; }
 
    diff -q $file ${TRUS_BHMK}/$file
 
    ## Continue even if it differs
-   [ $? -ne 0 ] && { export TRUS_RSLT='FAILED'; mesg='Different'; files_list+=$file' '; }
+   [ $? -ne 0 ] && { TRUS_RSLT='FAILED'; mesg='Different'; files_list+=$file' '; }
     done
 
@@ -188 +200 @@
 
     ## Stop if no benchmark files (ie time.step)
-    [ ! -e ${TRUS_BHMK}/time.step ] && { export TRUS_RSLT='FAILED'; get_out 7; }
+    [ ! -e ${TRUS_BHMK}/time.step ] && { TRUS_RSLT='FAILED'; get_out 7; }
     time_step=$( cat ${TRUS_BHMK}/time.step | tr -d [:space:] )
 
@@ -208 +220 @@
 
       if   [ ${nb_dom} -gt 1 ]; then
-          ${TRUS_WKCY}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} > /dev/null
-          [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc                                > /dev/null
+          ${TRUS_NGCM}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} \
+         > /dev/null
+          [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc \
+                        > /dev/null
       elif [ ${nb_dom} -eq 0 ]; then
-          export TRUS_RSLT='FAILED' && get_out 8
+          TRUS_RSLT='FAILED' && get_out 8
       fi
 
@@ -221 +235 @@
 
                    ## UNIX `cmp` not suitable (timestamp in .nc file)
-         dif=$( $CDOD $file.nc ${TRUS_BHMK}/$file.nc 2> /dev/null          \
+         dif=$( $TRUS_CDOD $file.nc ${TRUS_BHMK}/$file.nc 2> /dev/null          \
                 | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n' )
 
          ## CDO can return void stdout with no difference
          if [[ -n "$dif" && $( echo $dif | awk '{print $1}' ) -ne 0 ]]; then
-             export TRUS_RSLT='FAILED'
+             TRUS_RSLT='FAILED'
              files_list+=$comp' ' && let dif_sum+=$( echo $dif | awk '{print $1}' )
              echo $file.nc': '$dif
@@ -232 +246 @@
 
           else
-         export TRUS_RSLT='FAILED' && get_out 7
+         TRUS_RSLT='FAILED' && get_out 7
           fi
 
@@ -252 +266 @@
 
     else
-   export TRUS_RSLT='FAILED'
+   TRUS_RSLT='FAILED'
     fi
 
@@ -258 +272 @@
 
 get_time() {
+    [ -z "${TRUS_JTIM}" ] && return
+
     ## Interest for checking unusual time computation
-    local time_cpu=$( eval ${JOB_TIME} )
+    local time_cpu=$( eval ${TRUS_JTIM} )
 
     printf "Elapsed time: "
@@ -266 +282 @@
 
 get_memy() {
+    [[ -z "${TRUS_JPME}" && -z "${TRUS_JVME}" ]] && return
+
     ## Interest for checking unusual memory usage
-    local memory_pmax=$( eval ${JOB_PMEM} ) memory_vmax=$( eval ${JOB_VMEM} )
+    local memory_pmax=$( eval ${TRUS_JPME} ) memory_vmax=$( eval ${TRUS_JVME} )
 
     printf "Memory max usage (physical/virtual): "
@@ -296 +314 @@
 
     ## Construct txt file with all messenger files
-    paste -d ';' mesg_*.txt | tee ${FILE_TRUS}
+    paste -d ';' mesg_*.txt | tee ${TRUS_FILE}
 }
 
@@ -304 +322 @@
 
     ## Production mode (-p|--prod)
-    if [ $PROD -eq 1 ]; then
+    if [ ${TRUS_PROD} -eq 1 ]; then
 
    ## Create or append trusting logfile
    if [ -f ${TRUS_BHMK}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi
 
-   $cmd ${FILE_TRUS}                           \
+   $cmd ${TRUS_FILE}                           \
        >> ${TRUS_BHMK}/trusting_$PATTERNAME.txt
 
         ## Send mail only when FAILED
-   if [[ ! -z "$TRUS_MAIL" && $TRUS_RSLT == 'FAILED' ]]; then
+   if [[ ! -z "${TRUS_MAIL}" && ${TRUS_RSLT} == 'FAILED' ]]; then
 
        ## Content
@@ -321 +339 @@
 
 
-The trusting sequence has not completed successfully on new configuration ${TRUS_TEST} based on ${TRUS_REFE}.
+The trusting sequence has not completed successfully on new configuration ${TRUS_CONF} based on ${TRUS_REFE}.
 
 Here is the model summary:
@@ -330 +348 @@
 
 For more details, look into the testing directory at:
-${TEST_DIR}
+${TRUS_TEST}
 
 An archive has been created to share the questionable configuration for further studies:
-${TRUS_BHMK}/${FILE_ARCH}
+${TRUS_BHMK}/${TRUS_ARCH}
 
 END_MAIL
 
        ## Send with detailed subject
-       mail -s "[NEMO Trusting][$rev][${TRUS_WKCY}][${TRUS_REFE}] $TRUS_RSLT $ERR" $TRUS_MAIL \
+       mail -s "[NEMO Trusting][$rev][${TRUS_BRAN}][${TRUS_REFE}] ${TRUS_RSLT} ${TRUS_RORR}" ${TRUS_MAIL} \
       <  trusting.mail
    fi
@@ -348 +366 @@
     local time_step=0
 
-    ERR=$1
+    TRUS_RORR=$1
 
     printf "\n\nEnd of test\n"
 
     ## In case of compilation error
-    cd ${TEST_DIR}
-
-    if [ $TRUS_RSLT == 'FAILED' ]; then
+    cd ${TRUS_TEST}
+
+    if [ ${TRUS_RSLT} == 'FAILED' ]; then
    echo 'Failure'
 
         ## Error identification
-   case $ERR in
+   case ${TRUS_RORR} in
             ## Compilation
-       '1') ERR='XIOS compilation failed' ;; '2') ERR='NEMO compilation failed';;
+       '1') TRUS_RORR='XIOS compilation failed' ;; '2') TRUS_RORR='NEMO compilation failed';;
        ## Submission
-       '3') ERR='Missing input files'     ;; '4') ERR='Job submission error'   ;;
+       '3') TRUS_RORR='Missing input files'     ;; '4') TRUS_RORR='Job submission error'   ;;
        ## Computation
-       '5') ERR='Crashed at time step'    ;; '6') ERR='Exceeded time limit'    ;;
+       '5') TRUS_RORR='Crashed at time step'    ;; '6') TRUS_RORR='Exceeded time limit'    ;;
        ## Results
-       '7') ERR='Missing previous outputs';; '8') ERR='New outputs differ'     ;;
+       '7') TRUS_RORR='Missing previous outputs';; '8') TRUS_RORR='New outputs differ'     ;;
+       ## Other
+       '*') TRUS_RORR='Unknown error'           ;;
    esac
 
     else
-   echo 'Success' && ERR='Code is reliable'
+   echo 'Success' && TRUS_RORR='Code is reliable'
     fi
 
     ## Eventual comments from ocean.output
-    if [ "$ERR" == 'Crashed at time step' ]; then
+    if [ "${TRUS_RORR}" == 'Crashed at time step' ]; then
    comments 'E R R O R'
    [ -e time.step ] && time_step=$( grep -o [0-9]* time.step )
-   ERR+=' '$time_step
+   TRUS_RORR+=' '$time_step
     else
    comments 'W A R N I N G'
-   [ "$ERR" == 'Exceeded time limit' ] && ERR+=' '$(( ${TIMEOUTT}/3600 ))'h'
+   [ "${TRUS_RORR}" == 'Exceeded time limit' ] && TRUS_RORR+=' '$(( ${TRUS_TOUT}/3600 ))'h'
     fi
 
     ## Last messenger files
-    export ERR
-    sed -i "2 s/.*/$TRUS_RSLT/" ${FILE_TRUS_RSLT}; sed -i "2 s/.*/$ERR/" ${FILE_STAT}
+    #export TRUS_RORR
+    sed -i "2 s/.*/$TRUS_RSLT/" ${FILE_RSLT}; sed -i "2 s/.*/$TRUS_RORR/" ${FILE_STAT}
 
     ## Save tested configuration if trusting failed in production mode (-p|--prod)
-    if [[ $TRUS_RSLT == 'FAILED' && $PROD -eq 1 ]]; then
-   echo 'Creating archive '${FILE_ARCH}' under '${TRUS_BHMK}
-   tar -czf ${TRUS_BHMK}/${FILE_ARCH}              *                    \
-       -C ${TRUS_WKCY}/CONFIG/${TRUS_TEST}/MY_SRC .                    \
-       -C ${TRUS_WKCY}/CONFIG/${TRUS_TEST}        cpp_${TRUS_TEST}.fcm
+    if [[ ${TRUS_RSLT} == 'FAILED' && ${TRUS_PROD} -eq 1 ]]; then
+   echo 'Creating archive '${TRUS_ARCH}' under '${TRUS_BHMK}
+   tar -czf ${TRUS_BHMK}/${TRUS_ARCH}               *                    \
+       -C   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/MY_SRC .                    \
+       -C   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}        cpp_${TRUS_CONF}.fcm
     fi
 

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting_help.txt

@@ -1 @@
-Usage: ./trusting.sh -m $ARCH -u $USER [OPTIONS]
-Launch trusting test on $ARCH machine from $USER installation
-Example: './trusting.sh -m X64_CURIE -u romr005 -p -b nemo_v3_6_STABLE'
+Usage: ./trusting.sh        -u $USER -m $ARCH [OPTIONS]
+       ./install_new_branch -u $USER -m $ARCH [OPTIONS]
 
-Mandatory (default settings):
-    Files to source in ./config ($ARCH.cfg & $USER.cfg)
-    -m,--machine     Architecture environment (compilation & computation settings)
-    -u,--user        User             ""      (NEMO & XIOS installation)         
+./trusting.sh            Launch trusting test on $ARCH machine from $USER installation
+./install_new_branch     Install new branch in $USER installation for trusting test on $ARCH machine
 
-Other options (modify default settings)
-SVN working copy:
-    -b,--branch        SVN branch name to test (trunk|nemo_v3_6_STABLE|...)
-    -v,--version     Action on working copy ('status' by default)
-               '{'YYYY-MM-DD'}' Update to revision available at this date
-               [0-9]*              ""   "" revision number
-               HEAD|up|update     ""   "" last revision
-               st|status    Show differences with repository
+Examples: `./trusting.sh        -u romr005 -m X64_CURIE -p -b nemo_v3_6_STABLE`
+          `./install_new_branch -u romr005 -m X64_ADA   -w $HOME/NEMO         `
 
-NEMO configuration:
-    -a,--archive     Forcing input files archive to extract downloaded from ESGF/DODS server 
-    -n,--new_conf    Testing   configuration created in ./CONFIG
-    -r,--ref_conf    Reference      " "     
+Mandatory
+    Default settings to source in ./config, templates (arch_template.cfg & user_template.cfg)
+    -m,--machine      Architecture environment (compilation & computation settings)
+    -u,--user         User             ""      (NEMO & XIOS installation)        
 
-Compiling & computation:
-    -j,--job         Number of processes for compiling
-    -t,--time        Timeout for computation (s)
 
-Output control:
-    -d,--debug       Verbose output for debugging purpose (`set -vx`)
-    -e,--email       Email trusting digest report to following addresses only on failure
-    -h,--help        Print this help & exit
-    -p,--prod        Production mode (append trusting logfile)
+Options (modify default settings)
+SVN
+    -b,--branch         Branch name in working directory ('trunk'|'nemo_v3_6_stable'|...)
+    -v,--version      Action on working copy ('status' by default)
+                 '{'YYYY-MM-DD'}'  Update to revision available at this date
+                 [0-9]*        ""   ""    ""    number
+                 HEAD|up|update      ""   "" last revision
+                 st|status      Show differences with repository
+    -w,--workdir      Installation directory for testing branches
+
+Inputs
+    -a,--archive      Forcing input files archive to extract, if void it will copy all files from given folder (see next line)
+    -f,--forcdir      Path to your personal folder of forcing inputs
+
+Testing configuration
+    -n,--new_conf     Testing   configuration folder created in ./CONFIG
+    -r,--ref_conf     Reference      " "      for trusting test
+
+Compiling & computation
+    -j,--job          Number of processes for compiling
+    -t,--time         Timeout for computation (s)
+
+Trusting output
+    -d,--debug        Verbose output for debugging purpose (`set -vx`)
+    -e,--email        Email trusting digest report to following addresses only on failure
+    -h,--help         Print this help & exit
+    -p,--prod         Production mode (append trusting logfile)