Changeset 7002


Ignore:
Timestamp:
2016-10-06T14:26:19+02:00 (4 years ago)
Author:
flavoni
Message:

update for SETTE

Location:
branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg

    r6667 r7002  
    2525&namcfg     !   parameters of the configuration    
    2626!----------------------------------------------------------------------- 
    27    ln_read_cfg = .false.   !  (=T) read the domain configuration in 'domain_cfg.nc" file 
     27   ln_read_cfg = .true.    !  (=T) read the domain configuration in 'domain_cfg.nc" file 
    2828   !                       !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    29    ln_write_cfg= .true.    !  (=T) create the domain configuration file 
     29   ln_write_cfg= .false.   !  (=T) create the domain configuration file 
    3030   ! 
    3131   cp_cfg      = "default" !  name of the configuration 
  • branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/ORCA2_SAS_LIM/cpp_ORCA2_SAS_LIM.fcm

    r7000 r7002  
    1  bld::tool::fppkeys key_trabbl key_lim2  key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi kep_mpp_rep 
     1 bld::tool::fppkeys key_trabbl key_lim2  key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_mpp_rep 
  • branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/SETTE/sette.sh

    r6985 r7002  
    138138# ORCA2_LIM3      : 7 &  8 
    139139# AMM12           : 9 & 10 
    140 # SAS             :11 & 12 
     140# SAS             :11  
    141141# ISOMIP          :13 & 14 
    142142# ORCA2_LIM_OBS   :15 
     
    144144#                  18 & 19  
    145145 
    146 for config in  1 2 3 4 7 8 9 10 11 12 15  
    147 #SF for config in  1 2 3 4 5 6 7 8 9 10 11 12 15 16 
     146for config in  1 2 3 4 5 6 7 8 9 10 11 12 15 16 
    148147 
    149148do 
     
    910909    JOB_FILE=${EXE_DIR}/run_job.sh 
    911910    NPROC=32 
    912     \rm $JOB_FILE 
     911    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    913912    cd ${EXE_DIR} 
    914913    set_namelist namelist_cfg cn_exp \"SAS\" 
     
    949948    set_namelist namelist_cfg nn_rstctl 2 
    950949    set_namelist namelist_cfg cn_ocerst_in \"SAS_00000050_restart\" 
     950    if [ ${USING_MPMD} == "yes" ] ; then 
     951       set_xio_using_server iodef.xml true 
     952    else 
     953       set_xio_using_server iodef.xml false 
     954    fi 
    951955    for (( i=1; i<=$NPROC; i++)) ; do 
    952956        L_NPROC=$(( $i - 1 )) 
     
    954958        ln -sf ../LONG/SAS_00000050_restart_${L_NPROC}.nc . 
    955959    done 
    956     if [ ${USING_MPMD} == "yes" ] ; then 
    957        set_xio_using_server iodef.xml true 
    958     else 
    959        set_xio_using_server iodef.xml false 
    960     fi 
    961960    cd ${SETTE_DIR} 
    962961    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     
    965964fi 
    966965 
    967 if [ ${config} -eq 12 ] ;  then 
    968 ## Reproducibility tests for ORCA2_SAS_LIM 
    969     export TEST_NAME="REPRO_8_4" 
    970     cd ${CONFIG_DIR} 
    971     . ./makenemo -m ${CMP_NAM} -n SAS_32 -r ORCA2_SAS_LIM -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    972     cd ${SETTE_DIR} 
    973     . ./param.cfg 
    974     . ./all_functions.sh 
    975     . ./prepare_exe_dir.sh 
    976     JOB_FILE=${EXE_DIR}/run_job.sh 
    977     NPROC=32 
    978     \rm ${JOB_FILE} 
    979     cd ${EXE_DIR} 
    980     set_namelist namelist_cfg cn_exp \"SAS\" 
    981     set_namelist namelist_cfg nn_it000 51 
    982     set_namelist namelist_cfg nn_itend 100 
    983     set_namelist namelist_cfg ln_ctl .false. 
    984     set_namelist namelist_cfg ln_clobber .true. 
    985     set_namelist namelist_cfg ln_read_cfg .true. 
    986     set_namelist namelist_cfg ln_linssh .true. 
    987     set_namelist namelist_cfg nn_fwb 0 
    988     set_namelist namelist_cfg jpni 8 
    989     set_namelist namelist_cfg jpnj 4 
    990     set_namelist namelist_cfg jpnij 32 
    991     if [ ${USING_MPMD} == "yes" ] ; then 
    992        set_xio_using_server iodef.xml true 
    993     else 
    994        set_xio_using_server iodef.xml false 
    995     fi 
    996     cd ${SETTE_DIR} 
    997     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE}  ${NUM_XIOSERVERS} 
    998     cd ${SETTE_DIR} 
    999     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1000     cd ${SETTE_DIR} 
    1001     export TEST_NAME="REPRO_4_8" 
    1002     . ./prepare_exe_dir.sh 
    1003     cd ${EXE_DIR} 
    1004     set_namelist namelist_cfg cn_exp \"SAS\" 
    1005     set_namelist namelist_cfg nn_it000 51 
    1006     set_namelist namelist_cfg nn_itend 100 
    1007     set_namelist namelist_cfg ln_ctl .false. 
    1008     set_namelist namelist_cfg ln_clobber .true. 
    1009     set_namelist namelist_cfg ln_read_cfg .true. 
    1010     set_namelist namelist_cfg ln_linssh .true. 
    1011     set_namelist namelist_cfg nn_fwb 0 
    1012     set_namelist namelist_cfg jpni 4 
    1013     set_namelist namelist_cfg jpnj 8 
    1014     set_namelist namelist_cfg jpnij 32 
    1015     if [ ${USING_MPMD} == "yes" ] ; then 
    1016        set_xio_using_server iodef.xml true 
    1017     else 
    1018        set_xio_using_server iodef.xml false 
    1019     fi 
    1020     cd ${SETTE_DIR} 
    1021     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1022     cd ${SETTE_DIR} 
    1023     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1024 fi 
    1025966# TESTS FOR ISOMIP CONFIGURATION 
    1026967if [ ${config} -eq 13 ] ;  then 
  • branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh

    r4990 r7002  
    4444# :: 
    4545# 
    46 #  $ ./Fadd_keys.sh ORCA2_LIM add_key "key_mpp_mpi key_nproci=1 key_nprocj=10" 
     46#  $ ./Fadd_keys.sh ORCA2_LIM add_key "key_mpp_rep" 
    4747# 
    4848# 
     
    6565 echo "Adding keys in : ${NEW_CONF}"  
    6666 for i in ${list_add_key} ; do 
    67    if [ "$(echo ${i} | grep -c key_nproc )" -ne 0 ] ; then 
    68       sed -e "s/key_nproc[ij]=.[0-9]* //"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp 
    69             mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm 
    70       echo " " 
    71       sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp 
    72             mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm 
    73    elif [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then 
    74    echo "key $i already present in cpp_${NEW_CONF}.fcm"  
     67   if [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then 
     68      echo "key $i already present in cpp_${NEW_CONF}.fcm"  
    7569   else 
    76    sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp 
    77    mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm 
    78    echo "added key $i in ${NEW_CONF}"  
     70      sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp 
     71      mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm 
     72      echo "added key $i in ${NEW_CONF}"  
    7973   fi 
    8074 done 
Note: See TracChangeset for help on using the changeset viewer.