Changeset 2725


Ignore:
Timestamp:
2011-04-06T14:07:42+02:00 (10 years ago)
Author:
rblod
Message:

Correct mistakes in sette.sh introduced during the merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/sette.sh

    r2716 r2725  
    112112#- 
    113113# Compiler among those in NEMOGCM/ARCH 
    114 CMP_NAM=$1 
     114COMPILER=gfortran_linux 
    115115 
    116116# Directory to run the tests 
     
    120120TOOLS_DIR=${MAIN_DIR}/TOOLS 
    121121COMPIL_DIR=${TOOLS_DIR}/COMPILE 
    122 # Check if a compiler has already been defined 
    123 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm ${CMP_NAM} || exit 
    124  
     122 
     123CMP_NAM=${1:-$COMPILER} 
    125124## NBTEST=6 
    126125## echo "TOTAL NUMBER OF TEST" ${NBTEST} 
     
    185184    . ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 1 LONG 
    186185     
    187     cd ${SETTE_DIR} 
    188     . ../CONFIG/makenemo -n ORCA2LIMPIS_SHORT -r ORCA2_LIM_PISCES del_key "key_dtatrc key_diatrc" 
     186#    cd ${SETTE_DIR} 
     187#    . ../CONFIG/makenemo -n ORCA2LIMPIS_SHORT -r ORCA2_LIM_PISCES del_key "key_dtatrc key_diatrc" 
    189188    cd ${SETTE_DIR} 
    190189    . param.cfg 
     
    198197    set_namelist namelist ln_clobber .true. 
    199198    set_namelist namelist cn_ocerst_in \"O2LP_LONG_00000075_restart.nc\" 
    200     set_namelist namelist_ice cn_ocerst_in \"O2LP_LONG_00000075_restart_ice.nc\" 
     199    set_namelist namelist_ice cn_icerst_in \"O2LP_LONG_00000075_restart_ice.nc\" 
    201200    set_namelist namelist_top ln_trcrad .false. 
    202201    set_namelist namelist_top ln_rsttr .true. 
     
    217216    ## Restartability tests for POMME 
    218217    cd ${SETTE_DIR} 
    219     . ../CONFIG/makenemo -m gfortran_linux -n POMME_LONG -r POMME 
     218    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_LONG -r POMME 
    220219    cd ${SETTE_DIR} 
    221220    . param.cfg 
     
    281280    ## Repropducilibity tests for ORCA2_LIM_PISCES 
    282281    cd ${SETTE_DIR} 
    283     . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LO2LPO2LP_4_4 -r ORCA2_LIM_PISCES add_key "key_mpp_mpi key_mpp_rep" del_key "key_vectopt_loop key_dtatrc key_diatrc"  
     282    . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_4_4 -r ORCA2_LIM_PISCES add_key "key_mpp_mpi key_mpp_rep" del_key "key_vectopt_loop key_dtatrc key_diatrc"  
    284283    cd ${SETTE_DIR} 
    285284    . param.cfg 
     
    304303     
    305304    cd ${SETTE_DIR} 
    306     . ../CONFIG/makenemo -n ORCA2LIMPIS_2_8 -r ORCA2_LIM_PISCES add_key "key_mpp_rep key_mpp_mpi" del_key "key_vectopt_loop key_dtatrc key_diatrc" 
     305    . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_2_8 -r ORCA2_LIM_PISCES add_key "key_mpp_rep key_mpp_mpi" del_key "key_vectopt_loop key_dtatrc key_diatrc" 
    307306    cd ${SETTE_DIR} 
    308307    . param.cfg 
     
    330329    ## Reproductibility tests for POMME 
    331330    cd ${SETTE_DIR} 
    332     . ../CONFIG/makenemo -m gfortran_linux -n POMME_1_4 -r POMME add_key "key_mpp_mpi key_mpp_rep" 
     331    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_1_4 -r POMME add_key "key_mpp_mpi key_mpp_rep" 
    333332    cd ${SETTE_DIR} 
    334333    . param.cfg 
     
    346345     
    347346    cd ${SETTE_DIR} 
    348     . ../CONFIG/makenemo -m gfortran_linux -n POMME_2_2 -r POMME add_key "key_mpp_mpi key_mpp_rep" 
     347    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_2_2 -r POMME add_key "key_mpp_mpi key_mpp_rep" 
    349348    cd ${SETTE_DIR} 
    350349    . param.cfg 
Note: See TracChangeset for help on using the changeset viewer.