Changeset 5685


Ignore:
Timestamp:
2015-08-13T12:05:41+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Modification to avoid void 'del_key' string in cpp file

Location:
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/martin.cfg

    r5684 r5685  
    1919[ ${REFE_CONF} == 'ORCA2_LIM_PISCES'  ] && TEST_CONF='O2LP_trust' 
    2020[ ${REFE_CONF} == 'ORCA1_LIM3_PISCES' ] && TEST_CONF='O1L3P_trust' 
    21 [ ${REFE_CONF} == 'ORCA2_LIM'         ] && TEST_CONF='O2LA_trust' && KEYS_ADD='key_agrif' && KEYS_DEL='key_zdftmx' 
     21if [ ${REFE_CONF} == 'ORCA2_LIM' ]; then 
     22    TEST_CONF='O2LA_trust' 
     23    KEYS_ADD='key_add key_agrif' && KEYS_DEL='key_del key_zdftmx' 
     24fi 
    2225 
    2326### Inputs 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/romr005.cfg

    r5684 r5685  
    1919[ ${REFE_CONF} == 'ORCA2_LIM_PISCES'  ] && TEST_CONF='O2LP_trust' 
    2020[ ${REFE_CONF} == 'ORCA1_LIM3_PISCES' ] && TEST_CONF='O1L3P_trust' 
    21 [ ${REFE_CONF} == 'ORCA2_LIM'         ] && TEST_CONF='O2LA_trust' && KEYS_ADD='key_agrif' && KEYS_DEL='key_zdftmx' 
     21if [ ${REFE_CONF} == 'ORCA2_LIM' ]; then 
     22    TEST_CONF='O2LA_trust' 
     23    KEYS_ADD='key_add key_agrif' && KEYS_DEL='key_del key_zdftmx' 
     24fi 
    2225 
    2326### Inputs 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/user_template.cfg

    r5683 r5685  
    2424KEYS_ADD=''; KEYS_DEL=''                  ## CPP keys to add or remove from reference configuration 
    2525                                             ## ex: "key_mpp_rep key_tide", ... 
    26 #[ ${REFE_CONF} == '' ] && TEST_CONF='' && KEYS_ADD='' && KEYS_DEL='' 
     26#if [ ${REFE_CONF} == '' ]; then 
     27#    TEST_CONF='' 
     28#    KEYS_ADD='key_add ...' && KEYS_DEL='key_del ...' 
     29#fi 
    2730 
    2831### Inputs 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5683 r5685  
    103103 
    104104eval ./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m ${NEMO_HPCC} -j $NPROC \ 
    105                 add_key ${KEYS_ADD} del_key ${KEYS_DEL}                   \ 
     105                ${KEYS_ADD} ${KEYS_DEL}                                   \ 
    106106    ${stderr_redir} /dev/null 
    107107[ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out 2 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5683 r5685  
    127127    done 
    128128 
    129     [ $mesg == 'Same' ] && echo $mesg | tee -a ${FILE_INPT} 
     129    echo $mesg | tee -a ${FILE_INPT} 
    130130    [ -n "${files_list}" ] && echo 'Inputs  : '${files_list}'differ<br>' \ 
    131131   >> temp_${FILE_COMM} 
Note: See TracChangeset for help on using the changeset viewer.