Changeset 14887

Timestamp:

2021-05-19T13:42:44+02:00 (3 years ago)

Author:

acc

Message:

Branch: sette_ticket2673. Introduced a default, MAIN subdirectory which is used if no sub-directory is specified. This keeps a tidier structure below NEMO_VALIDATION_DIR (and equivalent REF). sette_rpt.sh now accepts a -V sub_dir2 option to name a 2nd subdirectory below NEMO_VALIDATION_DIR to compare against the -v sub_dir. Introduced a sette_use_LITE.sh utility to switch between input datasets

Location:

utils/CI/sette_ticket2673

Files:

• sette.sh (modified) (2 diffs)
• sette_rpt.sh (modified) (4 diffs)
• sette_use_LITE.sh (added)

utils/CI/sette_ticket2673/sette.sh

@@ -29 +29 @@
 export USING_MPMD='yes'        # Default: yes => run with detached XIOS servers ; use -A to run in attached (SPMD) mode
                                #    Note: yes also ensures key_xios but -A will not remove it
-export SETTE_SUB_VAL=""
+export SETTE_SUB_VAL="MAIN"    # Default subdirectory below NEMO_VALIDATION_DIR
 
 # Parse command-line arguments
@@ -182 +182 @@
  fi
 fi
-if [ ! -z $SETTE_SUB_VAL ] ; then
- if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] && [ ${dry_run} -eq 0 ] ; then
-    mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
- fi
- export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
-fi
+if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] && [ ${dry_run} -eq 0 ] ; then
+   mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
+fi
+export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
 
 if [ ${#SETTE_TEST_CONFIGS[@]} -eq 0 ]; then

utils/CI/sette_ticket2673/sette_rpt.sh

@@ -472 +472 @@
 # overwrite revision (later) or compiler
   if [ $# -gt 0 ]; then
-    while getopts r:R:c:v:h option; do 
+    while getopts r:R:c:v:V:h option; do 
        case $option in
           c) mach=$OPTARG;;
@@ -478 +478 @@
           R) refrev=$OPTARG;;
           v) SETTE_SUB_VAL=$OPTARG;;
+          V) SETTE_SUB_VAL2=$OPTARG
+             if [ -d ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} ] ; then
+               export NEMO_VALIDATION_REF=${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2}
+             else
+               echo "Requested comparison subdirectory: ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} does not exist"
+             fi
+             ;;
           h | *) echo ''
                  echo 'sette_rpt.sh : ' 
@@ -486 +493 @@
                  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 '     compare sette results against the specified revision (use to over-ride value set in param.cfg)'
                  echo ' -v sub_dir :'
                  echo '     validation sub-directory below NEMO_VALIDATION_DIR'
+                 echo ' -V sub_dir2 :'
+                 echo '     2nd validation sub-directory below NEMO_VALIDATION_DIR'
+                 echo '     if set the comparison is between two subdirectory trees beneath NEMO_VALIDATION_DIR'
                  echo ''
                  exit 42;;
@@ -500 +510 @@
   if [ ! -z $SETTE_SUB_VAL ] ; then
    export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
-   if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] ; then
+   if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] && [ -z $SETTE_SUB_VAL2 ] ; then
     while true; do
         read -p "$NEMO_VALIDATION_REF/$SETTE_SUB_VAL exists. Do you wish to use it as a reference? " yn
         case $yn in
             [Yy]* ) export $NEMO_VALIDATION_REF/$SETTE_SUB_VAL; break;;
-            [Nn]* ) exit;;
+            [Nn]* ) echo "Ok, continuing with ${NEMO_VALIDATION_REF}/MAIN as the reference directory"
+                    export NEMO_VALIDATION_REF=${NEMO_VALIDATION_REF}/MAIN
+                    break
+                    ;;
             * ) echo "Please answer yes or no.";;
         esac
     done
    fi
+  else
+   export NEMO_VALIDATION_DIR=${NEMO_VALIDATION_DIR}/MAIN
+   export ${NEMO_VALIDATION_REF}/MAIN
   fi
   NEMO_VALID=${NEMO_VALIDATION_DIR}