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

Timestamp:

2015-07-02T10:52:12+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Bugfixes

File:

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

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

@@ -44 +44 @@
     echo 'Last time step of standard run: '${LAST_TIME_STEP}
 
-    if [ $( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit ) ]; then
-   base_name=$( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit | awk -F/ '{print $NF}' \
-                | sed "s/^\(.*\)$LAST_TIME_STEP\_restart.*/\1$LAST_TIME_STEP\_/"                  )
+#    if [ $( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit ) ]; then
+    if [ $( find -regex ".*_0+${LAST_TIME_STEP}_restart.*\.nc" -print -quit ) ]; then
+#  base_name=$( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit | awk -F/ '{print $NF}' \
+#               | sed "s/^\(.*\)$LAST_TIME_STEP\_restart.*/\1$LAST_TIME_STEP\_/"                  )
+   base_name=$( find -regex ".*_0+${LAST_TIME_STEP}_restart.*\.nc" -print -quit | awk -F/ '{print $NF}' \
+                | sed "s/^\(.*\)$LAST_TIME_STEP\_restart.*/\1$LAST_TIME_STEP\_/"                         )
 
    for comp in restart restart_ice restart_trc; do
@@ -53 +56 @@
        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
-      [ $? -eq 0 ] && rm -f ${base_name}_${comp}_[0-9]*.nc > /dev/null
+      ${NEMO_TRBD}/rebuild_nemo -t $NPROC $file ${nb_dom} > /dev/null
+      [ $? -eq 0 ] && rm -f ${base_name}${comp}_[0-9]*.nc > /dev/null
        elif [ ${nb_dom} -eq 0 ]; then
       export ST='FAILED' && get_out 10
@@ -61 +64 @@
        if [ -e ${REFE_DIR}/$file.nc ]; then
        # UNIX `cmp` not suitable (filename & timestamp in .nc file)
-      nc_diff=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null | tail -1 )
-
-      if [ ! -z "${nc_diff}" ]; then
+      nc_diff=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null \
+                 | awk '/records/ {print $1}'                           )
+
+      if [ ${nc_diff} -ne 0 ]; then
           export ST='FAILED'
           printf "$CDO ${nc_diff}\n"