Changeset 5453

Timestamp:

2015-06-19T20:51:04+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Ping pong updates between Curie & Ada to finalize

Location:

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST

Files:

• batch (added)
• config (copied) (copied from branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/cfg)
• trusting.env (modified) (2 diffs)
• trusting.sh (modified) (12 diffs)
• trusting_func.sh (modified) (6 diffs)

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

@@ -8 +8 @@
 # Sourcing user configuration
 #--------------------------------------
-. ${NEMO_TRUS}/cfg/${CFG_USER}.cfg
+. ${NEMO_TRUS}/config/${CFG_USER}.cfg
 export DIR_WORK  DIR_SCRA  DIR_STOR
 export NEMO_HOME NEMO_BRAN
@@ -25 +25 @@
 # Sourcing super-computer configuration
 #--------------------------------------
-. ${NEMO_TRUS}/cfg/${CFG_ARCH}.cfg
+. ${NEMO_TRUS}/config/${CFG_ARCH}.cfg
 export CDO      COMPILER  MPI      NETCDF
 export JOB_SUBM JOB_LIST  JOB_VIEW JOB_DELE

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

@@ -31 +31 @@
 if [[ ! -z "${CFG_ARCH}" && ! -z "${CFG_USER}" ]]; then
 
-    if   [ ! $( find ${NEMO_TRUS}/cfg -name ${CFG_USER}.cfg ) ]; then
-   echo 'No configuration file in '${NEMO_TRUS}'/cfg for '${CFG_USER}; exit 1
-    elif [ ! $( find ${NEMO_TRUS}/cfg -name ${CFG_ARCH}.cfg ) ]; then
-   echo 'No configuration file in '${NEMO_TRUS}'/cfg for '${CFG_ARCH}; exit 1
+    if   [ ! $( find ${NEMO_TRUS}/config -name ${CFG_USER}.cfg ) ]; then
+   echo 'No configuration file in '${NEMO_TRUS}'/config for '${CFG_USER}; exit 1
+    elif [ ! $( find ${NEMO_TRUS}/config -name ${CFG_ARCH}.cfg ) ]; then
+   echo 'No configuration file in '${NEMO_TRUS}'/config for '${CFG_ARCH}; exit 1
     else
    . ${NEMO_TRUS}/trusting.env
@@ -52 +52 @@
 printf "Date\n$datestr1\n" > mesg_01_date_${CFG_USER}_${CFG_ARCH}.txt
 # Only at end status will change to OK
-STATUS='FAILED'
+STATUS='FAILED'; STEP=''
 
 # SVN action on XIOS & NEMO essentials directories
@@ -64 +64 @@
 . ${ARCH_ENV} > /dev/null
 get_soft_rel
-cat model.log
+cat env.log
 
 # XIOS compiling
@@ -78 +78 @@
 #[ -d ${TEST_CONF} ] && ./makenemo -n ${TEST_CONF} clean
 ./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m $ARCH -j $NPROC >& /dev/null
-[ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out $STEP $STATUS
+[ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out $STATUS $STEP
 
 # Get namelists, xml & forced files for running
@@ -93 +93 @@
 
 ${cmd_iol} > inputs_list.txt && ${cmd_iof} > /dev/null
-[ $? -ne 0 ] && get_out $STEP $STATUS
+[ $? -ne 0 ] && get_out $STATUS $STEP
 [ $( find . -name '*.gz' -print -quit ) ] && gunzip *.gz
 
@@ -104 +104 @@
 #---------------------------------------------------
 print_step 'Running'
-export JOB_ID=$( ${JOB_SUBM} | awk '{print $NF}' )
-[ $? -ne 0 ] && get_out $STEP $STATUS
+JOB_ID=$( ${JOB_SUBM} | awk '{print $NF}' )
+export JOB_ID
+[ $? -ne 0 ] && get_out $STATUS $STEP
 
 time_elapsed=0; time_increment=30
@@ -111 +112 @@
 while [[ $( ${JOB_LIST} | grep ${JOB_ID} ) && ${time_elapsed} -lt ${TIME_LIMI} ]]; do
     printf "\n####################################################" >> computation.log
-    ${JOB_VIEW} ${JOB_ID}                                          >> computation.log
+    ${JOB_VIEW} ${JOB_ID}                                           >> computation.log
     sleep ${time_increment}
     let time_elapsed+=${time_increment}
@@ -122 +123 @@
 if   [[ ! -e ocean.output || $( grep 'E R R O R' ocean.output ) ]]; then
     ${JOB_DELE} ${JOB_ID} &> /dev/null
-    [ ! -e ocean.output                  ] && STATUS='nemo.exe crashed at initialization'
-    [ $( grep 'E R R O R' ocean.output ) ] && STATUS='nemo.exe crashed'
-    comments('E R R O R')
+    [ ! -e ocean.output                  ] && STEP='nemo.exe crashed at initialization'
+    [ $( grep 'E R R O R' ocean.output ) ] && STEP='nemo.exe crashed'
+    comments 'E R R O R'
     ${JOB_DELE} ${JOB_ID} >/dev/null 2>&1
-    get_out $STEP $STATUS
+    get_out $STATUS $STEP
 else
     STATUS='OK'
@@ -135 +136 @@
     for file in ocean.output solver.stat tracer.stat; do
    diff $file ${REFE_DIR}/$file
-   [ $? -ne 0 ] && STATUS='At least 1 ASCII output file differ'
+   [ $? -ne 0 ] && STATUS='FAILED' && STEP='ASCII output file differ'
     done
 
@@ -142 +143 @@
     print_step 'Test last restart NetCDF files diff'
     diff_restart #2> /dev/null
-    [ $? -ne 0 ] && STATUS='At least 1 restart .nc file differ'
-
-    # Check super-computing architecture modification
-    #---------------------------------------------------
-    print_step 'Test super-computing architecture change'
-    diff_arch
-    [ $? -ne 0 ] && STATUS='At least 1 restart .nc file differ'
+    [ $? -ne 0 ] && STATUS='FAILED'
 
     # Get computation duration
@@ -155 +150 @@
     get_cpu_time
 
-    comments('W A R N I N G')
+    comments 'W A R N I N G'
 fi
 
@@ -161 +156 @@
 #---------------------------------------------------
 [ $STATUS == 'OK' ] && STEP='Code is reliable'
-get_out $STEP $STATUS
+get_out $STATUS $STEP

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

@@ -3 +3 @@
 
 comments() {
-    [ -e ocean.output ] && grep $1 ocean.output
+    [ -e ocean.output ] && line=$( grep $1 ocean.output )
+
+    # Check environment architecture modification
+    #---------------------------------------------------
+    [ $( diff -q env.log ${REFE_DIR}/env.log ) ] && line=$( diff env.log ${REFE_DIR}/env.log )
+
     printf "Comments\n$line\n" | tee mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt
 }
@@ -13 +18 @@
 }
 
-diff_arch() {
-    diff env.log ${REFE_DIR}/env.log
-}
-
 diff_inputs() {
     mesg='Same'
 
-    for file in inputs_list.txt $( ls namelist_* ) iodef.xml; do
+    for file in inputs_list.txt $( ls namelist_* ) $( ls *.xml ); do
    diff $file ${REFE_DIR}/$file
    [ $? -ne 0 ] && mesg='Different'
@@ -46 +47 @@
        cmp ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc
        if [ $? -ne 0 ]; then
-      export STATUS='FAILED'
+      export STEP='Restart files different'
       printf "$CDO diffn\n"
       $CDO diffn ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc 2> /dev/null
@@ -69 +70 @@
     done
 
-    sed -n 4p env.log | sed 'i\Compiler'    > mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt
-    sed -n 5p env.log | sed 'i\MPI libs'    > mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt
-    sed -n 6p env.log | sed 'i\NetCDF libs' > mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 3p env.log | sed 'i\Compiler'    > mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 4p env.log | sed 'i\MPI libs'    > mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 5p env.log | sed 'i\NetCDF libs' > mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -118 +119 @@
 
   # Send mail only when FAILED
-  if [[ $( grep 'FAILED' mesg_02_status_${CFG_USER}_${CFG_ARCH}.txt ) && ! -z $MAIL ]]; then
+  if [[ ! -z $MAIL && "$STATUS"=='FAILED' ]]; then
       cat << END_MAIL > trusting.mail
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -137 +138 @@
 }
 
-print_step() {
-    STEP=$1
-    export STEP
-    printf "Step.....\n$1\n"
-}
+print_step() { STEP=$1; export STEP && printf "Step.....\n$TEP\n"; }
 
 get_out() {