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

Timestamp:

2015-08-05T15:50:17+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Correct last config rename

File:

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

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

@@ -163 +163 @@
     echo 'Last time step of standard run: '${TIME_STEP}
 
-    if [ $( find -regex ".*_0+${TIME_STEP}_restart.*\.nc" -print -quit ) ]; then
-   base_name=$( find -regex ".*_0+${TIME_STEP}_restart.*\.nc" -print -quit | awk -F/ '{print $NF}' \
-                | sed "s/^\(.*\)$TIME_STEP\_restart.*/\1$TIME_STEP\_/"                              )
+    if [ $( find -regex ".*_0+$TIME_STEP_restart.*\.nc" -print -quit ) ]; then
+   base_name=$( find -regex ".*_0+$TIME_STEP_restart.*\.nc" -print -quit  \
+                | cut -d/ -f2 | sed "s/^\(.*$TIME_STEP\)\_restart.*/\1\_/" )
 
    for comp in restart restart_ice restart_trc; do
        file=${base_name}${comp}
 
-       nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{print $1}' )
+       nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{ print $1 }' )
        if   [ ${nb_dom} -gt 1 ]; then
       ${NEMO_TRBD}/rebuild_nemo -t $NPROC $file ${nb_dom} > /dev/null
@@ -180 +180 @@
        if [ -e ${REFE_DIR}/$file.nc ]; then
        ## UNIX `cmp` not suitable (filename & timestamp in .nc file)
-      diff_rcd=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null               \
-                  | awk '/records/ {print $0}' | sed 's/differ$/differ,/' | tr -d '\n'  )
-
-      if [[ ! -z ${diff_rcd} && $( echo ${diff_rcd} | awk '{print $1}') -ne 0 ]]; then
+      diff_rcd=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null      \
+                  | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n'  )
+
+      if [[ ! -z ${diff_rcd} && $( echo ${diff_rcd} | awk '{ print $1 }') -ne 0 ]]; then
           export ST='FAILED'
           files_list+=$file' '