Changeset 9110


Ignore:
Timestamp:
2017-12-15T19:57:15+01:00 (3 years ago)
Author:
mathiot
Message:

restore reading config from userdef instead domcfg + restore non linear drag + change processor decomposition (7x3, 4x8 and 3x5). runstat similar in all config

File:
1 edited

Legend:

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

    r9028 r9110  
    886886    . ./prepare_exe_dir.sh 
    887887    JOB_FILE=${EXE_DIR}/run_job.sh 
    888     NPROC=32 
     888    NPROC=15 
    889889    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    890890    cd ${EXE_DIR} 
     
    894894    set_namelist namelist_cfg nn_stock 48 
    895895    set_namelist namelist_cfg ln_clobber .true. 
    896     #SF come back to reading of domain_cfg for ISOMIP 
    897     #SF change after merge, when usrdef_zgr will be correct 
    898     set_namelist namelist_cfg ln_read_cfg .true. 
    899     set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
    900     #SF come back to reading of domain_cfg for ISOMIP 
     896    set_namelist namelist_cfg ln_read_cfg .false. 
    901897    set_namelist namelist_cfg ln_icebergs .false. 
    902898    set_namelist namelist_cfg ln_bergdia .false. 
    903     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    904     set_namelist namelist_cfg ln_non_lin .false. 
    905     set_namelist namelist_cfg ln_lin .true. 
    906     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    907     set_namelist namelist_cfg jpni 4 
    908     set_namelist namelist_cfg jpnj 8 
    909     set_namelist namelist_cfg jpnij 32 
     899    set_namelist namelist_cfg jpni 5 
     900    set_namelist namelist_cfg jpnj 3 
     901    set_namelist namelist_cfg jpnij 15 
    910902    if [ ${USING_MPMD} == "yes" ] ; then 
    911903       set_xio_using_server iodef.xml true 
     
    927919    set_namelist namelist_cfg nn_rstctl 2 
    928920    set_namelist namelist_cfg ln_clobber .true. 
    929     #SF come back to reading of domain_cfg for ISOMIP 
    930     #SF change after merge, when usrdef_zgr will be correct 
    931     set_namelist namelist_cfg ln_read_cfg .true. 
    932     set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
    933     #SF come back to reading of domain_cfg for ISOMIP 
     921    set_namelist namelist_cfg ln_read_cfg .false. 
    934922    set_namelist namelist_cfg ln_bergdia .false. 
    935     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    936     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    937     set_namelist namelist_cfg ln_non_lin .false. 
    938     set_namelist namelist_cfg ln_lin .true. 
    939     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    940     set_namelist namelist_cfg jpni 4 
    941     set_namelist namelist_cfg jpnj 8 
    942     set_namelist namelist_cfg jpnij 32 
     923    set_namelist namelist_cfg jpni 5 
     924    set_namelist namelist_cfg jpnj 3 
     925    set_namelist namelist_cfg jpnij 15 
    943926    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\" 
    944927    if [ ${USING_MPMD} == "yes" ] ; then 
     
    963946 
    964947    ## Reproducibility tests for ISOMIP 
    965     export TEST_NAME="REPRO_4_8" 
    966     cd ${CONFIG_DIR0} 
    967     cd ${SETTE_DIR} 
    968     . ./param.cfg 
    969     . ./all_functions.sh 
    970     . ./prepare_exe_dir.sh 
    971     JOB_FILE=${EXE_DIR}/run_job.sh 
    972     NPROC=32 
    973     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    974     cd ${EXE_DIR} 
    975     set_namelist namelist_cfg cn_exp \"ISOMIP_48\" 
     948    export TEST_NAME="REPRO_7_3" 
     949    cd ${CONFIG_DIR0} 
     950    cd ${SETTE_DIR} 
     951    . ./param.cfg 
     952    . ./all_functions.sh 
     953    . ./prepare_exe_dir.sh 
     954    JOB_FILE=${EXE_DIR}/run_job.sh 
     955    NPROC=21 
     956    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     957    cd ${EXE_DIR} 
     958    set_namelist namelist_cfg cn_exp \"ISOMIP_73\" 
    976959    set_namelist namelist_cfg nn_it000 1 
    977960    set_namelist namelist_cfg nn_itend 48 
    978961    set_namelist namelist_cfg ln_ctl .false. 
    979962    set_namelist namelist_cfg ln_clobber .true. 
    980     #SF come back to reading of domain_cfg for ISOMIP 
    981     #SF change after merge, when usrdef_zgr will be correct 
    982     set_namelist namelist_cfg ln_read_cfg .true. 
    983     set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
    984     #SF come back to reading of domain_cfg for ISOMIP 
     963    set_namelist namelist_cfg ln_read_cfg .false. 
    985964    set_namelist namelist_cfg ln_bergdia .false. 
    986     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    987     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    988     set_namelist namelist_cfg ln_non_lin .false. 
    989     set_namelist namelist_cfg ln_lin .true. 
    990     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    991     set_namelist namelist_cfg jpni 4 
    992     set_namelist namelist_cfg jpnj 8 
    993     set_namelist namelist_cfg jpnij 32 
     965    set_namelist namelist_cfg jpni 7 
     966    set_namelist namelist_cfg jpnj 3 
     967    set_namelist namelist_cfg jpnij 21 
    994968    if [ ${USING_MPMD} == "yes" ] ; then 
    995969       set_xio_using_server iodef.xml true 
     
    1014988    set_namelist namelist_cfg ln_ctl .false. 
    1015989    set_namelist namelist_cfg ln_clobber .true. 
    1016     #SF come back to reading of domain_cfg for ISOMIP 
    1017     #SF change after merge, when usrdef_zgr will be correct 
    1018     set_namelist namelist_cfg ln_read_cfg .true. 
    1019     set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
    1020     #SF come back to reading of domain_cfg for ISOMIP 
     990    set_namelist namelist_cfg ln_read_cfg .false. 
    1021991    set_namelist namelist_cfg ln_bergdia .false. 
    1022     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    1023     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    1024     set_namelist namelist_cfg ln_non_lin .false. 
    1025     set_namelist namelist_cfg ln_lin .true. 
    1026     #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    1027992    set_namelist namelist_cfg jpni 8 
    1028993    set_namelist namelist_cfg jpnj 4 
Note: See TracChangeset for help on using the changeset viewer.