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

Timestamp:

2015-06-19T18:39:39+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

@@ -3 +3 @@
 
 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
+    [ -e ocean.output ] && grep $1 ocean.output
+    printf "Comments\n$line\n" | tee 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_09_realcputime_${CFG_USER}_${CFG_ARCH}.txt
+    real_cpu_time=$( ${JOB_VIEW} ${JOB_ID} | awk 'END{print $9}' )
+    printf "Real CPU time\n${real_cpu_time}\n" | tee mesg_09_realcputime_${CFG_USER}_${CFG_ARCH}.txt
+}
+
+diff_arch() {
+    diff env.log ${REFE_DIR}/env.log
 }
 
@@ -21 +25 @@
     done
 
-    printf "Input files\n$mesg" | tee mesg_08_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
+    printf "Input files\n$mesg\n" | tee mesg_08_inputfiles_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -62 +66 @@
    [ -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
+   echo $rel ${arch_rel} >> env.log
     done
 
-    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
+    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
 }
 
@@ -88 +92 @@
    # For time being, just get revision number from XIOS
    if [ $dir == ${DIR_XIOS} ]; then
-       echo 'XIOS '$( svn info $dir | awk '(NR == 9) {print $NF}' ) >> model.log
+       echo 'XIOS '$( svn info $dir | awk '(NR == 9) {print $NF}' ) >> env.log
        continue
    fi
@@ -97 +101 @@
     done
 
-    echo 'NEMOGCM '$rev >> model.log
-    sed -n 2p model.log | sed 'i\NEMO rev.' > mesg_02_nemogcm_${CFG_USER}_${CFG_ARCH}.txt
+    printf "NEMOGCM rev.\n$rev\n" > mesg_02_nemogcm_${CFG_USER}_${CFG_ARCH}.txt
 }
 
@@ -134 +137 @@
 }
 
-pstep() {
+print_step() {
     STEP=$1
     export STEP