Changeset 12289 for utils/CI/sette_ticket2304/all_functions.sh

Timestamp:

2019-12-30T16:31:18+01:00 (4 years ago)

Author:

mathiot

Message:

as suggested by Simon, instead of stopping sette if namelist group is missing, we now add it at the end of the namelist + rm useless line in sette_list_avail_rev.sh + add syncronisation of MY_SRC, namelist_cfg, xml, cppkey files between REF and _ST (ticket #2304)

File:

• utils/CI/sette_ticket2304/all_functions.sh (modified) (2 diffs)

utils/CI/sette_ticket2304/all_functions.sh

@@ -90 +90 @@
 usage=" Usage : set_namelist input_namelist variable_name value"
 usage=" if value is a string ths is neede syntax : ./set_namelist namelist_name var_name \"new_value\" "
+
+# sync MYSRC files
+sync_mysrc() {
+lREF=cfgs/$1    # reference 
+lCFG=cfgs/$2    # target
+if [ -d $lREF/MY_SRC ] ; then
+   cp $lREF/MY_SRC/* $lCFG/MY_SRC/*
+fi
+}
+
+# sync namelist files and xios related files
+sync_expcfg() {
+set -x
+lREF=cfgs/$1
+lCFG=cfgs/$2
+if [ -d $lREF/EXPREF ] ; then
+   cp $lREF/EXPREF/*namelist*_cfg  $lCFG/EXP00/.
+   cp $lREF/EXPREF/iodef.xml       $lCFG/EXP00/.
+   cp $lREF/EXPREF/context_*.xml   $lCFG/EXP00/.
+   cp $lREF/EXPREF/file_def_*.xml  $lCFG/EXP00/.
+fi
+set +x
+}
+
+# sync cppkey file
+sync_cppcfg() {
+lREF=cfgs/$1
+lCFG=cfgs/$2
+if [ -f $lREF/cpp_$1.fcm ] ; then
+   cp $lREF/cpp_$1.fcm $lCFG/cpp_$2.fcm
+fi
+}
 
 # define validation dir
@@ -156 +188 @@
                 LINEVAR=$( grep -s -n "$VAR_NAME" ${EXE_DIR}/$NAMREF | awk -F: '{ { print $1} }' )
                 echo " $VAR_NAME found in ${EXE_DIR}/$NAMREF at line $LINEVAR " >> ${SETTE_DIR}/output.sette
+
 #   search for namelist group name
                 NAMGRP=$( head -n$LINEVAR ${EXE_DIR}/$NAMREF | grep --line-buffered "^&nam" | tail -1 | awk -F" " '{ { print $1} }' ) 
                 echo " variable $VAR_NAME will be added in $NAMGRP namelist-group of namelist file ${EXE_DIR}/$1 " >> ${SETTE_DIR}/output.sette
+
+# check if namelist group present in namelist_cfg
+# if missing group is added at the end of namelist_cfg
+                NGRP=$(grep ${NAMGRP} ${EXE_DIR}/$1 | wc -l )
+                if [ ${NGRP} -eq 0 ]; then
+                   echo ''
+                   echo "+++++ Group ${NAMGRP} containing ${2} is missing in ${EXE_DIR}/$1 +++++ "      
+                   echo "+++++ Group ${NAMGRP}                 is added   in ${EXE_DIR}/$1 +++++ "      
+                   echo ''
+                   echo "&${NAMGRP}" >> ${EXE_DIR}/$1
+                   echo "/"          >> ${EXE_DIR}/$1
+                fi
+
 # Add $VARNAME in namelist file ${EXE_DIR}/$1 in namelist group $NAMGRP
 # on mac osx, replace sed --posix by gsed (available with mac port)
                 sed --posix "/${NAMGRP} /a\ ${VAR_NAME} " ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp || gsed --posix "/${NAMGRP} /a\ ${VAR_NAME} " ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp
+
 # if file not empty replace ${EXE_DIR}/$1
-                # check if namelist group present in namelist_cfg
-                NGRP=$(grep ${NAMGRP} ${EXE_DIR}/$1 | wc -l )
-                if [ ${NGRP} -eq 0 ]; then
-                   echo ''
-                   echo "+++++ Cannot update ${2} because group ${NAMGRP} is missing in ${EXE_DIR}/$1  +++++ "      
-                   echo ''
-                   exit 42
-                fi
-                if [ -s ${EXE_DIR}/$1.tmp ] ; then
+               if [ -s ${EXE_DIR}/$1.tmp ] ; then
                    mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 
                 else