Changeset 5934 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc

Timestamp:

2015-11-26T21:22:57+01:00 (8 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS18_TRUST Last commits before merging to trunk

File:

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

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

@@ -78 +78 @@
     local soft_rel str
 
+    ## Sourcing environment
     if [ -n "${TRUS_ENVI}" ]; then
-        ## Sourcing environment modulefile (.env) only if module function is set
    if [[  -e ${TRUS_ENVI}.env && $( declare -F | grep ' module' ) ]]; then
+            ## .env file if module function is available
        . ${TRUS_ENVI}.env
    else
+            ## .path file if existing, if not the given file
        [ -e ${TRUS_ENVI}.path ] && . ${TRUS_ENVI}.path || . ${TRUS_ENVI}
    fi
     fi
 
-    ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter on LDFLAGS variables
+    ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter
     [ $TRUS_HPCC == 'X64_ADA' ] && WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS}
 
@@ -195 +197 @@
 diff_restart() {
     local base_name comp dif file list_comp list_tmsp nb_dom time_step tmsp
-    local files_list='' dift=0
+    local files_list='' dif_sum=0
 
     ## Stop if no benchmark files (ie time.step)
@@ -204 +206 @@
     if [ $( find -regex ".*_restart.*[0-9]\.nc" -print -quit ) ]; then
    base_name=$( find -regex ".*_restart.*[0-9]\.nc"                       \
-                | sed "s#^\./\(.*\)_[0-9]*_restart.*#\1#"       | sort -u  )
+                | sed "s#^\./\(.*\)_[0-9]*_restart.*#\1#"       | sort -u   )
    list_comp=$( find -regex ".*_restart.*[0-9]\.nc"                       \
-                | sed "s#^.*\(restart[a-z_]*\)_[0-9].*\.nc#\1#" | sort -u  )
+                | sed "s#^.*\(restart[a-z_]*\)_[0-9].*\.nc#\1#" | sort -u   )
    list_tmsp=$( find -regex ".*_restart.*[0-9]\.nc"                       \
-                | sed "s#^.*\([0-9]\{8\}\)_restart.*#\1#"       | sort -u  )
+                | sed "s#^.*\([0-9]\{8\}\)_restart.*#\1#"       | sort -u   )
 
    ## Loop on each time step
@@ -220 +222 @@
           ${TRUS_NGCM}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} \
          > /dev/null
+
+           ## Possibility of remaining decomposed restarts (even after rebuild)
+          [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc \
+                        > /dev/null
+
       elif [ ${nb_dom} -eq 0 ]; then
           TRUS_RSLT='FAILED' && get_out 8
@@ -253 +260 @@
    done
 
-        ## List different files for web comment with sum of different parameters
+        ## List different files for web comment with sum of different records
    if [ ${dif_sum} -ne 0 ]; then
        echo 'Restarts: '${files_list}${dif_sum}' record(s) differ<br>' \