Changeset 7756


Ignore:
Timestamp:
2017-03-03T14:32:40+01:00 (4 years ago)
Author:
timgraham
Message:

Modification to makenemo and sette.sh so that ORCA2_LIM3_OBS and AGRIF tests test can be built using ORCA2_LIM3_PISCES as reference config without extracting TOP_SRC code.

Location:
trunk/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/makenemo

    r7715 r7756  
    288288   echo "You are  installing a new configuration based on ${REF_CONF}" 
    289289   . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF} 
     290    elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -gt 0 ]; then 
     291        echo "You are installing an hydrid configuration based on ${REF_CONF} with components ${NEM_SUBDIR}" 
     292        . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF} 
     293        TAB=( ${NEM_SUBDIR} ) 
    290294    elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#USP_CONF} -gt 0 ]; then 
    291295   echo "You are  installing a new configuration based on the unsupported (external) ${USP_CONF}" 
  • trunk/NEMOGCM/SETTE/sette.sh

    r7753 r7756  
    985985    export TEST_NAME="REPRO_4_8" 
    986986    cd ${CONFIG_DIR0} 
    987     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3_PISCES -j 8 add_key "key_asminc" 
     987    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top" 
    988988    cd ${SETTE_DIR} 
    989989    . ./param.cfg 
     
    10981098    export TEST_NAME="SHORT" 
    10991099    cd ${CONFIG_DIR0} 
    1100     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" 
     1100    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
    11011101    cd ${SETTE_DIR} 
    11021102    . ./param.cfg 
     
    11441144    export TEST_NAME="SHORT_NOZOOM" 
    11451145    cd ${CONFIG_DIR0} 
    1146     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" 
     1146    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
    11471147    cd ${SETTE_DIR} 
    11481148    . ./param.cfg 
     
    11811181    export TEST_NAME="SHORT_NOAGRIF" 
    11821182    cd ${CONFIG_DIR0} 
    1183     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -j 8 del_key "key_zdftmx" 
     1183    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_zdftmx key_top" 
    11841184    cd ${SETTE_DIR} 
    11851185    . ./param.cfg 
     
    12191219    export TEST_NAME="LONG" 
    12201220    cd ${CONFIG_DIR0} 
    1221     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" 
     1221    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
    12221222    cd ${SETTE_DIR} 
    12231223    . ./param.cfg 
     
    13161316    export TEST_NAME="REPRO_4_4" 
    13171317    cd ${CONFIG_DIR0} 
    1318     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" 
     1318    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
    13191319    cd ${SETTE_DIR} 
    13201320    . ./param.cfg 
Note: See TracChangeset for help on using the changeset viewer.