Changeset 8852

Timestamp:

2017-11-30T09:52:36+01:00 (7 years ago)

Author:

clevy

Message:

improve SETTE report reliability , ticket #1983

Location:

trunk/NEMOGCM/SETTE

Files:

• new_sette.sh (modified) (1 diff)
• new_sette_rpt.sh (modified) (3 diffs)

trunk/NEMOGCM/SETTE/new_sette.sh

@@ -143 +143 @@
 # ORCA2AGR          :  9 & 10  AGRIF active with no zoom, compared to no AGRIF cpp key
 
-#for config in 1 2 3 4 5 6 7 8 9 10
-for config in 9 10
+for config in 1 2 3 4 5 6 7 8 9 10
 do
 

trunk/NEMOGCM/SETTE/new_sette_rpt.sh

@@ -42 +42 @@
     cp SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/LONG/.
     cp ../SHORT/SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/SHORT/.
-
     f1o=$vdir/$nam/$mach/$dorv/LONG/SAS_00000240_restart_ice.nc
     f2o=$vdir/$nam/$mach/$dorv/SHORT/SAS_00000240_restart_ice.nc
@@ -54 +53 @@
   if  [  -f $f1o ] && [  -f $f2o ]; then
 ## Compare the two netcdf files
-    cdo diffn $f1o $f2o \
-            > cdo_diff.out 2> /dev/null
-## echo cdo_diff.out
+    cdo diffn $f1o $f2o > cdo_diff.out 2> /dev/null
 ## 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 )
-    
-       if [ -n "$dif" ]; then
-                difi=`echo $dif | cut -c -1`
-        fi  
-   \rm cdo_diff.out 
-
-     if [ $difi == 0 ]; then  
-        if [ $pass == 0 ]; then
-          printf "%-20s %s %s\n" $nam  " SAS restart files are IDENTICAL :  passed : " $dorv
-        fi
-      else
-        printf "%-20s %s %s\n" $nam  " SAS restart files are DIFFERENT : FAILED : " $dorv 
+# 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`
+    fi
+    \rm cdo_diff.out 
+
+    if [ $difi == 0 ]; then   
+       if [ $pass == 0 ]; then
+         printf "%-20s %s %s\n" $nam  " ice restart files are IDENTICAL :  passed : " $dorv
+       fi
+    else
+       printf "%-20s %s %s\n" $nam  " ice restart files are DIFFERENT : FAILED : " $dorv 
         #
    # Offer view of differences on the second pass
@@ -83 +80 @@
           #read y
         fi
-      fi
-    fi
+    fi
+  else
+      printf "%-20s %s\n" $nam " incomplete test";
+      return;
+  fi
 #
 fi