Changeset 8864

Timestamp:

2017-11-30T18:42:43+01:00 (7 years ago)

Author:

lovato

Message:

trunk : fix test report for SAS, print to screen branchname and revision tag (#1983)

File:

• trunk/NEMOGCM/SETTE/new_sette_rpt.sh (modified) (4 diffs)

trunk/NEMOGCM/SETTE/new_sette_rpt.sh

@@ -54 +54 @@
 ## Compare the two netcdf files
     cdo diffn $f1o $f2o > cdo_diff.out 2> /dev/null
+## Identical if cdo_diff.out exists but has zero size
+    if [ ! -s cdo_diff.out ]; then
+       difi=0
+    else
 ## Identical if first character of $dif ==0
-    [ ! -s cdo_diff.out ] && continue
-    dif=$( grep -om1 '[0-9]* of [0-9]* records differ' cdo_diff.out )
+       dif=$( grep -om1 '[0-9]* of [0-9]* records differ' cdo_diff.out )
 # difi contains the first character of summary of cdo dif. if = 0, then 0 record differ between the 2 files    
-    if [ -n "$dif" ]; then
-        difi=`echo $dif | cut -c -1`
+       if [ -n "$dif" ]; then
+           difi=`echo $dif | cut -c -1`
+       fi
     fi
     \rm cdo_diff.out 
@@ -65 +69 @@
     if [ $difi == 0 ]; then   
        if [ $pass == 0 ]; then
-         printf "%-20s %s %s\n" $nam  " ice restart files are IDENTICAL :  passed : " $dorv
+         printf "%-20s %s %s\n" $nam  " ice restarts are IDENTICAL  passed : " $dorv
        fi
     else
-       printf "%-20s %s %s\n" $nam  " ice restart files are DIFFERENT : FAILED : " $dorv 
+       printf "%-20s %s %s\n" $nam  " ice restarts are DIFFERENT  FAILED : " $dorv 
         #
    # Offer view of differences on the second pass
@@ -329 +333 @@
 #########################################################################################
 #
-  mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'`
+  mach=`grep "COMPILER=" ./new_sette.sh | sed -e 's/COMPILER=//'`
   NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'`
 # Directory to run the tests
@@ -346 +350 @@
   fi
 #
-
+# Show current revision tag and branch name
+#
+cmd="svn"
+[ ! -d "$SETTE_DIR/.svn" ] && cmd="git $cmd"
+revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '`
+branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev`
+echo "SETTE validation report : $branchname @ r$revision"
+#
 # The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory
 #