Ignore:
Timestamp:
2016-04-20T11:33:10+02:00 (5 years ago)
Author:
davestorkey
Message:

Changes from nemo_v3_6_STABLE_copy branch.
Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6237 cf. r5781 of /branches/UKMO/nemo_v3_6_STABLE_copy/NEMOGCM@6486

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/SETTE/all_functions.sh

    r6486 r6487  
    286286        echo "################" >> ${SETTE_DIR}/output.sette 
    287287 
     288        inxml=$1 
    288289        VAR_NAME=$( grep "^.*<.*file_definition.*type.*=" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 
    289290        if [ ${#VAR_NAME} -eq 0 ] 
    290291        then 
     292# This may have failed because the job is using XIOS_2.0 conventions and the file descriptions have moved to file_def.xml 
     293# Check again in case this is the case 
     294          VAR_NAME=$( grep "^.*<.*file_definition.*type.*=" ${EXE_DIR}/file_def.xml | sed -e "s% *\!.*%%" ) 
     295          inxml="file_def.xml" 
     296          if [ ${#VAR_NAME} -eq 0 ] 
     297          then 
    291298                echo "doing \"set_xio_file_type $@\". " 
    292299                echo "xml_tag: file_definition with variable: type is empty" 
    293                 echo "confirm that an appropriate file_definition is in \"${EXE_DIR}/$1\" " 
     300                echo "confirm that an appropriate file_definition is in \"${EXE_DIR}/$1\" or file_def.xml" 
    294301                echo "exit" 
    295302                echo "error in executing script : set_xio_file_type $@" >> ${SETTE_DIR}/output.sette 
    296303                echo "....." >> ${SETTE_DIR}/output.sette 
    297304                exit 1 
     305          fi 
    298306        fi 
    299307        if [ $2 == "one_file" ]  
    300308        then 
    301            sed -e "s:multiple_file:one_file:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
     309           sed -e "s:multiple_file:one_file:" ${EXE_DIR}/$inxml > ${EXE_DIR}/$inxml.tmp 
    302310        else 
    303            sed -e "s:one_file:multiple_file:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
    304         fi 
    305         mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 
     311           sed -e "s:one_file:multiple_file:" ${EXE_DIR}/$inxml > ${EXE_DIR}/$inxml.tmp 
     312        fi 
     313        mv ${EXE_DIR}/$inxml.tmp ${EXE_DIR}/$inxml 
    306314 
    307315        echo "finished script : set_xio_file_type $@" >> ${SETTE_DIR}/output.sette 
     
    336344        if [ ${#VAR_NAME} -eq 0 ] 
    337345        then 
     346# This may have failed because the iodef file is using XIOS_2.0 syntax where "boolean" has reduced to "bool" 
     347# Check again in case this is the case 
     348          VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*bool" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 
     349           if [ ${#VAR_NAME} -eq 0 ] 
     350           then 
    338351                echo "doing \"set_xio_using_server $@\". " 
    339                 echo "xml_tag: "variable id=using_server" with variable: boolean is empty" 
     352                echo "xml_tag: "variable id=using_server" with either variable: boolean or bool is empty" 
    340353                echo "confirm that an appropriate variable id is in \"${EXE_DIR}/$1\" " 
    341354                echo "exit" 
     
    343356                echo "....." >> ${SETTE_DIR}/output.sette 
    344357                exit 1 
     358           fi 
    345359        fi 
    346360        if [ $2 == "false" ] 
Note: See TracChangeset for help on using the changeset viewer.