Ignore:
Timestamp:
2017-12-14T10:20:02+01:00 (3 years ago)
Author:
timgraham
Message:

Fix incorrect merge in SETTE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh

    r9025 r9028  
    11881188    set_namelist 1_namelist_cfg ln_clobber .true. 
    11891189    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1190     set_namelist 1_namelist_cfg ln_linssh .true. 
     1190    set_namelist 1_namelist_cfg ln_linssh .false. 
    11911191    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    1192     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1193     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1192    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1193    set_namelist 1_namelist_cfg ln_hpg_zps .false.  
    11941194# 
    11951195    if [ ${USING_MPMD} == "yes" ] ; then 
     
    12271227    set_namelist 1_namelist_cfg ln_clobber .true. 
    12281228    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1229     set_namelist 1_namelist_cfg ln_linssh .true. 
    12301229    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    1231     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1232     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1230    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1231    set_namelist 1_namelist_cfg ln_hpg_zps .false.  
    12331232    set_namelist namelist_cfg cn_ocerst_in \"O2AGRIF_LONG_00000075_restart\" 
    12341233    set_namelist namelist_ice_cfg cn_icerst_in \"O2AGRIF_LONG_00000075_restart_ice\" 
     
    12841283    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    12851284    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    1286     set_namelist 1_namelist_cfg ln_linssh .true. 
    1287     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1288     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1285    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1286    set_namelist 1_namelist_cfg ln_hpg_zps .false.  
    12891287 
    12901288    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13231321    set_namelist 1_namelist_cfg ln_clobber .true. 
    13241322    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1325     set_namelist 1_namelist_cfg ln_linssh .true. 
    13261323    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    1327     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1328     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1324    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1325    set_namelist 1_namelist_cfg ln_hpg_zps .false.  
    13291326 
    13301327    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13601357    set_namelist namelist_cfg ln_clobber .true. 
    13611358    set_namelist namelist_cfg ln_read_cfg .true. 
    1362     set_namelist namelist_cfg ln_linssh .true. 
    1363     set_namelist namelist_cfg ln_hpg_sco .false. 
    1364     set_namelist namelist_cfg ln_hpg_zps .true.  
     1359    set_namelist namelist_cfg ln_linssh .false. 
     1360    set_namelist namelist_cfg ln_hpg_sco .true. 
     1361    set_namelist namelist_cfg ln_hpg_zps .false.  
    13651362    set_namelist namelist_cfg nn_fwb 0 
    13661363    set_namelist namelist_cfg jpni 2 
     
    14031400    set_namelist namelist_cfg ln_clobber .true. 
    14041401    set_namelist namelist_cfg ln_read_cfg .true. 
    1405     set_namelist namelist_cfg ln_linssh .true. 
    1406     set_namelist namelist_cfg ln_hpg_sco .false. 
    1407     set_namelist namelist_cfg ln_hpg_zps .true.  
     1402    set_namelist namelist_cfg ln_linssh .false. 
     1403    set_namelist namelist_cfg ln_hpg_sco .true. 
     1404    set_namelist namelist_cfg ln_hpg_zps .false.  
    14081405    set_namelist namelist_cfg nn_fwb 0 
    14091406    set_namelist namelist_cfg jpni 2 
Note: See TracChangeset for help on using the changeset viewer.