Changeset 5438 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

Timestamp:

2015-06-18T23:02:31+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Increase trusting main script clarity with new functions

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh (modified) (5 diffs)

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

@@ -2 +2 @@
 
 
+comments() {
+    echo 'Comments'      | tee    mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt
+    grep $1 ocean.output | tee -a mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt
+}
+
+get_cpu_time() {
+    # Portability !
+    real_cpu_time=$( ${JOB_VIEW} ${job_num} | awk 'END{print $9}' )
+    printf "Real CPU time\n%s\n" ${real_cpu_time} | tee mesg_08_realcputime_${CFG_USER}_${CFG_ARCH}.txt
+}
+
 diff_inputs() {
+    mesg='Same'
+
     for file in inputs_list.txt $( ls namelist_* ) iodef.xml; do
    diff $file ${REFE_DIR}/$file
-
-   if [ $? -ne 0 ]; then
-       printf "Input files\nDifferent" | tee mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
-       get_out
-   fi
-
+   [ $? -ne 0 ] && mesg='Different'
     done
 
-    printf "Input files\nSame"              | tee mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Input files\n$mesg" | tee mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
 }
 
-diff_nc() {
-    stat=100; file1=$1; file2=$2
-
-    $CDO diffv $file1 $file2 > out_tmp
-    ( [ $? -ne 0 ] && stat=100 ) || stat=$( grep -m 1 'records differ' out_tmp | awk -Fof '{print $1}' )
-    [ -f out_tmp ] && rm out_tmp
-
-    return $stat
-} 
-
 diff_restart() {
-    result=0
     last_time_step=$( cat ${REFE_DIR}/time.step | tr -d [:space:] )
-    echo 'Last time step: '${last_time_step}
+    echo 'Last time step of standard run: '${last_time_step}
 
     if [ $( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit ) ]; then
-   basename=$( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit \
-                | sed "s/^\(.*\)$last_time_step\_.*/\1$last_time_step/"               )
+   base_name=$( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit           \
+                | awk -F/ '{print $NF}' | sed "s/^\(.*\)$last_time_step\_.*/\1$last_time_step/" )
 
    for comp in restart restart_ice restart_trc; do
-       printf "${TEST_DIR}/${basename}_${comp}*.nc: "
+       printf "${base_name}_${comp}.nc: "
 
-       nb_dom=$( find ${TEST_DIR} -name "${basename}_${comp}_[0-9]*.nc" | wc -l | awk '{print $1}' )
+       nb_dom=$( find ${TEST_DIR} -name "${base_name}_${comp}_[0-9]*.nc" | wc -l | awk '{print $1}' )
        if [ ${nb_dom} -gt 1 ]; then
-      ${NEMO_TRBD}/rebuild_nemo -t $NPROC ${basename}_$comp ${nb_dom} >/dev/null
+      ${NEMO_TRBD}/rebuild_nemo -t $NPROC ${base_name}_$comp ${nb_dom} > /dev/null
        fi
 
-       cmp ${TEST_DIR}/${basename}_$comp.nc ${REFE_DIR}/${basename}_$comp.nc
+       cmp ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc
        if [ $? -ne 0 ]; then
-      result=$( diff_nc ${TEST_DIR}/${basename}_$comp.nc ${REFE_DIR}/${basename}_$comp.nc )
-      printf "$CDO diffv $result\n"
+      status='FAILED'
+      printf "$CDO diffn\n"
+      $CDO diffn ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc 2> /dev/null
        else
       printf "identical\n"
        fi
-#      \rm *${last_time_step}_${comp}_[0-9]*.nc
+
+       \rm  ${TEST_DIR}/${base_name}_${comp}_[0-9]*.nc
    done
 
@@ -60 +59 @@
 get_soft_rel() {
     for rel in $CDO $COMPILER $MPI $NETCDF; do
-                                 arch_rel=$( echo $LOADEDMODULES | sed "s#.*$rel/\([^:]*\).*#\1#" )
-   [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH          | sed "s#.*$rel/\([^/]*\).*#\1#" )
-   [ $rel == $COMPILER ] && arch_rel=$( $rel --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#" )
+   [ $rel == $COMPILER ] && arch_rel=$( $rel --version      | grep -m1 -o ' [0-9.]* '         )
    echo $rel ${arch_rel} >> model.log
     done
+
+    sed -n 2p model.log | sed 'i\Compiler'    | tee mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 3p model.log | sed 'i\MPI libs'    | tee mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 4p model.log | sed 'i\NetCDF libs' | tee mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -70 +73 @@
     rev=0
 
+    # If -v|--version option has been set, modify svn command
+    if   [ $( echo ${NEMO_VERS} | grep  "up\|update"         ) ]; then SVN_OPT='update'
+    elif [ $( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) ]; then SVN_OPT='checkout'
+   rev=$( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' )
+    fi
+
     for dir in ${DIR_XIOS}  ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_ENGI} ${NEMO_EIOI} \
           ${NEMO_EFCM} ${NEMO_TRUS} ${NEMO_TCMP} ${NEMO_TRBD}               ; do
+
    # For time being, just get revision number from XIOS
-   [ $dir == ${DIR_XIOS} ] && echo 'XIOS '$( svn info $dir | awk '(NR == 9) {print $NF}' ) >> model.log && continue
-   ${SVN_CMD} $dir
+   if [ $dir == ${DIR_XIOS} ]; then
+       echo 'XIOS '$( svn info $dir | awk '(NR == 9) {print $NF}' ) >> model.log
+       continue
+   fi
+
+   # 
+   if [ $( echo ${SVN_OPT} | grep 'checkout' ) ]; then
+       cd ../$dir 
+       url=$( svn info $dir | grep URL | awk '{print $NF}' )
+       svn ${SVN_OPT} $url -r $rev $dir && cd -
+   else
+       svn ${SVN_OPT} $dir
+   fi
+
    rev_loc=$( svn info $dir | awk '(NR == 5) {print $NF}' )
    (( ${rev_loc} >= $rev )) && rev=${rev_loc}
@@ -80 +102 @@
 
     echo 'NEMO '$rev >> model.log
+    sed -n 6p model.log | sed 'i\NEMOGCM rev.' | tee mesg_02_nemo_${CFG_USER}_${CFG_ARCH}.txt
 }
 
 mesg_make() {
     paste -d ';' mesg_*_${CFG_USER}_${CFG_ARCH}.txt > trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.txt
-    cat trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.txt
+    cat                                               trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -115 +138 @@
 }
 
+pstep() {
+    printf "Step.....\n$1\n"
+}
+
 get_out() {
+    step=$1; status=$2
     mesg_make; mesg_publish
 
     # Save tested configuration if trusting failed
     if [ $status == 'FAILED' ]; then
+   touch mesg_08_realcputime_${CFG_USER}_${CFG_ARCH}.txt mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt
    cd ${REFE_DIR}
    tar -czf trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.tar.gz ${TEST_DIR}/*
    cd -
     fi
-   
+
+    printf "Status\n$status\n"  > mesg_03_status_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Step.....\n$step\n" > mesg_04_step_${CFG_USER}_${CFG_ARCH}.txt
+
     exit 1
 }