Ignore:
Timestamp:
2017-12-13T19:08:59+01:00 (3 years ago)
Author:
timgraham
Message:

Resolved conflicts in SETTE (hopefully)

Location:
branches/2017/dev_merge_2017/NEMOGCM/SETTE
Files:
2 edited

Legend:

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

    r8852 r9025  
    11011101    set_namelist namelist_cfg ln_clobber .true. 
    11021102    set_namelist namelist_cfg ln_read_cfg .true. 
    1103     set_namelist namelist_cfg ln_linssh .true. 
    1104     set_namelist namelist_cfg ln_hpg_sco .false. 
    1105     set_namelist namelist_cfg ln_hpg_zps .true. 
     1103    set_namelist namelist_cfg ln_linssh .false. 
     1104    set_namelist namelist_cfg ln_hpg_sco .true. 
     1105    set_namelist namelist_cfg ln_hpg_zps .false. 
    11061106    set_namelist namelist_cfg nn_fwb 0 
    11071107    set_namelist namelist_cfg jpni 2 
     
    11161116    set_namelist 1_namelist_cfg ln_clobber .true. 
    11171117    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1118     set_namelist 1_namelist_cfg ln_linssh .true. 
    1119     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1120     set_namelist 1_namelist_cfg ln_hpg_zps .true. 
     1118    set_namelist 1_namelist_cfg ln_linssh .false. 
     1119    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1120    set_namelist 1_namelist_cfg ln_hpg_zps .false. 
    11211121# 
    11221122    if [ ${USING_MPMD} == "yes" ] ; then 
     
    11401140    set_namelist namelist_cfg ln_clobber .true. 
    11411141    set_namelist namelist_cfg ln_read_cfg .true. 
    1142     set_namelist namelist_cfg ln_linssh .true. 
    1143     set_namelist namelist_cfg ln_hpg_sco .false. 
    1144     set_namelist namelist_cfg ln_hpg_zps .true. 
     1142    set_namelist namelist_cfg ln_linssh .false. 
     1143    set_namelist namelist_cfg ln_hpg_sco .true. 
     1144    set_namelist namelist_cfg ln_hpg_zps .false. 
    11451145    set_namelist namelist_cfg nn_fwb 0 
    11461146    set_namelist namelist_cfg jpni 2 
     
    11561156    set_namelist 1_namelist_cfg ln_clobber .true. 
    11571157    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1158     set_namelist 1_namelist_cfg ln_linssh .true. 
    1159     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1160     set_namelist 1_namelist_cfg ln_hpg_zps .true. 
     1158    set_namelist 1_namelist_cfg ln_linssh .false. 
     1159    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1160    set_namelist 1_namelist_cfg ln_hpg_zps .false. 
    11611161    set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    11621162    set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
     
    11981198    set_namelist namelist_cfg ln_clobber .true. 
    11991199    set_namelist namelist_cfg ln_read_cfg .true. 
    1200     set_namelist namelist_cfg ln_linssh .true. 
    1201     set_namelist namelist_cfg ln_hpg_sco .false. 
    1202     set_namelist namelist_cfg ln_hpg_zps .true. 
     1200    set_namelist namelist_cfg ln_linssh .false. 
     1201    set_namelist namelist_cfg ln_hpg_sco .true. 
     1202    set_namelist namelist_cfg ln_hpg_zps .false. 
    12031203    set_namelist namelist_cfg nn_fwb 0 
    12041204    set_namelist namelist_cfg jpni 4 
     
    12111211    set_namelist 1_namelist_cfg ln_clobber .true. 
    12121212    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1213     set_namelist 1_namelist_cfg ln_linssh .true. 
    1214     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1215     set_namelist 1_namelist_cfg ln_hpg_zps .true. 
     1213    set_namelist 1_namelist_cfg ln_linssh .false. 
     1214    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1215    set_namelist 1_namelist_cfg ln_hpg_zps .false. 
    12161216 
    12171217    if [ ${USING_MPMD} == "yes" ] ; then 
     
    12371237    set_namelist namelist_cfg ln_clobber .true. 
    12381238    set_namelist namelist_cfg ln_read_cfg .true. 
    1239     set_namelist namelist_cfg ln_linssh .true. 
    1240     set_namelist namelist_cfg ln_hpg_sco .false. 
    1241     set_namelist namelist_cfg ln_hpg_zps .true. 
     1239    set_namelist namelist_cfg ln_linssh .false. 
     1240    set_namelist namelist_cfg ln_hpg_sco .true. 
     1241    set_namelist namelist_cfg ln_hpg_zps .false. 
    12421242    set_namelist namelist_cfg nn_fwb 0 
    12431243    set_namelist namelist_cfg jpni 2 
     
    12501250    set_namelist 1_namelist_cfg ln_clobber .true. 
    12511251    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1252     set_namelist 1_namelist_cfg ln_linssh .true. 
    1253     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1254     set_namelist 1_namelist_cfg ln_hpg_zps .true. 
     1252    set_namelist 1_namelist_cfg ln_linssh .false. 
     1253    set_namelist 1_namelist_cfg ln_hpg_sco .true. 
     1254    set_namelist 1_namelist_cfg ln_hpg_zps .false. 
    12551255 
    12561256    if [ ${USING_MPMD} == "yes" ] ; then 
     
    12851285    set_namelist namelist_cfg ln_clobber .true. 
    12861286    set_namelist namelist_cfg ln_read_cfg .true. 
    1287     set_namelist namelist_cfg ln_linssh .true. 
    1288     set_namelist namelist_cfg ln_hpg_sco .false. 
    1289     set_namelist namelist_cfg ln_hpg_zps .true.  
     1287    set_namelist namelist_cfg ln_linssh .false. 
     1288    set_namelist namelist_cfg ln_hpg_sco .true. 
     1289    set_namelist namelist_cfg ln_hpg_zps .false.  
    12901290    set_namelist namelist_cfg nn_fwb 0 
    12911291    set_namelist namelist_cfg jpni 2 
     
    13271327    set_namelist namelist_cfg ln_clobber .true. 
    13281328    set_namelist namelist_cfg ln_read_cfg .true. 
    1329     set_namelist namelist_cfg ln_linssh .true. 
    1330     set_namelist namelist_cfg ln_hpg_sco .false. 
    1331     set_namelist namelist_cfg ln_hpg_zps .true.  
     1329    set_namelist namelist_cfg ln_linssh .false. 
     1330    set_namelist namelist_cfg ln_hpg_sco .true. 
     1331    set_namelist namelist_cfg ln_hpg_zps .false.  
    13321332    set_namelist namelist_cfg nn_fwb 0 
    13331333    set_namelist namelist_cfg jpni 2 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh

    r9019 r9025  
    825825    set_namelist namelist_cfg ln_read_cfg .true. 
    826826    set_namelist namelist_cfg ln_linssh .true. 
    827     set_namelist namelist_cfg nn_fsbc 1 
    828827    set_namelist namelist_cfg nn_fwb 0 
    829828    set_namelist namelist_cfg jpni 4 
     
    850849    set_namelist namelist_cfg ln_read_cfg .true. 
    851850    set_namelist namelist_cfg ln_linssh .true. 
    852     set_namelist namelist_cfg nn_fsbc 1 
    853851    set_namelist namelist_cfg nn_fwb 0 
    854852    set_namelist namelist_cfg jpni 4 
     
    11781176    set_namelist namelist_cfg ln_clobber .true. 
    11791177    set_namelist namelist_cfg ln_read_cfg .true. 
    1180     set_namelist namelist_cfg ln_linssh .true. 
    1181     set_namelist namelist_cfg ln_hpg_sco .false. 
    1182     set_namelist namelist_cfg ln_hpg_zps .true.  
    11831178    set_namelist namelist_cfg nn_fwb 0 
    11841179    set_namelist namelist_cfg jpni 2 
     
    12181213    set_namelist namelist_cfg ln_clobber .true. 
    12191214    set_namelist namelist_cfg ln_read_cfg .true. 
    1220     set_namelist namelist_cfg ln_linssh .true. 
    1221     set_namelist namelist_cfg ln_hpg_sco .false. 
    1222     set_namelist namelist_cfg ln_hpg_zps .true.  
     1215    set_namelist namelist_cfg ln_linssh .false. 
    12231216    set_namelist namelist_cfg nn_fwb 0 
    12241217    set_namelist namelist_cfg jpni 2 
     
    12791272    set_namelist namelist_cfg ln_clobber .true. 
    12801273    set_namelist namelist_cfg ln_read_cfg .true. 
    1281     set_namelist namelist_cfg ln_linssh .true. 
    1282     set_namelist namelist_cfg ln_hpg_sco .false. 
    1283     set_namelist namelist_cfg ln_hpg_zps .true.  
     1274    set_namelist namelist_cfg ln_linssh .false. 
    12841275    set_namelist namelist_cfg nn_fwb 0 
    12851276    set_namelist namelist_cfg jpni 4 
     
    13201311    set_namelist namelist_cfg ln_clobber .true. 
    13211312    set_namelist namelist_cfg ln_read_cfg .true. 
    1322     set_namelist namelist_cfg ln_linssh .true. 
    1323     set_namelist namelist_cfg ln_hpg_sco .false. 
    1324     set_namelist namelist_cfg ln_hpg_zps .true.  
     1313    set_namelist namelist_cfg ln_linssh .false. 
    13251314    set_namelist namelist_cfg nn_fwb 0 
    13261315    set_namelist namelist_cfg jpni 2 
Note: See TracChangeset for help on using the changeset viewer.