Changeset 14870 for utils/CI/sette_ticket2673/sette_list_avail_rev.sh

Timestamp:

2021-05-16T16:54:58+02:00 (3 years ago)

Author:

acc

Message:

Branch: sette_ticket2673. More tweaks. Added a few more features and aligned the utility scripts with the new directory structure. Each experiment directory in the NEMO_VALIDATION_DIR now gets a sette_config file recording the settings used to run the test. They now also get copies of the *namelist*_cfg files which can be useful for cross-checking. sette_list_avail_rev.sh now accepts the -v subdir option.

File:

• utils/CI/sette_ticket2673/sette_list_avail_rev.sh (modified) (6 diffs)

utils/CI/sette_ticket2673/sette_list_avail_rev.sh

@@ -8 +8 @@
 
 if [ $# -gt 0 ]; then
-  while getopts c:h option; do 
+  while getopts c:v:h option; do 
      case $option in
         c) COMPILER=$OPTARG;;
+        v) SETTE_SUB_VAL=$OPTARG;;
         h | *) echo ''
                echo 'sette_list_avail_rev.sh : ' 
@@ -16 +17 @@
                echo '-c COMPILER_name :'
                echo '     list all sette directory and available revisions created with the compiler specified'
+               echo ' -v sub_dir :'
+               echo '     validation sub-directory below NEMO_VALIDATION_DIR'
                echo ''
                exit 42;;
@@ -22 +25 @@
   shift $((OPTIND - 1))
 fi
+if [ ! -z $SETTE_SUB_VAL ] ; then
+ NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL
+fi
 
 #
 lst_rev () {
     # get the list of revision available for a configuration
-    if [ ! -d $1 ] ; then 
-       CFGLST=-9999
-    else
-       CFGLST=`ls $1 | sort -u -r ` 
-    fi
+    # base directory
+    VALSUB=$1
     # config name
     CONFIG=$2
     # list of all revision available
     ALLLST=${@:3}
-    # number of revision total and for CONFIG
-    nrevall=`echo $ALLLST | wc -w`
-    nrevcfg=`echo $CFGLST | wc -w`
     # display
     echo ""
     printf "%-27s : " $CONFIG
-    irev=1
-    irevcfg=1
-    while [[ $irev -le $nrevall ]] ; do
-       rev=`echo $ALLLST | cut -d\  -f ${irev}`
-       cfgrev=`echo $CFGLST | cut -d\  -f ${irevcfg}`
-       if [ -z $cfgrev ] ; then cfgrev=-9999 ; fi
-       if [ $cfgrev == $rev ] ; then
+    for rev in $ALLLST
+    do
+       if [ -d ${VALSUB}/$rev/${CONFIG} ]  ; then
           printf "%-6s  " $rev
-          irevcfg=$((irevcfg+1))
        else
-          printf "%-5s  " "***** " 
+          printf "%-5s  " "----- " 
        fi
-       irev=$((irev+1))
     done
 }
@@ -61 +55 @@
  
  # list of all revision available
- DIRLST=`find ${NEMO_VALID} -maxdepth 3 -mindepth 3 -type d -regex ".*\/W.*\/${COMPILER}\/.*" | sed -e "s/.*\/W.*\/${COMPILER}\///" | sort -u -r`
+ DIRLIST=`find ${NEMO_VALID}/${COMPILER} -maxdepth 1 -mindepth 1 -type d | sort -u -r`
+ DIRLIST=`basename -a $DIRLIST`
 
  # display header
@@ -68 +63 @@
  echo ""
  printf " List of all avail. rev. is : "
- for dir in `echo $DIRLST`; do printf "%-6s  " $dir ; done
+ for dir in `echo $DIRLIST`; do printf "%-6s  " $dir ; done
  printf "\n"
 
@@ -74 +69 @@
  echo ""
  echo "   !---- check revision available for each configuration ----!   "
- for CONFIG in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WICE_AGRIF_ST 
+ for CONFIG in GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE AGRIF_DEMO SWG ISOMIP+ OVERFLOW LOCK_EXCHANGE VORTEX ICE_AGRIF 
  do
-    DIR=${NEMO_VALIDATION_DIR}/${CONFIG}/${COMPILER}
-    lst_rev $DIR $CONFIG $DIRLST
+    DIR=${NEMO_VALIDATION_DIR}/${COMPILER}/
+    lst_rev $DIR $CONFIG $DIRLIST
  done
  printf "\n"