Changeset 5286 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.sh

Timestamp:

2015-05-21T20:28:58+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Major update with clear partition of architecture & user configuration

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.sh (modified) (7 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
+#
+# Author: Patrick Brockmann
+# Contact: Patrick.Brockmann@cea.fr
+# History:
+# Modification: Nicolas-thierry.Martin@locean-ipsl.upmc.fr
+#
 
 
 # Set defaults
 DEBUG=0; PUBLISH=0; status='OK'
-NEMO_BRAN=trunk; # dev_r5092_CNRS_SETTE dev_v3_4_STABLE_2012
-ARCH=              # arch-${ARCH}.env to be sourced in ${DIR_XIOS} or leave blank without file
-CONF_REFE=ORCA2_LIM_PISCES
-CONF_TEST=${CONF_REFE}_trust
-#COMPILER=ifort gfortran f95 f90 pgfortran pgf95 pgf90 mpifort mpif90 mpiifort
-#MPI=bullxmpi openmpi mpich intel mpxlf
 
-
+# Get options && replace some initials settings
 while [ $# -ne 0 ]; do
     case $1 in
-        -b|--branch    ) NEMO_BRAN=$2         ; shift 2;;
-        -d|--debug     ) set -vx; DEBUG=1     ; shift  ;;
-        -h|--help|-help) cat trusting_help.txt; exit   ;;
-        -m|--machine   ) ARCH=$2              ; shift 2;;
-        -n|--newconf   ) CONF_TEST=$2         ; shift 2;;
-        -r|--refconf   ) CONF_REFE=$2         ; shift 2;;
-        -p|--publish   ) PUBLISH=1            ; shift  ;;
-   *)                                      break  ;;
+        -b|--branch ) NEMO_BRAN=$2         ; shift 2;; -d|--debug  ) set -vx; DEBUG=1     ; shift  ;;
+   -e|--email  ) MAIL=$2              ; shift 2;; -j|--job    ) NPROC=$2             ; shift 2;;
+   -h|--help   ) cat trusting_help.txt; exit   ;; -m|--machine) ARCH=$2              ; shift 2;;
+   -n|--newconf) CONF_TEST=$2         ; shift 2;; -r|--refconf) CONF_REFE=$2         ; shift 2;;
+   -t|--time   ) TIME_LIMI=$2         ; shift 2;; -p|--publish) PUBLISH=1            ; shift  ;;
+                   *) cat trusting_help.txt; exit   ;;
     esac
 done
-export ARCH CONF_REFE CONF_TEST DEBUG NEMO_BRAN PUBLISH
 
-#[ $# -ne 1 ] && { ./trusting.sh -h && exit; }
-# suspend debug mode (too verbose)
-#[ $debug -eq 1 ] && set +vx
+# Set super-computer & user environment
+[[ ! -z "$ARCH" && . trusting.env ]] || { ./trusting.sh -h && exit; }
+export DEBUG PUBLISH
 
 # Initialization
 #=============================================
 
-. trusting.env
 echo ${DIR_TEST}
 mkdir -p ${DIR_TEST} ${DIR_REFE}
 cd ${DIR_TEST}
-datestr1=$( LC_ALL=C date -d"$DATESTR" +%Y-%m-%dT%H:%M )
+datestr1=$( LC_ALL=C date -d"$DATE_STR" +%Y-%m-%dT%H:%M )
 printf "Date\n%s\n"       $datestr1 > mesg_01_date.txt
 
@@ -48 +44 @@
 # 
 #=============================================
-for rel in $COMPILER $MPI_NAME $NETCDFF; do
+for rel in $CDO $COMPILER $MPI $NETCDF; do
     printf "Step......................\nGet $rel release\n" > mesg_03_step.txt
-    arch_rel=$( echo $LOADEDMODULES | sed "s#.*:$rel/\([^:]*\).*#\1#" )
-    [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH | sed "s#.*$rel/\([^/]*\).*#\1#" )
-    [ $rel == $COMPILER ] && arch_rel=$( $FC --version | grep -m1 -o ' [0-9.]* ' )
+                             arch_rel=$( echo $LOADEDMODULES | sed "s#.*:$rel/\([^:]*\).*#\1#" )
+    [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH          | sed "s#.*$rel/\([^/]*\).*#\1#"  )
+    [ $( echo $rel | grep "$CDO\|$COMPILER" ) ] && arch_rel=$( $rel --version | grep -m1 -o ' [0-9.]* ' )
     echo $rel ${arch_rel} >> model.log
 done
@@ -64 +60 @@
 printf "Step......................\nCheckout XIOS, FCM-make(/EXTERNAL/fcm), NEMO engines (/NEMO) & configuration (/CONFIG)\n" > mesg_03_step.txt
 rev=0
-for dir in ${DIR_XIOS} ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_EFCM} ${NEMO_ENGI} ${NEMO_IPSL} ${NEMO_TCMP}; do
+for dir in ${DIR_XIOS} ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_EFCM} ${NEMO_ENGI} ${NEMO_IPSL} ${NEMO_SETT} ${NEMO_TCMP}; do
     svn up $dir
     rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' )
@@ -76 +72 @@
 printf "Step......................\nCompilation NEMO configuration %s\n" ${CONF_REF} > mesg_03_step.txt
 cd ${NEMO_CONF}
+. ${ARCH_ENV}     # Sourcing architecture environment
 #[ -d ${CONF_TEST} ] && ./makenemo -n ${CONF_TEST} clean
-./makenemo -n ${CONF_TEST} -r ${CONF_REFE} -m $ARCH -j 16 #> /dev/null 2>&1
+./makenemo -n ${CONF_TEST} -r ${CONF_REFE} -m $ARCH -j $NPROC #> /dev/null 2>&1
 [ ! -e ${CONF_TEST}/BLD/bin/nemo.exe ] && getout
 
@@ -85 +82 @@
 cd ${DIR_TEST}
 find ${NEMO_CONF}/${CONF_TEST}/EXP00 -regex '.*\(cfg\|opa\|ref\|xml\)' -exec cp {} . \;
-cp ${NEMO_FORC}/${FORC_TAR} . && tar -tvf ${FORC_TAR} > inputs_list.txt && tar -vxf ${FORC_TAR}
-[ $? -ne 0 ] && getout
-gunzip *.gz
+
+if [ ! -z "${NEMO_FORC}" ]; then
+    cp ${NEMO_FORC}/${FORC_TAR} .
+    tar -tvf ${FORC_TAR} > inputs_list.txt && tar -vxf ${FORC_TAR}
+    [ $? -ne 0 ] && getout
+    gunzip *.gz
+else
+    touch inputs_list.txt
+fi
 
 
@@ -96 +99 @@
 [ $? -ne 0 ] && getout
 
-output_test=ocean.output   ; output_refe=${DIR_REFE}/ocean.output
-solver_test=solver.stat    ; solver_refe=${DIR_REFE}/solver.stat
-tracer_test=tracer.stat    ; tracer_refe=${DIR_REFE}/tracer.stat
-inputs_test=inputs_list.txt; inputs_refe=${DIR_REFE}/inputs_list.txt
-
-#time_elapsed=0; time_limit=10800; time_increment=300
-time_elapsed=0; time_limit=1080; time_increment=30
+time_elapsed=0; time_increment=300
 sleep ${time_increment}
-while [[ $( ${JOB_LIST} | grep $job_num ) && ${time_elapsed} -lt ${time_limit} ]] ; do
-#while [[ ! -f ${solver_test} && ${time_elapsed} -lt ${time_limit} ]] ; do
-    printf "\n####################################################" >> ${DIR_TEST}/mpp.log
-    ${JOB_VIEW} $job_num >> mpp.log
-#   ${JOB_VIEW} $id >> mpp.log
+while [[ $( ${JOB_LIST} | grep $job_num ) && ${time_elapsed} -lt ${TIME_LIMI} ]] ; do
+    printf "\n####################################################" >> computation.log
+    ${JOB_VIEW} $job_num                                            >> computation.log
     sleep ${time_increment}
-    let time_elapsed+=time_increment
+    let time_elapsed+=${time_increment}
 done
 
 
 #---------------------------------------------
-printf "Step......................\nTest if solver exists\n"   > mesg_03_step.txt
-#if [ ! -f ${solver_test} ]; then
-#    grep 'E R R O R' ocean.output    >> mesg_11_comments.txt
-#    sed 's/^/Time step :/' time.step >> mesg_11_comments.txt
-#    getout
-#fi
+printf "Step......................\nTest if ASCII output files exist\n"   > mesg_03_step.txt
+if      [ ! -f ${output_test} ]; then
+
+    getout
+else if [  ]
+
+    grep 'E R R O R' ocean.output    >> mesg_11_comments.txt
+    sed 's/^/Time step :/' time.step >> mesg_11_comments.txt
+fi
 
 
 #---------------------------------------------
-printf "Step......................\nTest solvers difference\n" > mesg_03_step.txt
-diff ${output_refe} ${output_test}
-[ $? -ne 0 ] && status='FAILED'
-diff ${solver_refe} ${solver_test}
-[ $? -ne 0 ] && status='FAILED'
-diff ${tracer_refe} ${tracer_test}
+printf "Step......................\nTest ASCII output files difference\n" > mesg_03_step.txt
+for file in ocean.output solver.stat tracer.stat; do
+    diff $file ${DIR_REFE}/$file
+    [ $? -ne 0 ] && status='FAILED'
+done
+
+
+#---------------------------------------------
+printf "Step......................\nTest last restart files difference\n" > mesg_03_step.txt
+diff_trusting 2>/dev/null
 [ $? -ne 0 ] && status='FAILED'
 
 
 #---------------------------------------------
-printf "Step......................\nTest outputs difference\n" > mesg_03_step.txt
-#diff_trusting 2>/dev/null
-#[ $? -ne 0 ] && status='FAILED'
-
-
-#---------------------------------------------
-printf "Comments\n\n"              >  mesg_11_comments.txt
+echo 'Comments'                    >  mesg_11_comments.txt
 grep 'W A R N I N G:' ocean.output >> mesg_11_comments.txt
 
@@ -148 +144 @@
     printf "Step......................\nGet Real CPU time\n" > mesg_03_step.txt
     real_cpu_time=$( ${JOB_VIEW} $job_num | awk 'END{print $9}')
-    [ $? -ne 0 ] && getout
     printf "Real CPU time\n%s\n" ${real_cpu_time} > mesg_08_realcputime.txt
 else
     printf "Step......................\nTest InputFiles difference\n" > mesg_03_step.txt
-    diff ${inputs_refe} ${inputs_test}
-    { [ $? -ne 0 ] && printf "InputFiles\n%s\n" "Different" > mesg_09_inputfiles.txt } || printf "InputFiles\n%s\n" "Same" > mesg_09_inputfiles.txt
-    getout
+    diff inputs_list.txt ${DIR_REFE}/inputs_list.txt
+    [ $? -ne 0 ] && getout
+    [[ $? -ne 0 && printf "InputFiles\n%s\n" "Different" > mesg_09_inputfiles.txt ]] || printf "InputFiles\n%s\n" "Same" > mesg_09_inputfiles.txt
 fi