New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14861 – NEMO

Changeset 14861


Ignore:
Timestamp:
2021-05-13T19:12:34+02:00 (3 years ago)
Author:
acc
Message:

First stage developments for #2673 (SETTE improvements). Not fully tested

Location:
utils/CI/sette_ticket2673
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • utils/CI/sette_ticket2673/input_AGRIF.cfg

    r13292 r14861  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
    2 AGRIF_DEMO_v4.x.tar.gz AGRIF_DEMO_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
     2AGRIF_DEMO_v4.2_RC.tar.gz AGRIF_DEMO_v4.2_RC 

  • utils/CI/sette_ticket2673/input_AMM12.cfg

    r9579 r14861  
    1 AMM12_v4.0.tar AMM12_v4.0 
     1AMM12_v4.2_RC.tar.gz AMM12_v4.2_RC 

  • utils/CI/sette_ticket2673/input_ICE_AGRIF.cfg

    r13292 r14861  
    1 ICE_AGRIF_v4.x.tar.gz ICE_AGRIF_v4.x 
     1ICE_AGRIF_v4.2_RC.tar.gz ICE_AGRIF_v4.2_RC 

  • utils/CI/sette_ticket2673/input_ISOMIP+.cfg

    r13382 r14861  
    1 ISOMIP+_v4.0.tar ISOMIP+_v4.0 
     1ISOMIP+_v4.2_RC.tar.gz ISOMIP+_v4.2_RC 

  • utils/CI/sette_ticket2673/input_ORCA2_ICE_OBS.cfg

    r13292 r14861  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 

  • utils/CI/sette_ticket2673/input_ORCA2_ICE_PISCES.cfg

    r13292 r14861  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 

  • utils/CI/sette_ticket2673/input_ORCA2_OFF_PISCES.cfg

    r13292 r14861  
    1 ORCA2_OFF_v4.x.tar.gz ORCA2_OFF_v4.x 
     1ORCA2_OFF_v4.2_RC.tar.gz ORCA2_OFF_v4.2_RC 

  • utils/CI/sette_ticket2673/input_SAS.cfg

    r13292 r14861  
    1 ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
    2 SAS_v4.x.tar.gz SAS_v4.x 
     1ORCA2_ICE_v4.2_RC.tar.gz ORCA2_ICE_v4.2_RC 
     2SAS_v4.2_RC.tar.gz SAS_v4.2_RC 

  • utils/CI/sette_ticket2673/input_WED025.cfg

    r13382 r14861  
    1 WED025_v4.2.tar WED025_v4.2 
     1WED025_v4.2_RC.tar.gz WED025_v4.2_RC 

  • utils/CI/sette_ticket2673/param.cfg

    r14832 r14861  
    88# ------------------------------------------------------------------------------------------ 
    99# IMPORTANT: 
    10 # variables (COMPILER, USING_XIOS, USING_MPMD, USING_LOOP_FUSION, BATCH_CMD, BATCH_STAT, BATCH_NAME, FORCING_DIR, SVN_CMD, ADD_NOSIGNEDZERO) 
     10# variables (COMPILER, BATCH_CMD, BATCH_STAT, BATCH_NAME, FORCING_DIR, SVN_CMD) 
    1111# can be exported from your shell startup files.  
    1212# If it is the case, nothing to do 
    … …  
    4040# ------------------------------------------------------------------------------------------ 
    4141# 
    42 # RUN set up 
    43 # USING_XIOS        : flag to control the activation of key_xios 
    44 #                      "yes" to compile using key_xios and link to the external XIOS library 
    45 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    46 USING_XIOS=${SETTE_XIOS:-"yes"} 
    47 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    48 #                     requires USING_XIOS="yes" 
    49 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    50 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    51 # MPMD 
    52 USING_MPMD=${SETTE_MPMD:-"no"} 
    53 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    54 #                     "yes" to use the loop fusion adv routines when halo = 2 
    55 #                     "no" to use standard adv routines 
    56 USING_LOOP_FUSION=${SETTE_LOOP_FUSION:-"no"} 
     42# RUN setup 
    5743# generique batch scrip prefix name if MPMD set to true/false 
    5844JOB_PREFIX_MPMD=${SETTE_JOB_PREFIX_MPMD:-batch-mpmd} 
    … …  
    6450# used in sette_rpt and in all_function to display revision and build correct repository name 
    6551SVN_CMD=${SETTE_SVN_CMD:-svn} 
    66 # add key key_nosignedzero at the compilation step 
    67 ADD_NOSIGNEDZERO=${SETTE_ADD_NOSIGNEDZERO:-"yes"} 
    6852# only for IBM 
    6953#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 

  • utils/CI/sette_ticket2673/prepare_job.sh

    r14825 r14861  
    200200            ;; 
    201201         X86_ARCHER2*) 
    202                                 MK_TEMPLATE=$( /work/n01/shared/acc/mkslurm_settejob -S $NXIO_PROC -s 8 -m 4 -C $NB_PROC -g 2 -a n01-CLASS -j sette_job -t 20:00 > ${SETTE_DIR}/job_batch_template ) 
     202                                MK_TEMPLATE=$( /work/n01/shared/acc/mkslurm_settejob_4.2 -S $NXIO_PROC -s 8 -m 4 -C $NB_PROC -g 2 -a n01-CLASS -j sette_job -t 20:00 > ${SETTE_DIR}/job_batch_template ) 
    203203            ;; 
    204204                        XC40_METO*) #Setup for Met Office XC40 with any compiler 

  • utils/CI/sette_ticket2673/sette.sh

    r14826 r14861  
    11#!/bin/sh 
    22# initialise user dependent variable 
     3cmd=$0 ; cmdargs=$@ 
    34SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    45MAIN_DIR=$(dirname $SETTE_DIR) 
    5 export SETTE_TIMING='no' 
    6 export NOT_USING_QCO='no' 
    7 export USING_RK3='no' 
    8 export USING_ICEBERGS='yes' 
    9 export USING_EXTRA_HALO='no' 
    10 export USING_TILING='no' 
     6# 
     7# controls for some common namelist, run-time options: 
     8# 
     9export USING_TIMING='yes'      # Default: yes => set ln_timing=.true.   ; use -T to disable 
     10export USING_ICEBERGS='yes'    # Default: yes => set ln_icebergs=.true. ; use -i to disable 
     11export USING_EXTRA_HALO='yes'  # Default: yes => set nn_hls=2           ; use -e to set nn_hls=1 
     12export USING_TILING='yes'      # Default: yes => set ln_tile=.true.     ; use -t to disable 
     13                               #    Note: yes also ensures nn_hls=2 but -t will not alter nn_hls  
     14# 
     15# controls for some common compile-time keys: 
     16# 
     17export USING_NOSIGNED0='yes'   # Default: yes => add key_nosignedzero   ; use -z to delete key_nosignedzero 
     18export USING_QCO='yes'         # Default: yes => add key_qco            ; use -q to delete key_qco 
     19export USING_RK3='no'          # Default: yes => add key_RK3 & key_qco  ; use -Q to delete key_RK3 
     20export USING_LOOP_FUSION='yes' # Default: yes => add key_loop_fusion    ; use -F to delete key_loop_fusion 
     21export USING_XIOS='yes'        # Default: yes => add key_xios           ; use -X to delete key_xios 
     22                               #    Note: changing USING_XIOS may require a change in arch file 
     23# 
     24# controls for some common batch-script, run-time options: 
     25# 
     26export USING_MPMD='yes'        # Default: yes => run with detached XIOS servers ; use -A to run in attached (SPMD) mode 
     27                               #    Note: yes also ensures key_xios but -A will not remove it 
     28export SETTE_SUB_VAL="" 
    1129 
    1230# Parse command-line arguments 
    1331if [ $# -gt 0 ]; then 
    14   while getopts n:x:cshTqQtei option; do  
     32  while getopts n:x:v:cshTzqQteiAFX option; do  
    1533     case $option in 
    1634        c) export SETTE_CLEAN_CONFIGS='yes' 
    1735           export SETTE_SYNC_CONFIGS='yes' 
    18            echo "" 
    19            echo "Configuration $SETTE_TEST_CONFIGS will be cleaned; this option enforces also synchronisation" 
     36           echo "-c: Configuration $SETTE_TEST_CONFIGS will be cleaned; this option enforces also synchronisation" 
    2037           echo "";; 
    2138        s) export SETTE_SYNC_CONFIGS='yes' 
    22            echo "" 
    23            echo "MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
     39           echo "-s: MY_SRC and EXP00 in $SETTE_TEST_CONFIGS will be synchronised with the MY_SRC and EXPREF from the reference configuration" 
    2440           echo "";; 
    2541        n) export SETTE_TEST_CONFIGS=($OPTARG) 
    26            echo "" 
     42           echo "==================================" 
    2743           if [ ${#SETTE_TEST_CONFIGS[@]} -gt 1 ]; then 
    28              echo "Configurations ${SETTE_TEST_CONFIGS[@]} will be tested if they are available" 
     44             echo "-n: Configurations ${SETTE_TEST_CONFIGS[@]} will be tested if they are available" 
    2945           else 
    30              echo "Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
     46             echo "-n: Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 
    3147           fi 
    32            echo "" ;; 
     48           echo "";; 
    3349        x) export SETTE_TEST_TYPES=($OPTARG) 
    34            ;; 
    35         T) export SETTE_TIMING='yes' 
    36            echo "" 
    37            echo "ln_timing will be set to true" 
    38            echo "";; 
    39    q) export NOT_USING_QCO='yes' 
    40            echo "" 
    41            echo "key_qco and key_linssh will NOT be activated" 
     50           echo "-x: $SETTE_TEST_TYPES tests requested" 
     51           echo "";; 
     52        v) export SETTE_SUB_VAL=($OPTARG) 
     53           echo "-v: $SETTE_SUB_VAL validation sub-directory requested" 
     54           echo "";; 
     55        T) export USING_TIMING='no' 
     56           echo "-T: ln_timing will be set to false" 
     57           echo "";; 
     58        t) export USING_TILING='no' 
     59           echo "-t: ln_tile will be set to false" 
     60           echo "";; 
     61        e) export USING_EXTRA_HALO='no' 
     62           echo "-e: nn_hls will be set to 1" 
     63           echo "";; 
     64        i) export USING_ICEBERGS='no' 
     65           echo "-i: ln_icebergs will be set to false" 
     66           echo "";; 
     67   z) export USING_NOSIGNED0='no' 
     68           echo "-z: key_nosignedzero will NOT be activated" 
     69           echo "";; 
     70   q) export USING_QCO='no' 
     71           echo "-q: key_qco and key_linssh will NOT be activated" 
    4272           echo "";; 
    4373   Q) export USING_RK3='no' 
    44            echo "" 
    45            echo "key_qco and key_RK3 will be activated" 
    46            echo "..when they are ready; disabled for now: USING_RK3='no'" 
    47            echo "";; 
    48         t) export USING_TILING='yes' 
    49            echo "" 
    50            echo "ln_tile will be set to true AND nn_hls will be set to 2" 
    51            echo "";; 
    52         e) export USING_EXTRA_HALO='yes' 
    53            echo "" 
    54            echo "nn_hls will be set to 2" 
    55            echo "";; 
    56         i) export USING_ICEBERGS='no' 
    57            echo "" 
    58            echo "ln_icebergs will be set to false" 
    59            echo "";; 
    60         h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested)' 
     74           echo "-Q: key_qco and key_RK3 will not be activated" 
     75           echo "    This is the curent default for now since RK3 is not ready" 
     76           echo "";; 
     77        F) export USING_LOOP_FUSION='no' 
     78           echo "-F: key_loop_fusion will not be activated" 
     79           echo "";; 
     80        X) export USING_XIOS='no' 
     81           echo "-X: key_xios will not be activated" 
     82           echo "";; 
     83        A) export USING_MPMD='no' 
     84           echo "-A: Tasks will be run in attached (SPMD) mode" 
     85           echo "";; 
     86        h | *) echo 'sette.sh with no arguments (in this case all configuration will be tested with default options)' 
     87               echo '-T to set ln_timing false for all non-AGRIF configurations (default: true)' 
     88               echo '-t set ln_tile false in all tests that support it (default: true)' 
     89               echo '-e set nn_hls=1 (default: nn_hls=2)' 
     90               echo '-i set ln_icebergs false (default: true)' 
     91               echo '-z to remove the key_nosignedzero key (default: added)' 
     92               echo '-q to remove the key_qco key (default: added)' 
     93               echo '-X to remove the key_xios key (default: added)' 
     94               echo '-F to remove the key_loop_fusion key (default: added)' 
     95               echo '-Q to remove the key_RK3 key (currently a null-op since key_RK3 is not used)' 
     96               echo '-A to run tests in attached (SPMD) mode (default: MPMD with key_xios)' 
    6197               echo '-n "CFG1_to_test CFG2_to_test ..." to test some specific configurations' 
    6298               echo '-x "TEST_type TEST_type ..." to specify particular types of test (RESTART is mandatory)' 
    63                echo '-T to set ln_timing true for all non-AGRIF configurations' 
     99               echo '-v "subdir" optional validation record subdirectory to be created below NEMO_VALIDATION_DIR' 
    64100               echo '-c to clean each configuration' 
    65                echo '-q run without qco environment' 
    66                echo '-Q run with key_qco AND key_RK3 (currently disabled)' 
    67                echo '-t activate ln_tile in all tests that support it; also forces nn_hls=2 (default: off)' 
    68                echo '-e activate extended halo (nn_hls=2) in all tests that support it (default: nn_hls=1)' 
    69                echo '-i run without icebergs even in tests that support them (default: on)' 
    70101               echo '-s to synchronise the sette MY_SRC and EXP00 with the reference MY_SRC and EXPREF'; exit 42 ;; 
    71102     esac 
    … …  
    73104  shift $((OPTIND - 1)) 
    74105fi 
    75  
     106# 
     107# Option dependency tests 
     108# 
     109if [ ${USING_TILING} == "yes" ] ; then export USING_EXTRA_HALO="yes" ; fi 
     110 
     111# 
     112# Get SETTE parameters 
    76113. ./param.cfg 
    77114 
     115# 
     116# Set the common compile keys to add or delete based on command-line arguments: 
     117# 
     118export ADD_KEYS="" ; export DEL_KEYS="" 
     119if [ ${USING_XIOS} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_xios " ; fi 
     120if [ ${USING_XIOS} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_xios " ; fi 
     121# 
     122if [ ${USING_NOSIGNED0} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_nosignedzero " ; fi 
     123if [ ${USING_NOSIGNED0} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_nosignedzero " ; fi 
     124# 
     125if [ ${USING_LOOP_FUSION} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_loop_fusion " ; fi 
     126if [ ${USING_LOOP_FUSION} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_loop_fusion " ; fi 
     127# 
     128if [ ${USING_QCO} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_qco " ; fi 
     129if [ ${USING_QCO} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_qco key_linssh " ; fi 
     130# 
     131if [ ${USING_RK3} == "yes" ] ; then export ADD_KEYS="${ADD_KEYS}key_qco key_RK3 " ; fi 
     132if [ ${USING_RK3} == "no" ]  ; then export DEL_KEYS="${DEL_KEYS}key_RK3 " ; fi 
     133 
     134# 
     135# Set validation record sub-directories (if required) 
     136# 
     137if [ ! -d $NEMO_VALIDATION_DIR ] ; then 
     138  while true; do 
     139      read -p "$NEMO_VALIDATION_DIR does not exist. Do you wish to create it? " yn 
     140      case $yn in 
     141          [Yy]* ) mkdir $NEMO_VALIDATION_DIR; break;; 
     142          [Nn]* ) exit 42;; 
     143          * ) echo "Please answer yes or no.";; 
     144      esac 
     145  done 
     146fi 
     147if [ ! -z $SETTE_SUB_VAL ] ; then 
     148 if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] ; then 
     149    mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     150 fi 
     151 export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 
     152 if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] ; then 
     153  while true; do 
     154      read -p "$NEMO_VALIDATION_REF/$SETTE_SUB_VAL exists. Do you wish to use it as a reference? " yn 
     155      case $yn in 
     156          [Yy]* ) export $NEMO_VALIDATION_REF-$NEMO_VALIDATION_REF/$SETTE_SUB_VAL; break;; 
     157          [Nn]* ) exit;; 
     158          * ) echo "Please answer yes or no.";; 
     159      esac 
     160  done 
     161 fi 
     162fi 
     163 
    78164if [ ${#SETTE_TEST_CONFIGS[@]} -eq 0 ]; then 
    79    echo "" 
     165   echo "==================================" 
    80166   echo "Configurations $TEST_CONFIGS will be tested if they are available" 
    81    echo "" 
    82 fi 
    83 echo "" 
    84 echo "Carrying out the following tests: ${TEST_TYPES[@]}" 
    85 echo "" 
     167fi 
     168echo "Carrying out the following tests  : ${TEST_TYPES[@]}" 
     169echo "requested by the command          : "$cmd $cmdargs 
     170printf "%-33s : %s\n" USING_TIMING $USING_TIMING 
     171printf "%-33s : %s\n" USING_ICEBERGS $USING_ICEBERGS 
     172printf "%-33s : %s\n" USING_EXTRA_HALO $USING_EXTRA_HALO 
     173printf "%-33s : %s\n" USING_TILING $USING_TILING 
     174printf "%-33s : %s\n" USING_NOSIGNED0 $USING_NOSIGNED0 
     175printf "%-33s : %s\n" USING_QCO $USING_QCO 
     176printf "%-33s : %s\n" USING_LOOP_FUSION $USING_LOOP_FUSION 
     177printf "%-33s : %s\n" USING_XIOS $USING_XIOS 
     178printf "%-33s : %s\n" USING_MPMD $USING_MPMD 
     179printf "%-33s : %s\n" USING_RK3 $USING_RK3 
     180printf "%-33s : %s\n" "Common compile keys to be added" "$ADD_KEYS" 
     181printf "%-33s : %s\n" "Common compile keys to be deleted" "$DEL_KEYS" 
     182echo "Validation records to appear under: "$NEMO_VALIDATION_DIR 
     183echo "==================================" 
     184echo "" 
     185# 
     186# Option compatibility tests 
     187# 
     188if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] ; then echo "Incompatible choices. MPMD mode requires the XIOS server" ; exit ; fi 
    86189 
    87190# run sette on reference configuration 

  • utils/CI/sette_ticket2673/sette_reference-configurations.sh

    r14830 r14861  
    2929# MPIRUN_FLAG       : flag to run in parallel (MPI) "yes" 
    3030#                           to run in sequential mode (NB_PROC = 1) "no" 
    31 # USING_XIOS        : flag to control the activation of key_xios 
    32 #                      "yes" to compile using key_xios and link to the external XIOS library 
    33 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    34 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    35 #                     requires USING_XIOS="yes" 
    36 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    37 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    38 # SETTE_TIMING      : flag to control the production of timing.output 
    39 #                     requires SETTE_TIMING="yes" 
    4031 
    4132# NUM_XIOSERVERS    : number of stand-alone IO servers to employ 
    4233#                     set to zero if USING_MPMD="no" 
    43 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    44 #                     "yes" to use the loop fusion adv routines when halo = 2 
    45 #                     "no" to use standard adv routines 
    4634# 
    4735# Principal script is sette.sh, that calls  
    … …  
    10896export MPIRUN_FLAG="yes" 
    10997# 
    110 if [ ${USING_TILING} == "yes" ] 
    111  then 
    112    export USING_EXTRA_HALO="yes" 
    113 fi 
    114 # 
    115 export ADD_KEYS="" 
    116 export DEL_KEYS="" 
    117 if [ ${USING_XIOS} == "yes" ]  
    118  then  
    119    export ADD_KEYS="${ADD_KEYS} key_xios" 
    120  else 
    121    export DEL_KEYS="${DEL_KEYS} key_xios" 
    122 fi 
    123 # 
    124 if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
    125  then 
    126    export ADD_KEYS="${ADD_KEYS} key_nosignedzero" 
    127  else 
    128    export DEL_KEYS="${DEL_KEYS} key_nosignedzero"  
    129 fi 
    130 # 
    131 if [ ${USING_LOOP_FUSION} == "yes" ] 
    132  then 
    133    export ADD_KEYS="${ADD_KEYS} key_loop_fusion" 
    134 fi 
    135 # 
    136 if [ ${NOT_USING_QCO} == "yes" ] 
    137  then 
    138    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh" 
    139 fi 
    140 # 
    141 if [ ${USING_RK3} == "yes" ] 
    142  then 
    143    export ADD_KEYS="${ADD_KEYS} key_qco key_RK3" 
    144 else 
    145    export DEL_KEYS="${DEL_KEYS} key_RK3" 
    146 fi 
    147 # 
    14898# Settings which control the use of stand alone servers (only relevant if using xios) 
    14999# 
    … …  
    157107fi 
    158108# 
    159 # 
    160 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    161  then 
    162    echo "Incompatible choices. MPMD mode requires the XIOS server" 
    163    exit 
    164 fi 
    165109 
    166110# Directory to run the tests 
    … …  
    226170    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    227171    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    228     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     172    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    229173    if [ ${USING_MPMD} == "yes" ] ; then 
    230174       set_xio_using_server iodef.xml true 
    … …  
    256200    set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_${ITRST}_restart\" 
    257201    set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_${ITRST}_restart_trc\" 
    258     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     202    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    259203    if [ ${USING_MPMD} == "yes" ] ; then 
    260204       set_xio_using_server iodef.xml true 
    … …  
    297241    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    298242    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    299     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     243    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    300244    if [ ${USING_MPMD} == "yes" ] ; then 
    301245       set_xio_using_server iodef.xml true 
    … …  
    325269    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    326270    set_namelist namelist_cfg sn_cfctl%l_trcstat .true. 
    327     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     271    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    328272    if [ ${USING_MPMD} == "yes" ] ; then 
    329273       set_xio_using_server iodef.xml true 
    … …  
    402346    # put ln_pisdmp to false : no restoring to global mean value 
    403347    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    404     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     348    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    405349    if [ ${USING_MPMD} == "yes" ] ; then 
    406350       set_xio_using_server iodef.xml true 
    … …  
    468412        fi 
    469413    done 
    470     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     414    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    471415    if [ ${USING_MPMD} == "yes" ] ; then 
    472416       set_xio_using_server iodef.xml true 
    … …  
    525469    # put ln_pisdmp to false : no restoring to global mean value 
    526470    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    527     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     471    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    528472    if [ ${USING_MPMD} == "yes" ] ; then 
    529473       set_xio_using_server iodef.xml true 
    … …  
    575519    # put ln_pisdmp to false : no restoring to global mean value 
    576520    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    577     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     521    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    578522    if [ ${USING_MPMD} == "yes" ] ; then 
    579523       set_xio_using_server iodef.xml true 
    … …  
    637581    # put ln_pisdmp to false : no restoring to global mean value 
    638582    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    639     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     583    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    640584    if [ ${USING_MPMD} == "yes" ] ; then 
    641585       set_xio_using_server iodef.xml true 
    … …  
    678622    # put ln_pisdmp to false : no restoring to global mean value 
    679623    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    680     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     624    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    681625    if [ ${USING_MPMD} == "yes" ] ; then 
    682626       set_xio_using_server iodef.xml true 
    … …  
    723667    # put ln_pisdmp to false : no restoring to global mean value 
    724668    set_namelist namelist_pisces_cfg ln_pisdmp .false. 
    725     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     669    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    726670    if [ ${USING_MPMD} == "yes" ] ; then 
    727671       set_xio_using_server iodef.xml true 
    … …  
    761705    # put ln_pisdmp to false : no restoring to global mean value 
    762706    set_namelist namelist_pisces_cfg ln_pisdmp .false.  
    763     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     707    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    764708    if [ ${USING_MPMD} == "yes" ] ; then 
    765709       set_xio_using_server iodef.xml true 
    … …  
    811755    set_namelist namelist_cfg jpnj 8 
    812756    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    813     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     757    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    814758    if [ ${USING_MPMD} == "yes" ] ; then 
    815759       set_xio_using_server iodef.xml true 
    … …  
    842786        ln -sf ../LONG/AMM12_LONG_${ITRST}_restart_${L_NPROC}.nc . 
    843787    done 
    844     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     788    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    845789    if [ ${USING_MPMD} == "yes" ] ; then 
    846790       set_xio_using_server iodef.xml true 
    … …  
    875819    set_namelist namelist_cfg jpnj 4 
    876820    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    877     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     821    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    878822    if [ ${USING_MPMD} == "yes" ] ; then 
    879823       set_xio_using_server iodef.xml true 
    … …  
    900844    set_namelist namelist_cfg jpnj 8 
    901845    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    902     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     846    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    903847    if [ ${USING_MPMD} == "yes" ] ; then 
    904848       set_xio_using_server iodef.xml true 
    … …  
    952896    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    953897    set_namelist namelist_ice_cfg ln_icediachk .true. 
    954     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     898    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    955899    if [ ${USING_MPMD} == "yes" ] ; then 
    956900       set_xio_using_server iodef.xml true 
    … …  
    979923    set_namelist namelist_cfg cn_ocerst_in \"SAS_${ITRST}_restart\" 
    980924    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_${ITRST}_restart_ice\" 
    981     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     925    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    982926    if [ ${USING_MPMD} == "yes" ] ; then 
    983927       set_xio_using_server iodef.xml true 
    … …  
    1024968    set_namelist namelist_cfg jpnj 8 
    1025969    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1026     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     970    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1027971    if [ ${USING_MPMD} == "yes" ] ; then 
    1028972       set_xio_using_server iodef.xml true 
    … …  
    1050994    set_namelist namelist_cfg jpnj 4 
    1051995    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1052     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     996    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1053997    if [ ${USING_MPMD} == "yes" ] ; then 
    1054998       set_xio_using_server iodef.xml true 
    … …  
    11251069    set_namelist namelist_pisces_cfg ln_ironice .false. 
    11261070    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1127     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1071    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    11281072    if [ ${USING_MPMD} == "yes" ] ; then 
    11291073       set_xio_using_server iodef.xml true 
    … …  
    11741118    set_namelist namelist_pisces_cfg ln_ironice .false. 
    11751119    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    1176     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1120    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    11771121    if [ ${USING_MPMD} == "yes" ] ; then 
    11781122       set_xio_using_server iodef.xml true 
    … …  
    12411185    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    12421186 
    1243     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1187    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    12441188    if [ ${USING_MPMD} == "yes" ] ; then 
    12451189       set_xio_using_server iodef.xml true 
    … …  
    13051249        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_ice_${L_NPROC}.nc . 
    13061250    done 
    1307     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1251    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    13081252    if [ ${USING_MPMD} == "yes" ] ; then 
    13091253       set_xio_using_server iodef.xml true 
    … …  
    13571301    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    13581302 
    1359     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1303    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    13601304    if [ ${USING_MPMD} == "yes" ] ; then 
    13611305       set_xio_using_server iodef.xml true 
    … …  
    14021346    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    14031347 
    1404     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1348    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    14051349    if [ ${USING_MPMD} == "yes" ] ; then 
    14061350       set_xio_using_server iodef.xml true 
    … …  
    14431387    sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
    14441388 
    1445     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1389    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    14461390    if [ ${USING_MPMD} == "yes" ] ; then 
    14471391       set_xio_using_server iodef.xml true 
    … …  
    14831427    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    14841428# 
    1485     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1429    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    14861430    if [ ${USING_MPMD} == "yes" ] ; then 
    14871431       set_xio_using_server iodef.xml true 
    … …  
    15361480    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    15371481    #set_namelist namelist_ice_cfg ln_icediachk .true. 
    1538     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1482    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    15391483    if [ ${USING_MPMD} == "yes" ] ; then 
    15401484       set_xio_using_server iodef.xml true 
    … …  
    15681512        ln -sf ../LONG/WED025_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
    15691513    done 
    1570     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1514    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    15711515    if [ ${USING_MPMD} == "yes" ] ; then 
    15721516       set_xio_using_server iodef.xml true 
    … …  
    16021546    set_namelist namelist_cfg jpnj 7 
    16031547    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1604     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1548    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    16051549    if [ ${USING_MPMD} == "yes" ] ; then 
    16061550       set_xio_using_server iodef.xml true 
    … …  
    16291573    set_namelist namelist_cfg jpnj 4 
    16301574    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1631     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1575    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    16321576    if [ ${USING_MPMD} == "yes" ] ; then 
    16331577       set_xio_using_server iodef.xml true 

  • utils/CI/sette_ticket2673/sette_test-cases.sh

    r14826 r14861  
    3131# MPIRUN_FLAG       : flag to run in parallel (MPI) "yes" 
    3232#                           to run in sequential mode (NB_PROC = 1) "no" 
    33 # USING_XIOS        : flag to control the activation of key_xios 
    34 #                      "yes" to compile using key_xios and link to the external XIOS library 
    35 #                      "no"  to compile without key_xios and link to the old IOIPSL library 
    36 # USING_MPMD        : flag to control the use of stand-alone IO servers 
    37 #                     requires USING_XIOS="yes" 
    38 #                      "yes" to run in MPMD (detached) mode with stand-alone IO servers 
    39 #                      "no"  to run in SPMD (attached) mode without separate IO servers  
    4033# NUM_XIOSERVERS    : number of stand-alone IO servers to employ 
    4134#                     set to zero if USING_MPMD="no" 
    42 # USING_LOOP_FUSION : flag to control the activation of key_loop_fusion 
    43 #                     "yes" to use the loop fusion adv routines when halo = 2 
    44 #                     "no" to use standard adv routines 
    4535# 
    4636# Principal script is sette_test-cases.sh, that calls  
    … …  
    10797export MPIRUN_FLAG="yes" 
    10898# 
    109 export ADD_KEYS="" 
    110 export DEL_KEYS="" 
    111 if [ ${USING_XIOS} == "yes" ]  
    112  then  
    113    export ADD_KEYS="${ADD_KEYS} key_xios" 
    114  else 
    115    export DEL_KEYS="${DEL_KEYS} key_xios" 
    116 fi 
    117 # 
    118 if [ ${ADD_NOSIGNEDZERO} == "yes" ] 
    119  then 
    120    export ADD_KEYS="${ADD_KEYS} key_nosignedzero" 
    121  else 
    122    export DEL_KEYS="${DEL_KEYS} key_nosignedzero"  
    123 fi 
    124 # 
    125 if [ ${USING_LOOP_FUSION} == "yes" ] 
    126  then 
    127    export ADD_KEYS="${ADD_KEYS} key_loop_fusion" 
    128 fi 
    129 # 
    130 if [ ${NOT_USING_QCO} == "yes" ] 
    131  then 
    132    export DEL_KEYS="${DEL_KEYS} key_qco key_linssh" 
    133 fi 
    134 # 
    135 if [ ${USING_RK3} == "yes" ] 
    136  then 
    137    export ADD_KEYS="${ADD_KEYS} key_qco key_RK3" 
    138 fi 
    139 # 
    14099# Settings which control the use of stand alone servers (only relevant if using xios) 
    141100# 
    … …  
    149108fi 
    150109# 
    151 # 
    152 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no" ] 
    153  then 
    154    echo "Incompatible choices. MPMD mode requires the XIOS server" 
    155    exit 
    156 fi 
    157  
    158110# Directory to run the tests 
    159111CONFIG_DIR0=${MAIN_DIR}/cfgs 
    … …  
    215167    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    216168    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    217     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     169    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    218170    if [ ${USING_MPMD} == "yes" ] ; then 
    219171       set_xio_using_server iodef.xml true 
    … …  
    238190    set_namelist namelist_cfg nn_rstctl 2 
    239191    set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_${ITRST}_restart\" 
    240     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     192    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    241193    if [ ${USING_MPMD} == "yes" ] ; then 
    242194       set_xio_using_server iodef.xml true 
    … …  
    285237   set_namelist namelist_cfg nn_it000 1 
    286238   set_namelist namelist_cfg nn_itend ${ITEND} 
    287         if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     239        if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    288240        if [ ${USING_MPMD} == "yes" ] ; then 
    289241           set_xio_using_server iodef.xml true 
    … …  
    337289    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    338290    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    339     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     291    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    340292    if [ ${USING_MPMD} == "yes" ] ; then 
    341293       set_xio_using_server iodef.xml true 
    … …  
    360312    set_namelist namelist_cfg nn_rstctl 2 
    361313    set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_${ITRST}_restart\" 
    362     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     314    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    363315    if [ ${USING_MPMD} == "yes" ] ; then 
    364316       set_xio_using_server iodef.xml true 
    … …  
    405357        rm namelist_*_*_*_* 
    406358        cp -pL ${CONFIG_DIR}/${NEW_CONF}/EXP00/$file namelist_cfg 
    407         if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     359        if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    408360   set_namelist namelist_cfg nn_it000 1 
    409361        set_namelist namelist_cfg nn_itend ${ITEND} 
    … …  
    468420    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    469421    
    470     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     422    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    471423    if [ ${USING_MPMD} == "yes" ] ; then 
    472424        set_xio_using_server iodef.xml true 
    … …  
    501453    set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST_1}_restart\" 
    502454       
    503     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     455    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    504456    if [ ${USING_MPMD} == "yes" ] ; then 
    505457        set_xio_using_server iodef.xml true 
    … …  
    555507    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    556508 
    557     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     509    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    558510    if [ ${USING_MPMD} == "yes" ] ; then 
    559511       set_xio_using_server iodef.xml true 
    … …  
    592544    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    593545 
    594     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     546    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    595547    if [ ${USING_MPMD} == "yes" ] ; then 
    596548       set_xio_using_server iodef.xml true 
    … …  
    652604    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    653605     
    654     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     606    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    655607    if [ ${USING_MPMD} == "yes" ] ; then 
    656608        set_xio_using_server iodef.xml true 
    … …  
    688640     
    689641     
    690     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     642    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    691643    if [ ${USING_MPMD} == "yes" ] ; then 
    692644        set_xio_using_server iodef.xml true 
    … …  
    748700    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    749701 
    750     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     702    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    751703    if [ ${USING_MPMD} == "yes" ] ; then 
    752704       set_xio_using_server iodef.xml true 
    … …  
    785737    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    786738     
    787     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     739    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    788740    if [ ${USING_MPMD} == "yes" ] ; then 
    789741       set_xio_using_server iodef.xml true 
    … …  
    838790    set_namelist namelist_cfg jpnj 3 
    839791    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    840     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     792    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    841793    if [ ${USING_MPMD} == "yes" ] ; then 
    842794       set_xio_using_server iodef.xml true 
    … …  
    863815    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    864816    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_${ITRST}_restart\" 
    865     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     817    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    866818    if [ ${USING_MPMD} == "yes" ] ; then 
    867819       set_xio_using_server iodef.xml true 
    … …  
    908860    set_namelist namelist_cfg jpnj 3 
    909861    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    910     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     862    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    911863    if [ ${USING_MPMD} == "yes" ] ; then 
    912864       set_xio_using_server iodef.xml true 
    … …  
    934886    set_namelist namelist_cfg jpnj 4 
    935887    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    936     if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     888    if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    937889    if [ ${USING_MPMD} == "yes" ] ; then 
    938890       set_xio_using_server iodef.xml true 
    … …  
    987939    set_namelist namelist_cfg sn_cfctl%l_runstat .true.   
    988940    
    989     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     941    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    990942    if [ ${USING_MPMD} == "yes" ] ; then 
    991943        set_xio_using_server iodef.xml true 
    … …  
    1011963    set_namelist namelist_cfg cn_ocerst_in \"SWG_LONG_${ITRST}_restart\" 
    1012964       
    1013     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     965    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    1014966    if [ ${USING_MPMD} == "yes" ] ; then 
    1015967        set_xio_using_server iodef.xml true 
    … …  
    10571009    
    10581010 
    1059     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1011    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    10601012    if [ ${USING_MPMD} == "yes" ] ; then 
    10611013       set_xio_using_server iodef.xml true 
    … …  
    10871039    set_namelist namelist_cfg sn_cfctl%l_prtctl .true. 
    10881040 
    1089     #if [ ${SETTE_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
     1041    #if [ ${USING_TIMING} == "yes" ]  ; then set_namelist namelist_cfg ln_timing .true. ; fi 
    10901042    if [ ${USING_MPMD} == "yes" ] ; then 
    10911043       set_xio_using_server iodef.xml true 
Note: See TracChangeset for help on using the changeset viewer.