Changeset 14874 for utils/CI

Timestamp:

2021-05-17T21:03:23+02:00 (3 years ago)

Author:

acc

Message:

Branch: sette_ticket2673. Fix a bug in sette_rpt.sh and add an option to over-ride the reference revision number. See #2673

File:

• utils/CI/sette_ticket2673/sette_rpt.sh (modified) (7 diffs)

utils/CI/sette_ticket2673/sette_rpt.sh

@@ -257 +257 @@
 #
 # check if reference directory is present
-  if [ ! -d $vdirref/$mach/$dorv/$nam ]; then
+  if [ ! -d $vdirref/$mach/$dorvref/$nam ]; then
     printf "%-27s %s\n" $nam " REFERENCE directory at $dorvref is MISSING"
     return
@@ -270 +270 @@
     f1s=$vdir/$mach/$dorv/$nam/LONG/run.stat
     f1t=$vdir/$mach/$dorv/$nam/LONG/tracer.stat
-    f2s=$vdirref/$mach/$dorv/$nam/LONG/run.stat
-    f2t=$vdirref/$mach/$dorv/$nam/LONG/tracer.stat
+    f2s=$vdirref/$mach/$dorvref/$nam/LONG/run.stat
+    f2t=$vdirref/$mach/$dorvref/$nam/LONG/tracer.stat
     if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then
       printf "%-20s %s\n" $nam " incomplete test";
@@ -343 +343 @@
 #
 # check if reference directory is present
-  if [ ! -d $vdirref/$mach/$dorv/$nam ]; then
+  if [ ! -d $vdirref/$mach/$dorvref/$nam ]; then
     return
   fi
@@ -353 +353 @@
   if [ -d $vdir/$mach/$dorv/$nam ]; then
     f1a=$vdir/$mach/$dorv/$nam/LONG/timing.output
-    f2a=$vdirref/$mach/$dorv/$nam/LONG/timing.output
+    f2a=$vdirref/$mach/$dorvref/$nam/LONG/timing.output
 #
 # Report average CPU time differences (if available)
@@ -472 +472 @@
 # overwrite revision (later) or compiler
   if [ $# -gt 0 ]; then
-    while getopts r:c:v:h option; do 
+    while getopts r:R:c:v:h option; do 
        case $option in
           c) mach=$OPTARG;;
           r) rev=$OPTARG;;
+          R) refrev=$OPTARG;;
           v) SETTE_SUB_VAL=$OPTARG;;
           h | *) echo ''
@@ -484 +485 @@
                  echo ' -r REVISION_number :'
                  echo '     display sette results for the specified revision (set old for the latest revision available for each config)'
+                 echo ' -R REFERENCE REVISION_number :'
+                 echo '     compare sette results against the specified reference revision (use to over-ride value set in param.cfg)'
                  echo ' -v sub_dir :'
                  echo '     validation sub-directory below NEMO_VALIDATION_DIR'
@@ -510 +513 @@
   NEMO_VALID=${NEMO_VALIDATION_DIR}
   NEMO_VALID_REF=${NEMO_VALIDATION_REF}
+  if [ ! -z $refrev ] ; then
+    NEMO_REV_REF=${refrev}
+  fi
 #
   if [ ! -d $NEMO_VALID ]; then