Changeset 9221 for branches/2017/dev_merge_2017

Timestamp:

2018-01-12T18:42:42+01:00 (6 years ago)

Author:

mathiot

Message:

add extra print in sette_rpt to detect missing config validation directory

Location:

branches/2017/dev_merge_2017/NEMOGCM/SETTE

Files:

• new_sette_rpt.sh (modified) (9 diffs)
• sette_rpt.sh (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/SETTE/new_sette_rpt.sh

@@ -106 +106 @@
     dorv=`echo $dorv | sed -e 's:.*/::'`
     f1o=$vdir/$nam/$mach/$dorv/LONG/ocean.output
-    f1s=$vdir/$nam/$mach/$dorv/LONG/solver.stat
+    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat
     f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat
     f2o=$vdir/$nam/$mach/$dorv/SHORT/ocean.output
-    f2s=$vdir/$nam/$mach/$dorv/SHORT/solver.stat
+    f2s=$vdir/$nam/$mach/$dorv/SHORT/run.stat
     f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat
 
@@ -129 +129 @@
       if [ $? == 0 ]; then
         if [ $pass == 0 ]; then 
-          printf "%-20s %s %s\n" $nam  " solver.stat restartability  passed : " $dorv
+          printf "%-20s %s %s\n" $nam  " run.stat restartability  passed : " $dorv
         fi
       else
-        printf "%-20s %s %s\n" $nam  " solver.stat restartability  FAILED : " $dorv 
+        printf "%-20s %s %s\n" $nam  " run.stat restartability  FAILED : " $dorv 
 #
 # Offer view of differences on the second pass
 #
         if [ $pass == 1 ]; then
-          echo "<return> to view solver.stat differences"
+          echo "<return> to view run.stat differences"
           read y
           sdiff f1.tmp$$ $f2s
@@ -183 +183 @@
     fi
     rm f1.tmp$$
+  else
+    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv
   fi
 }
@@ -200 +202 @@
     rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -1l`
     f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output
-    f1s=$vdir/$nam/$mach/$dorv/$rep1/solver.stat
+    f1s=$vdir/$nam/$mach/$dorv/$rep1/run.stat
     f1t=$vdir/$nam/$mach/$dorv/$rep1/tracer.stat
     f2o=$vdir/$nam/$mach/$dorv/$rep2/ocean.output
-    f2s=$vdir/$nam/$mach/$dorv/$rep2/solver.stat
+    f2s=$vdir/$nam/$mach/$dorv/$rep2/run.stat
     f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat
 
@@ -221 +223 @@
       if [ $? == 0 ]; then 
         if [ $pass == 0 ]; then  
-          printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv
+          printf "%-20s %s %s\n" $nam  " run.stat reproducibility passed : " $dorv
         fi
       else
-        printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv
+        printf "%-20s %s %s\n" $nam  " run.stat reproducibility FAILED : " $dorv
 #
 # Offer view of differences on the second pass
 #
         if [ $pass == 1 ]; then
-          echo "<return> to view solver.stat differences"
+          echo "<return> to view run.stat differences"
           read y
           sdiff f1.tmp$$ $f2s
@@ -271 +273 @@
       fi
     fi
+  else
+    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv 
   fi
 }
@@ -277 +281 @@
 #
 #  checks AGRIF does not corrupe results with no AGRIF zoom. Expects ORCA2AGUL/AGRIFNOZ and ORCA2AGUL_NAGR/AGRIFNO  run directories
-# Compares solver.stat files for each
+# Compares run.stat files for each
 #
   vdir=$1
@@ -292 +296 @@
     rep1=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -2l | head -1 `
     rep2=`ls -1rt $vdir/$dir2/$mach/$dorv2/ |  tail -1l`
-    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/solver.stat
-    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/solver.stat
+    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/run.stat
+    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/run.stat
 
     if  [ ! -f $f1s ] && [ ! -f $f2s ] ; then 
@@ -306 +310 @@
       if [ $? == 0 ]; then
         if [ $pass == 0 ]; then 
-          printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: solver.stat unchanged - test  passed : " $dorv1 $dorv2
+          printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: run.stat unchanged - test  passed : " $dorv1 $dorv2
         fi
       else
-        printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, solver.stat test FAILED : " $dorv1 $dorv2
+        printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, run.stat test FAILED : " $dorv1 $dorv2
 #
 # Offer view of differences on the second pass
 #
         if [ $pass == 1 ]; then
-          echo "<return> to view solver.stat differences"
+          echo "<return> to view run.stat differences"
           read y
           sdiff $f1s $f2s

branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

@@ -184 +184 @@
     fi
     rm f1.tmp$$
+  else
+    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv
   fi
 }
@@ -273 +275 @@
       fi
     fi
+  else
+    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv
   fi
 }