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

Timestamp:

2015-06-19T17:40:51+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Ping pong updates between Curie & Ada to finalize

File:

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

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

@@ -10 +10 @@
     # 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
+    printf "Real CPU time\n%s\n" ${real_cpu_time} | tee mesg_09_realcputime_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -21 +21 @@
     done
 
-    printf "Input files\n$mesg" | tee mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Input files\n$mesg" | tee mesg_08_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -42 +42 @@
        cmp ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc
        if [ $? -ne 0 ]; then
-      status='FAILED'
+      export STATUS='FAILED'
       printf "$CDO diffn\n"
       $CDO diffn ${TEST_DIR}/${base_name}_$comp.nc ${REFE_DIR}/${base_name}_$comp.nc 2> /dev/null
@@ -65 +65 @@
     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
+    sed -n 4p model.log | sed 'i\Compiler'    > mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 5p model.log | sed 'i\MPI libs'    > mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt
+    sed -n 6p model.log | sed 'i\NetCDF libs' > mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt
 }
 
 get_nemo_rev() {
-    rev=0
+    svn_opt='status'
 
     # 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:]' )
+    if [[    $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"   ) \
+     || $( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' )  ]]; then
+   rev=$( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) || rev='HEAD'
+   svn_cmd='svn update -r '$rev 
+    else
+   svn_cmd='svn '${svn_opt}
     fi
 
-    for dir in ${DIR_XIOS}  ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_ENGI} ${NEMO_EIOI} \
-          ${NEMO_EFCM} ${NEMO_TRUS} ${NEMO_TCMP} ${NEMO_TRBD}               ; do
+    rev=0
+    for dir in ${DIR_XIOS}  ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_ENGI} \
+          ${NEMO_EIOI} ${NEMO_EFCM} ${NEMO_TCMP} ${NEMO_TRBD}  ; do
 
    # For time being, just get revision number from XIOS
@@ -88 +92 @@
    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
-
+   ${svn_cmd} $dir
    rev_loc=$( svn info $dir | awk '(NR == 5) {print $NF}' )
    (( ${rev_loc} >= $rev )) && rev=${rev_loc}
     done
 
-    echo 'NEMO '$rev >> model.log
-    sed -n 6p model.log | sed 'i\NEMOGCM rev.' | tee mesg_02_nemo_${CFG_USER}_${CFG_ARCH}.txt
+    echo 'NEMOGCM '$rev >> model.log
+    sed -n 2p model.log | sed 'i\NEMO rev.' > mesg_02_nemogcm_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -139 +135 @@
 
 pstep() {
+    STEP=$1
+    export STEP
     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 -
+    if [ "$STATUS" == 'FAILED' ]; then
+   touch mesg_08_inputfiles_${CFG_USER}_${CFG_ARCH}.txt mesg_09_realcputime_${CFG_USER}_${CFG_ARCH}.txt \
+         mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt
+   tar -czf ${REFE_DIR}/trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.tar.gz *
     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
+    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