Changeset 14869


Ignore:
Timestamp:
2021-05-16T12:41:50+02:00 (5 months ago)
Author:
acc
Message:

Branch: sette_ticket2673. Added missing export for NEMO_VALID. Also tidied up scripts with new set_namelist_opt function and adapting set_xio_using_server function to accept yes/no as well as true/false

Location:
utils/CI/sette_ticket2673
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette_ticket2673/all_functions.sh

    r14867 r14869  
    184184    fi 
    185185    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfgs,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 
    186     #NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
    187     NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF/%_ST//}/${TEST_NAME} 
     186    export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF/%_ST/}/${TEST_NAME} 
    188187} 
    189188 
     
    199198} 
    200199 
    201 # function to set namelists parameters 
     200# set_namelist_opt: function to set namelists parameters based on a yes/no selection 
     201# Mandatory arguments are, in order: 
     202# 1. namelist to be edited 
     203# 2. variable to be set 
     204# 3. yes or no switch setting 
     205# 4. value to set variable to if switch is yes 
     206# 5. value to set variable to if switch is no 
     207set_namelist_opt () { 
     208   minargcount=5 
     209   if [ ${#} -lt ${minargcount} ] 
     210   then 
     211      echo "not enough arguments for set_namelist_opt" >> ${SETTE_DIR}/output.sette 
     212      echo "Usage: set_namelist_opt namelist varname yes_or_no value_if_yes value_if_no" >> ${SETTE_DIR}/output.sette 
     213      exit 1 
     214   fi 
     215   unset minargcount 
     216        if [ $3 != 'yes' ] && [ $3 != 'no' ] ; then 
     217                echo 'option switch must be "yes" or "no"' >> ${SETTE_DIR}/output.sette 
     218                echo "${usage}" >> ${SETTE_DIR}/output.sette 
     219                exit 1 
     220        fi 
     221        if [ $3 == 'yes' ] ; then 
     222                set_namelist $1 $2 $4 
     223        else 
     224                set_namelist $1 $2 $5 
     225        fi 
     226} 
     227         
     228# set_namelist: function to set namelists parameters 
    202229set_namelist () { 
    203230   minargcount=3 
     
    449476                exit 1 
    450477        fi 
    451         if [ $2 != "true" ] && [ $2 != "false" ] 
     478        inarg=$2 
     479        if [ ${inarg} == "yes" ] ; then inarg="true" ; fi 
     480        if [ ${inarg} == "no" ]  ; then inarg="false" ; fi 
     481        if [ ${inarg} != "true" ] && [ ${inarg} != "false" ] 
    452482        then 
    453483                echo "unrecognised argument for set_xio_using_server" 
    454484                echo "${usage2}" 
    455                 echo $2 
     485                echo ${inarg} 
    456486                exit 1 
    457487        fi 
     
    475505                exit 1 
    476506        fi 
    477         if [ $2 == "false" ] 
     507        if [ ${inarg} == "false" ] 
    478508        then 
    479509           sed -e "/using_server/s:true:false:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 
  • utils/CI/sette_ticket2673/sette_reference-configurations.sh

    r14867 r14869  
    170170    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    171171    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    172     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    173     if [ ${USING_MPMD} == "yes" ] ; then 
    174        set_xio_using_server iodef.xml true 
    175     else 
    176        set_xio_using_server iodef.xml false 
    177     fi 
     172    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     173    set_xio_using_server iodef.xml ${USING_MPMD} 
    178174    cd ${SETTE_DIR} 
    179175    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    200196    set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_${ITRST}_restart\" 
    201197    set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_${ITRST}_restart_trc\" 
    202     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    203     if [ ${USING_MPMD} == "yes" ] ; then 
    204        set_xio_using_server iodef.xml true 
    205     else 
    206        set_xio_using_server iodef.xml false 
    207     fi 
     198    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     199    set_xio_using_server iodef.xml ${USING_MPMD} 
    208200    for (( i=1; i<=$NPROC; i++)) ; do 
    209201        L_NPROC=$(( $i - 1 )) 
     
    240232    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    241233    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    242     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    243     if [ ${USING_MPMD} == "yes" ] ; then 
    244        set_xio_using_server iodef.xml true 
    245     else 
    246        set_xio_using_server iodef.xml false 
    247     fi 
     234    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     235    set_xio_using_server iodef.xml ${USING_MPMD} 
    248236    cd ${SETTE_DIR} 
    249237    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    268256    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    269257    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    270     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    271     if [ ${USING_MPMD} == "yes" ] ; then 
    272        set_xio_using_server iodef.xml true 
    273     else 
    274        set_xio_using_server iodef.xml false 
    275     fi 
     258    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     259    set_xio_using_server iodef.xml ${USING_MPMD} 
    276260    cd ${SETTE_DIR} 
    277261    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    325309    set_namelist namelist_cfg ln_stcor .true. 
    326310    # 
    327     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    328     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    329     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    330     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    331     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    332     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    333     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    334     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     311    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     312    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     313    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     314    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    335315    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    336316    # 
     
    346326    # put ln_pisdmp to false : no restoring to global mean value 
    347327    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    348     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    349     if [ ${USING_MPMD} == "yes" ] ; then 
    350        set_xio_using_server iodef.xml true 
    351     else 
    352        set_xio_using_server iodef.xml false 
    353     fi 
     328    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     329    set_xio_using_server iodef.xml ${USING_MPMD} 
    354330    cd ${SETTE_DIR} 
    355331    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    377353    set_namelist namelist_cfg ln_stcor .true. 
    378354    # 
    379     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    380     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    381     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    382     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    383     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    384     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    385     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    386     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     355    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     356    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     357    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     358    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    387359    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    388360    # 
     
    414386        fi 
    415387    done 
    416     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    417     if [ ${USING_MPMD} == "yes" ] ; then 
    418        set_xio_using_server iodef.xml true 
    419     else 
    420        set_xio_using_server iodef.xml false 
    421     fi 
     388    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     389    set_xio_using_server iodef.xml ${USING_MPMD} 
    422390    cd ${SETTE_DIR} 
    423391    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    452420    set_namelist namelist_cfg ln_stcor .true. 
    453421 
    454     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    455     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    456     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    457     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    458     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    459     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    460     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    461     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     422    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     423    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     424    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     425    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    462426    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    463427 
     
    472436    # put ln_pisdmp to false : no restoring to global mean value 
    473437    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    474     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    475     if [ ${USING_MPMD} == "yes" ] ; then 
    476        set_xio_using_server iodef.xml true 
    477     else 
    478        set_xio_using_server iodef.xml false 
    479     fi 
     438    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     439    set_xio_using_server iodef.xml ${USING_MPMD} 
    480440    cd ${SETTE_DIR} 
    481441    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    504464    set_namelist namelist_cfg ln_stcor .true. 
    505465 
    506     if [ ${USING_ICEBERGS} == "no" ]  ; then set_namelist namelist_cfg ln_icebergs .false. ; fi 
    507     if [ ${USING_ICEBERGS} == "yes" ] ; then set_namelist namelist_cfg ln_icebergs .true. ; fi 
    508     if [ ${USING_EXTRA_HALO} == "no" ]  ; then set_namelist namelist_cfg nn_hls 1 ; fi 
    509     if [ ${USING_EXTRA_HALO} == "yes" ] ; then set_namelist namelist_cfg nn_hls 2 ; fi 
    510     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    511     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    512     if [ ${USING_TILING} == "no" ]  ; then set_namelist namelist_cfg ln_tile .false. ; fi 
    513     if [ ${USING_TILING} == "yes" ] ; then set_namelist namelist_cfg ln_tile .true. ; fi 
     466    set_namelist_opt namelist_cfg ln_icebergs ${USING_ICEBERGS} .true. .false. 
     467    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     468    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     469    set_namelist_opt namelist_cfg ln_tile ${USING_TILING} .true. .false. 
    514470    # for debugging purposes set_namelist namelist_cfg rn_test_box -180.0, 180.0, -90.0, -55.0 
    515471 
     
    524480    # put ln_pisdmp to false : no restoring to global mean value 
    525481    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    526     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    527     if [ ${USING_MPMD} == "yes" ] ; then 
    528        set_xio_using_server iodef.xml true 
    529     else 
    530        set_xio_using_server iodef.xml false 
    531     fi 
     482    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     483    set_xio_using_server iodef.xml ${USING_MPMD} 
    532484    cd ${SETTE_DIR} 
    533485    . ./prepare_job.sh input_ORCA2_ICE_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    586538    # put ln_pisdmp to false : no restoring to global mean value 
    587539    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    588     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    589     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    590     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    591     if [ ${USING_MPMD} == "yes" ] ; then 
    592        set_xio_using_server iodef.xml true 
    593     else 
    594        set_xio_using_server iodef.xml false 
    595     fi 
     540    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     541    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     542    set_xio_using_server iodef.xml ${USING_MPMD} 
    596543    cd ${SETTE_DIR} 
    597544    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    629576    # put ln_pisdmp to false : no restoring to global mean value 
    630577    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    631     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    632     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    633     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    634     if [ ${USING_MPMD} == "yes" ] ; then 
    635        set_xio_using_server iodef.xml true 
    636     else 
    637        set_xio_using_server iodef.xml false 
    638     fi 
     578    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     579    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     580    set_xio_using_server iodef.xml ${USING_MPMD} 
    639581    cd ${SETTE_DIR} 
    640582    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME}  ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    675617    # put ln_pisdmp to false : no restoring to global mean value 
    676618    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    677     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    678     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    679     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    680     if [ ${USING_MPMD} == "yes" ] ; then 
    681        set_xio_using_server iodef.xml true 
    682     else 
    683        set_xio_using_server iodef.xml false 
    684     fi 
     619    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     620    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     621    set_xio_using_server iodef.xml ${USING_MPMD} 
    685622    cd ${SETTE_DIR} 
    686623    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    715652    # put ln_pisdmp to false : no restoring to global mean value 
    716653    set_namelist namelist_pisces_cfg ln_pisdmp .false.  
    717     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    718     if [ ${USING_COLLECTIVES} == "no" ]  ; then set_namelist namelist_cfg nn_comm 1 ; fi 
    719     if [ ${USING_COLLECTIVES} == "yes" ] ; then set_namelist namelist_cfg nn_comm 2 ; fi 
    720     if [ ${USING_MPMD} == "yes" ] ; then 
    721        set_xio_using_server iodef.xml true 
    722     else 
    723        set_xio_using_server iodef.xml false 
    724     fi 
     654    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     655    set_namelist_opt namelist_cfg nn_hls ${USING_EXTRA_HALO} 2 1 
     656    set_namelist_opt namelist_cfg nn_comm ${USING_COLLECTIVES} 2 1 
     657    set_xio_using_server iodef.xml ${USING_MPMD} 
    725658    cd ${SETTE_DIR} 
    726659    . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    766699    set_namelist namelist_cfg jpnj 8 
    767700    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    768     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    769     if [ ${USING_MPMD} == "yes" ] ; then 
    770        set_xio_using_server iodef.xml true 
    771     else 
    772        set_xio_using_server iodef.xml false 
    773     fi 
     701    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     702    set_xio_using_server iodef.xml ${USING_MPMD} 
    774703    cd ${SETTE_DIR} 
    775704    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    797726        ln -sf ../LONG/AMM12_LONG_${ITRST}_restart_${L_NPROC}.nc . 
    798727    done 
    799     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    800     if [ ${USING_MPMD} == "yes" ] ; then 
    801        set_xio_using_server iodef.xml true 
    802     else 
    803        set_xio_using_server iodef.xml false 
    804     fi 
     728    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     729    set_xio_using_server iodef.xml ${USING_MPMD} 
    805730    cd ${SETTE_DIR} 
    806731    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    829754    set_namelist namelist_cfg jpnj 4 
    830755    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    831     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    832     if [ ${USING_MPMD} == "yes" ] ; then 
    833        set_xio_using_server iodef.xml true 
    834     else 
    835        set_xio_using_server iodef.xml false 
    836     fi 
     756    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     757    set_xio_using_server iodef.xml ${USING_MPMD} 
    837758    cd ${SETTE_DIR} 
    838759    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    854775    set_namelist namelist_cfg jpnj 8 
    855776    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    856     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    857     if [ ${USING_MPMD} == "yes" ] ; then 
    858        set_xio_using_server iodef.xml true 
    859     else 
    860        set_xio_using_server iodef.xml false 
    861     fi 
     777    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     778    set_xio_using_server iodef.xml ${USING_MPMD} 
    862779    cd ${SETTE_DIR} 
    863780    . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    906823    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    907824    set_namelist namelist_ice_cfg ln_icediachk .true. 
    908     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    909     if [ ${USING_MPMD} == "yes" ] ; then 
    910        set_xio_using_server iodef.xml true 
    911     else 
    912        set_xio_using_server iodef.xml false 
    913     fi 
     825    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     826    set_xio_using_server iodef.xml ${USING_MPMD} 
    914827    cd ${SETTE_DIR} 
    915828    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    933846    set_namelist namelist_cfg cn_ocerst_in \"SAS_${ITRST}_restart\" 
    934847    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_${ITRST}_restart_ice\" 
    935     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    936     if [ ${USING_MPMD} == "yes" ] ; then 
    937        set_xio_using_server iodef.xml true 
    938     else 
    939        set_xio_using_server iodef.xml false 
    940     fi 
     848    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     849    set_xio_using_server iodef.xml ${USING_MPMD} 
    941850    for (( i=1; i<=$NPROC; i++)) ; do 
    942851        L_NPROC=$(( $i - 1 )) 
     
    977886    set_namelist namelist_cfg jpnj 8 
    978887    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    979     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    980     if [ ${USING_MPMD} == "yes" ] ; then 
    981        set_xio_using_server iodef.xml true 
    982     else 
    983        set_xio_using_server iodef.xml false 
    984     fi 
     888    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     889    set_xio_using_server iodef.xml ${USING_MPMD} 
    985890    cd ${SETTE_DIR} 
    986891    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1003908    set_namelist namelist_cfg jpnj 4 
    1004909    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1005     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1006     if [ ${USING_MPMD} == "yes" ] ; then 
    1007        set_xio_using_server iodef.xml true 
    1008     else 
    1009        set_xio_using_server iodef.xml false 
    1010     fi 
     910    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     911    set_xio_using_server iodef.xml ${USING_MPMD} 
    1011912    cd ${SETTE_DIR} 
    1012913    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1077978    set_namelist namelist_pisces_cfg ln_ironice .false. 
    1078979    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1079     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1080     if [ ${USING_MPMD} == "yes" ] ; then 
    1081        set_xio_using_server iodef.xml true 
    1082     else 
    1083        set_xio_using_server iodef.xml false 
    1084     fi 
     980    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     981    set_xio_using_server iodef.xml ${USING_MPMD} 
    1085982    cd ${SETTE_DIR} 
    1086983    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    11261023    set_namelist namelist_pisces_cfg ln_ironice .false. 
    11271024    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1128     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1129     if [ ${USING_MPMD} == "yes" ] ; then 
    1130        set_xio_using_server iodef.xml true 
    1131     else 
    1132        set_xio_using_server iodef.xml false 
    1133     fi 
     1025    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1026    set_xio_using_server iodef.xml ${USING_MPMD} 
    11341027    cd ${SETTE_DIR} 
    11351028    . ./prepare_job.sh input_ORCA2_ICE_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    11921085    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    11931086 
    1194     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1195     if [ ${USING_MPMD} == "yes" ] ; then 
    1196        set_xio_using_server iodef.xml true 
    1197     else 
    1198        set_xio_using_server iodef.xml false 
    1199     fi 
     1087    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1088    set_xio_using_server iodef.xml ${USING_MPMD} 
    12001089    cd ${SETTE_DIR} 
    12011090    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    12561145        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_ice_${L_NPROC}.nc . 
    12571146    done 
    1258     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1259     if [ ${USING_MPMD} == "yes" ] ; then 
    1260        set_xio_using_server iodef.xml true 
    1261     else 
    1262        set_xio_using_server iodef.xml false 
    1263     fi 
     1147    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1148    set_xio_using_server iodef.xml ${USING_MPMD} 
    12641149    cd ${SETTE_DIR} 
    12651150    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    13071192    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    13081193 
    1309     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1310     if [ ${USING_MPMD} == "yes" ] ; then 
    1311        set_xio_using_server iodef.xml true 
    1312     else 
    1313        set_xio_using_server iodef.xml false 
    1314     fi 
     1194    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1195    set_xio_using_server iodef.xml ${USING_MPMD} 
    13151196    cd ${SETTE_DIR} 
    13161197    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    13521233    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    13531234 
    1354     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1355     if [ ${USING_MPMD} == "yes" ] ; then 
    1356        set_xio_using_server iodef.xml true 
    1357     else 
    1358        set_xio_using_server iodef.xml false 
    1359     fi 
     1235    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1236    set_xio_using_server iodef.xml ${USING_MPMD} 
    13601237    cd ${SETTE_DIR} 
    13611238    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    13921269    sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
    13931270 
    1394     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1395     if [ ${USING_MPMD} == "yes" ] ; then 
    1396        set_xio_using_server iodef.xml true 
    1397     else 
    1398        set_xio_using_server iodef.xml false 
    1399     fi 
     1271    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1272    set_xio_using_server iodef.xml ${USING_MPMD} 
    14001273    cd ${SETTE_DIR} 
    14011274    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    14311304    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    14321305# 
    1433     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1434     if [ ${USING_MPMD} == "yes" ] ; then 
    1435        set_xio_using_server iodef.xml true 
    1436     else 
    1437        set_xio_using_server iodef.xml false 
    1438     fi 
     1306    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1307    set_xio_using_server iodef.xml ${USING_MPMD} 
    14391308    cd ${SETTE_DIR} 
    14401309    . ./prepare_job.sh input_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    14841353    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    14851354    #set_namelist namelist_ice_cfg ln_icediachk .true. 
    1486     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1487     if [ ${USING_MPMD} == "yes" ] ; then 
    1488        set_xio_using_server iodef.xml true 
    1489     else 
    1490        set_xio_using_server iodef.xml false 
    1491     fi 
     1355    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1356    set_xio_using_server iodef.xml ${USING_MPMD} 
    14921357    cd ${SETTE_DIR} 
    14931358    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    15161381        ln -sf ../LONG/WED025_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
    15171382    done 
    1518     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1519     if [ ${USING_MPMD} == "yes" ] ; then 
    1520        set_xio_using_server iodef.xml true 
    1521     else 
    1522        set_xio_using_server iodef.xml false 
    1523     fi 
     1383    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1384    set_xio_using_server iodef.xml ${USING_MPMD} 
    15241385    cd ${SETTE_DIR} 
    15251386    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    15491410    set_namelist namelist_cfg jpnj 7 
    15501411    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1551     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1552     if [ ${USING_MPMD} == "yes" ] ; then 
    1553        set_xio_using_server iodef.xml true 
    1554     else 
    1555        set_xio_using_server iodef.xml false 
    1556     fi 
     1412    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1413    set_xio_using_server iodef.xml ${USING_MPMD} 
    15571414    cd ${SETTE_DIR} 
    15581415    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    15761433    set_namelist namelist_cfg jpnj 4 
    15771434    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1578     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1579     if [ ${USING_MPMD} == "yes" ] ; then 
    1580        set_xio_using_server iodef.xml true 
    1581     else 
    1582        set_xio_using_server iodef.xml false 
    1583     fi 
     1435    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     1436    set_xio_using_server iodef.xml ${USING_MPMD} 
    15841437    cd ${SETTE_DIR} 
    15851438    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
  • utils/CI/sette_ticket2673/sette_test-cases.sh

    r14867 r14869  
    166166    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    167167    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    168     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    169     if [ ${USING_MPMD} == "yes" ] ; then 
    170        set_xio_using_server iodef.xml true 
    171     else 
    172        set_xio_using_server iodef.xml false 
    173     fi 
     168    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     169    set_xio_using_server iodef.xml ${USING_MPMD} 
    174170    cd ${SETTE_DIR} 
    175171    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    189185    set_namelist namelist_cfg nn_rstctl 2 
    190186    set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_${ITRST}_restart\" 
    191     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    192     if [ ${USING_MPMD} == "yes" ] ; then 
    193        set_xio_using_server iodef.xml true 
    194     else 
    195        set_xio_using_server iodef.xml false 
    196     fi 
     187    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     188    set_xio_using_server iodef.xml ${USING_MPMD} 
    197189    ln -sf ../LONG/OVF_LONG_${ITRST}_restart.nc . 
    198190 
     
    235227   set_namelist namelist_cfg nn_it000 1 
    236228   set_namelist namelist_cfg nn_itend ${ITEND} 
    237         if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    238         if [ ${USING_MPMD} == "yes" ] ; then 
    239            set_xio_using_server iodef.xml true 
    240         else 
    241            set_xio_using_server iodef.xml false 
    242         fi 
     229        set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     230        set_xio_using_server iodef.xml ${USING_MPMD} 
    243231        cd ${SETTE_DIR} 
    244232        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    286274    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    287275    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    288     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    289     if [ ${USING_MPMD} == "yes" ] ; then 
    290        set_xio_using_server iodef.xml true 
    291     else 
    292        set_xio_using_server iodef.xml false 
    293     fi 
     276    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     277    set_xio_using_server iodef.xml ${USING_MPMD} 
    294278    cd ${SETTE_DIR} 
    295279    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    309293    set_namelist namelist_cfg nn_rstctl 2 
    310294    set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_${ITRST}_restart\" 
    311     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    312     if [ ${USING_MPMD} == "yes" ] ; then 
    313        set_xio_using_server iodef.xml true 
    314     else 
    315        set_xio_using_server iodef.xml false 
    316     fi 
     295    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     296    set_xio_using_server iodef.xml ${USING_MPMD} 
    317297    ln -sf ../LONG/LOCK_LONG_${ITRST}_restart.nc . 
    318298 
     
    353333        rm namelist_*_*_*_* 
    354334        cp -pL ${CONFIG_DIR}/${NEW_CONF}/EXP00/$file namelist_cfg 
    355         if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    356335   set_namelist namelist_cfg nn_it000 1 
    357336        set_namelist namelist_cfg nn_itend ${ITEND} 
    358         if [ ${USING_MPMD} == "yes" ] ; then 
    359            set_xio_using_server iodef.xml true 
    360         else 
    361            set_xio_using_server iodef.xml false 
    362         fi 
     337        set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     338        set_xio_using_server iodef.xml ${USING_MPMD} 
    363339        cd ${SETTE_DIR} 
    364340        . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    415391    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    416392    
    417     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    418     if [ ${USING_MPMD} == "yes" ] ; then 
    419         set_xio_using_server iodef.xml true 
    420     else 
    421         set_xio_using_server iodef.xml false 
    422     fi 
     393    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     394    set_xio_using_server iodef.xml ${USING_MPMD} 
    423395    cd ${SETTE_DIR} 
    424396    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    448420    set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST_1}_restart\" 
    449421       
    450     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    451     if [ ${USING_MPMD} == "yes" ] ; then 
    452         set_xio_using_server iodef.xml true 
    453     else 
    454         set_xio_using_server iodef.xml false 
    455     fi 
     422    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     423    set_xio_using_server iodef.xml ${USING_MPMD} 
    456424    if [ $NPROC -eq 1 ] ;  then 
    457425        ln -sf ../LONG/VORTEX_LONG_${ITRST}_restart.nc . 
     
    538506    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    539507 
    540     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    541     if [ ${USING_MPMD} == "yes" ] ; then 
    542        set_xio_using_server iodef.xml true 
    543     else 
    544        set_xio_using_server iodef.xml false 
    545     fi 
     508    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     509    set_xio_using_server iodef.xml ${USING_MPMD} 
    546510    cd ${SETTE_DIR} 
    547511    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    598562    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    599563     
    600     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    601     if [ ${USING_MPMD} == "yes" ] ; then 
    602         set_xio_using_server iodef.xml true 
    603     else 
    604         set_xio_using_server iodef.xml false 
    605     fi 
     564    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     565    set_xio_using_server iodef.xml ${USING_MPMD} 
    606566    cd ${SETTE_DIR} 
    607567    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    634594     
    635595     
    636     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    637     if [ ${USING_MPMD} == "yes" ] ; then 
    638         set_xio_using_server iodef.xml true 
    639     else 
    640         set_xio_using_server iodef.xml false 
    641     fi 
     596    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     597    set_xio_using_server iodef.xml ${USING_MPMD} 
    642598    if [ $NPROC -eq 1 ] ;  then 
    643599        ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart.nc . 
     
    693649    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    694650 
    695     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    696     if [ ${USING_MPMD} == "yes" ] ; then 
    697        set_xio_using_server iodef.xml true 
    698     else 
    699        set_xio_using_server iodef.xml false 
    700     fi 
     651    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     652    set_xio_using_server iodef.xml ${USING_MPMD} 
    701653    cd ${SETTE_DIR} 
    702654    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    730682    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    731683     
    732     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    733     if [ ${USING_MPMD} == "yes" ] ; then 
    734        set_xio_using_server iodef.xml true 
    735     else 
    736        set_xio_using_server iodef.xml false 
    737     fi 
     684    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     685    set_xio_using_server iodef.xml ${USING_MPMD} 
    738686    cd ${SETTE_DIR} 
    739687    . ./prepare_job.sh input_ICE_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    783731    set_namelist namelist_cfg jpnj 3 
    784732    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    785     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    786     if [ ${USING_MPMD} == "yes" ] ; then 
    787        set_xio_using_server iodef.xml true 
    788     else 
    789        set_xio_using_server iodef.xml false 
    790     fi 
     733    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     734    set_xio_using_server iodef.xml ${USING_MPMD} 
    791735    cd ${SETTE_DIR} 
    792736    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    808752    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    809753    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_${ITRST}_restart\" 
    810     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    811     if [ ${USING_MPMD} == "yes" ] ; then 
    812        set_xio_using_server iodef.xml true 
    813     else 
    814        set_xio_using_server iodef.xml false 
    815     fi 
     754    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     755    set_xio_using_server iodef.xml ${USING_MPMD} 
    816756    for (( i=1; i<=$NPROC; i++)) ; do 
    817757        L_NPROC=$(( $i - 1 )) 
     
    852792    set_namelist namelist_cfg jpnj 3 
    853793    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    854     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    855     if [ ${USING_MPMD} == "yes" ] ; then 
    856        set_xio_using_server iodef.xml true 
    857     else 
    858        set_xio_using_server iodef.xml false 
    859     fi 
     794    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     795    set_xio_using_server iodef.xml ${USING_MPMD} 
    860796    cd ${SETTE_DIR} 
    861797    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    878814    set_namelist namelist_cfg jpnj 4 
    879815    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    880     if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    881     if [ ${USING_MPMD} == "yes" ] ; then 
    882        set_xio_using_server iodef.xml true 
    883     else 
    884        set_xio_using_server iodef.xml false 
    885     fi 
     816    set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     817    set_xio_using_server iodef.xml ${USING_MPMD} 
    886818    cd ${SETTE_DIR} 
    887819    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    930862    set_namelist namelist_cfg sn_cfctl%l_runstat .true.   
    931863    
    932     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    933     if [ ${USING_MPMD} == "yes" ] ; then 
    934         set_xio_using_server iodef.xml true 
    935     else 
    936         set_xio_using_server iodef.xml false 
    937     fi 
     864    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     865    set_xio_using_server iodef.xml ${USING_MPMD} 
    938866    cd ${SETTE_DIR} 
    939867    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    954882    set_namelist namelist_cfg cn_ocerst_in \"SWG_LONG_${ITRST}_restart\" 
    955883       
    956     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    957     if [ ${USING_MPMD} == "yes" ] ; then 
    958         set_xio_using_server iodef.xml true 
    959     else 
    960         set_xio_using_server iodef.xml false 
    961     fi 
     884    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     885    set_xio_using_server iodef.xml ${USING_MPMD} 
    962886    if [ $NPROC -eq 1 ] ;  then 
    963887        ln -sf ../LONG/SWG_LONG_${ITRST}_restart.nc . 
     
    999923    
    1000924 
    1001     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1002     if [ ${USING_MPMD} == "yes" ] ; then 
    1003        set_xio_using_server iodef.xml true 
    1004     else 
    1005        set_xio_using_server iodef.xml false 
    1006     fi 
     925    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     926    set_xio_using_server iodef.xml ${USING_MPMD} 
    1007927    cd ${SETTE_DIR} 
    1008928    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     
    1029949    set_namelist namelist_cfg sn_cfctl%l_prtctl .true. 
    1030950 
    1031     #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1032     if [ ${USING_MPMD} == "yes" ] ; then 
    1033        set_xio_using_server iodef.xml true 
    1034     else 
    1035        set_xio_using_server iodef.xml false 
    1036     fi 
     951    #set_namelist_opt namelist_cfg ln_timing ${USING_TIMING} .true. .false. 
     952    set_xio_using_server iodef.xml ${USING_MPMD} 
    1037953    cd ${SETTE_DIR} 
    1038954    . ./prepare_job.sh input_EMPTY.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
Note: See TracChangeset for help on using the changeset viewer.