Ignore:
Timestamp:
2017-12-13T15:58:53+01:00 (3 years ago)
Author:
timgraham
Message:

Merge of dev_CNRS_2017 into branch

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

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

    r8468 r9019  
    88module load intel/compiler/64/14.0/2013_sp1.2.144 
    99module load openmpi/intel/64/1.6.5 
    10 module load slurm/2.5.7 
     10module load slurm/16.05.8 
    1111 
    1212# 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/README

    r7646 r9019  
    4545               INPUT_DIR         : directory in which store input files (tar file) 
    4646               TMPDIR            : temporary directory NEEDED ONLY FOR IBM machines (put EXP00 directory) 
    47           NEMO_VALIDATION_DIR : directory in which create NEMO_VALIDATION tree, and store restart, solver.stat, tracer.stat and ocean.output files in 
     47          NEMO_VALIDATION_DIR : directory in which create NEMO_VALIDATION tree, and store restart, run.stat, tracer.stat and ocean.output files in 
    4848                            tree NEMO_VALIDATION_DIR/WCONFIG_NAME/WCOMPILER_NAME/TEST_NAME/REVISION_NUMBER(or DATE) 
    4949 in fcm_job.sh : 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh

    r8468 r9019  
    220220    fi 
    221221    # Save output & debug files in NEMO_VALIDATION tree 
    222     echo "saving ocean & ice output, solver.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
     222    echo "saving ocean & ice output, run.stat, tracer.stat files ...." >> ${SETTE_DIR}/output.sette 
    223223    echo "            " >> ${SETTE_DIR}/output.sette 
    224224    [ -f ${EXE_DIR}/ocean.output ] && cp ${EXE_DIR}/*ocean.output ${NEMO_VALID}/. 
    225     [ -f ${EXE_DIR}/solver.stat ] && cp ${EXE_DIR}/*solver.stat ${NEMO_VALID}/. 
     225    [ -f ${EXE_DIR}/run.stat ] && cp ${EXE_DIR}/*run.stat ${NEMO_VALID}/. 
    226226    [ -f ${EXE_DIR}/output.namelist.dyn ] && cp ${EXE_DIR}/*output.nam* ${NEMO_VALID}/. 
    227227    [ -f ${EXE_DIR}/tracer.stat ] && cp ${EXE_DIR}/*tracer.stat ${NEMO_VALID}/. 
    228228 
    229     if [ -n "$(ls ${NEMO_VALID}/*solver*)" ] ; then 
    230    echo "moved solver.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    231    echo "moved solver.stat in ${NEMO_VALID} directory"   
     229    if [ -n "$(ls ${NEMO_VALID}/*run*)" ] ; then 
     230   echo "moved run.stat in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     231   echo "moved run.stat in ${NEMO_VALID} directory"   
    232232    else 
    233    echo "problem in looking for solver.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
    234    echo "solver.stat IS NOT in ${NEMO_VALID} directory"  
     233   echo "problem in looking for run.stat file in ${NEMO_VALID} directory"  >> ${SETTE_DIR}/output.sette 
     234   echo "run.stat IS NOT in ${NEMO_VALID} directory"  
    235235    fi 
    236236    if [ -n "$(ls ${NEMO_VALID}/*ocean.output*)" ] ; then 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/param.cfg

    r7646 r9019  
    11#- forcing files storing 
    2 FORCING_DIR=~/FORCING 
     2FORCING_DIR=/workgpfs/rech/omr/romr009/FORCING 
    33#- input files storing 
    44INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
     
    66#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    77#- VALIDATION files storing 
    8 NEMO_VALIDATION_DIR=~/NEMO_VALIDATION_DIR 
     8NEMO_VALIDATION_DIR=/workgpfs/rech/omr/romr009/CNRS_merge_2017 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh

    r8830 r9019  
    5656#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5757#   post_test_tidyup : creates validation storage directory and copies required output files  
    58 #                      (solver.stat and ocean.output) in it after execution of test. 
     58#                      (run.stat and ocean.output) in it after execution of test. 
    5959# 
    6060#  VALIDATION tree is: 
     
    133133cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    134134# Description of configuration tested: 
    135 # GYRE_PISCES       :  1 &  2 
    136 # ORCA2_LIM3_PISCES :  3 &  4 
    137 # ORCA2_OFF_PISCES  :  5 &  6 
    138 # AMM12             :  7 &  8  
    139 # SAS               :  9     fos SAS there is no solver so is useless to test REPRO 
    140 # ISOMIP            : 10 & 11 
    141 # ORCA2_LIM3_OBS    : 12 
    142 # ORCA2_AGRIF_LIM3  : 13 & 14  
    143 #                     15 & 16  
    144  
    145 for config in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
     135# GYRE_PISCES       :  1  
     136# ORCA2_LIM3_PISCES :  2  
     137# ORCA2_OFF_PISCES  :  3  
     138# AMM12             :  4  
     139# SAS               :  5     fos SAS there is no run.stat so is useless to test REPRO 
     140# ISOMIP            :  6 
     141# ORCA2_LIM3_OBS    :  7 
     142# ORCA2_AGRIF_LIM3  :  8  
     143# ORCA2AGR          :  9 & 10  AGRIF active with no zoom, compared to no AGRIF cpp key 
     144 
     145for config in 1 2 3 4 5 6 7 8 9 10 
    146146do 
    147147 
     
    151151    export TEST_NAME="LONG" 
    152152    cd ${CONFIG_DIR0} 
    153     . ./makenemo -m ${CMP_NAM} -n GYREPIS_LONG -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
     153    . ./makenemo -m ${CMP_NAM} -n GYREPIS_ST -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
    154154    cd ${SETTE_DIR} 
    155155    . ./param.cfg 
     
    220220    cd ${SETTE_DIR} 
    221221    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    222 fi 
    223  
    224 if [ ${config} -eq 2 ] ;  then 
     222 
    225223    ## Reproducibility tests for GYRE_PISCES 
    226224    export TEST_NAME="REPRO_4_8" 
    227225    cd ${CONFIG_DIR0} 
    228     . ./makenemo -m ${CMP_NAM} -n GYREPIS_32 -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
    229226    cd ${SETTE_DIR} 
    230227    . ./param.cfg 
     
    287284 
    288285# TESTS FOR ORCA2_LIM3_PISCES CONFIGURATION 
    289 if [ ${config} -eq 3 ] ;  then 
     286if [ ${config} -eq 2 ] ;  then 
    290287    ## Restartability tests for ORCA2_LIM3_PISCES 
    291288    export TEST_NAME="LONG" 
    292289    cd ${CONFIG_DIR0} 
    293     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_LONG -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
     290    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_ST -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
    294291    cd ${SETTE_DIR} 
    295292    . ./param.cfg 
     
    311308    set_namelist namelist_cfg jpnj 8 
    312309    set_namelist namelist_cfg jpnij 32 
     310    set_namelist namelist_ice_cfg ln_icediachk .true. 
     311##    set_namelist namelist_ice_cfg ln_icediahsb .true. 
    313312    set_namelist namelist_top_cfg ln_trcdta .false. 
    314313    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    349348    set_namelist namelist_cfg jpnj 8 
    350349    set_namelist namelist_cfg jpnij 32 
     350    set_namelist namelist_ice_cfg ln_icediachk .true. 
     351##    set_namelist namelist_ice_cfg ln_icediahsb .true. 
    351352    set_namelist namelist_top_cfg ln_rsttr .true. 
    352353    set_namelist namelist_top_cfg nn_rsttr 2 
    353354    set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000075_restart\" 
     355    set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000075_restart_trc\" 
    354356    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000075_restart_ice\" 
    355     set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000075_restart_trc\" 
    356357    # put ln_ironsed, ln_river, ln_ndepo, ln_dust 
    357358    # if not you need input files, and for tests is not necessary 
     
    384385    cd ${SETTE_DIR} 
    385386    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    386 fi 
    387  
    388 if [ ${config} -eq 4 ] ;  then 
     387 
    389388    ## Reproducibility tests for ORCA2_LIM3_PISCES 
    390389    export TEST_NAME="REPRO_4_8" 
    391390    cd ${CONFIG_DIR0} 
    392     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_32 -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
    393     cd ${SETTE_DIR} 
    394     . ./param.cfg 
    395     . ./all_functions.sh 
    396     . ./prepare_exe_dir.sh 
    397     JOB_FILE=${EXE_DIR}/run_job.sh 
    398     NPROC=32 
    399     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    400     cd ${EXE_DIR} 
     391    cd ${SETTE_DIR} 
     392    . ./param.cfg 
     393    . ./all_functions.sh 
     394    . ./prepare_exe_dir.sh 
     395    JOB_FILE=${EXE_DIR}/run_job.sh 
     396    NPROC=32 
     397    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     398    cd ${EXE_DIR} 
     399    set_namelist namelist_cfg cn_exp \"O2L3P_48\" 
    401400    set_namelist namelist_cfg nn_it000 1 
    402401    set_namelist namelist_cfg nn_itend 75 
     
    410409    set_namelist namelist_cfg jpnj 8 
    411410    set_namelist namelist_cfg jpnij 32 
     411    set_namelist namelist_ice_cfg ln_icediachk .true. 
     412    set_namelist namelist_ice_cfg ln_icediahsb .true. 
    412413    set_namelist namelist_top_cfg ln_trcdta .false. 
    413414    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    441442    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    442443    cd ${EXE_DIR} 
     444    set_namelist namelist_cfg cn_exp \"O2L3P_84\" 
    443445    set_namelist namelist_cfg nn_it000 1 
    444446    set_namelist namelist_cfg nn_itend 75 
     
    451453    set_namelist namelist_cfg jpnj 4 
    452454    set_namelist namelist_cfg jpnij 32 
     455    set_namelist namelist_ice_cfg ln_icediachk .true. 
     456    set_namelist namelist_ice_cfg ln_icediahsb .true. 
    453457    set_namelist namelist_top_cfg ln_trcdta .false. 
    454458    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
     
    477481 
    478482# TESTS FOR ORCA2_OFF_PISCES CONFIGURATION 
    479 if [ ${config} -eq 5 ] ;  then 
     483if [ ${config} -eq 3 ] ;  then 
    480484    ## Restartability tests for ORCA2_OFF_PISCES 
    481485    export TEST_NAME="LONG" 
    482486    cd ${CONFIG_DIR0} 
    483     . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
     487    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_ST -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
    484488    cd ${SETTE_DIR} 
    485489    . ./param.cfg 
     
    566570    cd ${SETTE_DIR} 
    567571    . ./fcm_job.sh $NPROC  ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    568 fi 
    569  
    570 if [ ${config} -eq 6 ] ;  then 
     572 
    571573    ## Reproducibility tests for ORCA2_OFF_PISCES 
    572574    export TEST_NAME="REPRO_4_8" 
    573575    cd ${CONFIG_DIR0} 
    574     . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_32 -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
    575     cd ${SETTE_DIR} 
    576     . ./param.cfg 
    577     . ./all_functions.sh 
    578     . ./prepare_exe_dir.sh 
    579     JOB_FILE=${EXE_DIR}/run_job.sh 
    580     NPROC=32 
    581     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    582     cd ${EXE_DIR} 
     576    cd ${SETTE_DIR} 
     577    . ./param.cfg 
     578    . ./all_functions.sh 
     579    . ./prepare_exe_dir.sh 
     580    JOB_FILE=${EXE_DIR}/run_job.sh 
     581    NPROC=32 
     582    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     583    cd ${EXE_DIR} 
     584    set_namelist namelist_cfg cn_exp \"OFFP_48\" 
    583585    set_namelist namelist_cfg nn_it000 1 
    584586    set_namelist namelist_cfg nn_itend 40 
     
    621623    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    622624    cd ${EXE_DIR} 
     625    set_namelist namelist_cfg cn_exp \"OFFP_84\" 
    623626    set_namelist namelist_cfg nn_it000 1 
    624627    set_namelist namelist_cfg nn_itend 40 
     
    656659 
    657660# TESTS FOR AMM12 CONFIGURATION 
    658 if [ ${config} -eq 7 ] ;  then 
     661if [ ${config} -eq 4 ] ;  then 
    659662    ## Restartability tests for AMM12 
    660663    export TEST_NAME="LONG" 
    661664    cd ${CONFIG_DIR0} 
    662     . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 del_key ${DEL_KEYS} 
    663     cd ${SETTE_DIR} 
    664     . ./param.cfg 
    665     . ./all_functions.sh 
    666     . ./prepare_exe_dir.sh 
    667     JOB_FILE=${EXE_DIR}/run_job.sh 
    668     NPROC=32 
    669     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    670     cd ${EXE_DIR} 
     665    . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 del_key ${DEL_KEYS} 
     666    cd ${SETTE_DIR} 
     667    . ./param.cfg 
     668    . ./all_functions.sh 
     669    . ./prepare_exe_dir.sh 
     670    JOB_FILE=${EXE_DIR}/run_job.sh 
     671    NPROC=32 
     672    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     673    cd ${EXE_DIR} 
     674    set_namelist namelist_cfg cn_exp \"AMM12_LONG\" 
    671675    set_namelist namelist_cfg nn_it000 1 
    672676    set_namelist namelist_cfg nn_itend 576 
     
    677681    set_namelist namelist_cfg ln_read_cfg .true. 
    678682    set_namelist namelist_cfg ln_linssh .false. 
     683##SF  
     684    set_namelist namelist_cfg ln_lin .true. 
     685    set_namelist namelist_cfg ln_loglayer .false. 
     686##SF 
    679687    set_namelist namelist_cfg jpni 4 
    680688    set_namelist namelist_cfg jpnj 8 
     
    692700    . ./prepare_exe_dir.sh 
    693701    cd ${EXE_DIR} 
     702    set_namelist namelist_cfg cn_exp \"AMM12_SHORT\" 
    694703    set_namelist namelist_cfg nn_it000 289 
    695704    set_namelist namelist_cfg nn_itend 576 
     
    699708    set_namelist namelist_cfg ln_read_cfg .true. 
    700709    set_namelist namelist_cfg ln_linssh .false. 
     710##SF  
     711    set_namelist namelist_cfg ln_lin .true. 
     712    set_namelist namelist_cfg ln_loglayer .false. 
     713##SF 
    701714    set_namelist namelist_cfg jpni 4 
    702715    set_namelist namelist_cfg jpnj 8 
     
    704717    set_namelist namelist_cfg ln_rstart .true. 
    705718    set_namelist namelist_cfg nn_rstctl 2 
    706     set_namelist namelist_cfg cn_ocerst_in \"AMM12_00000288_restart_oce_out\" 
     719    set_namelist namelist_cfg cn_ocerst_in \"AMM12_LONG_00000288_restart\" 
    707720    set_namelist namelist_cfg nn_date0 20120102 
    708721    for (( i=1; i<=$NPROC; i++)) ; do 
    709722        L_NPROC=$(( $i - 1 )) 
    710723        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    711         ln -sf ../LONG/AMM12_00000288_restart_oce_out_${L_NPROC}.nc . 
     724        ln -sf ../LONG/AMM12_LONG_00000288_restart_${L_NPROC}.nc . 
    712725    done 
    713726    if [ ${USING_MPMD} == "yes" ] ; then 
     
    720733    cd ${SETTE_DIR} 
    721734    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    722 fi 
    723  
    724 if [ ${config} -eq 8 ] ;  then 
     735 
    725736## Reproducibility tests for AMM12 
    726737    export TEST_NAME="REPRO_8_4" 
    727738    cd ${CONFIG_DIR0} 
    728     . ./makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 del_key ${DEL_KEYS} 
    729     cd ${SETTE_DIR} 
    730     . ./param.cfg 
    731     . ./all_functions.sh 
    732     . ./prepare_exe_dir.sh 
    733     JOB_FILE=${EXE_DIR}/run_job.sh 
    734     NPROC=32 
    735     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    736     cd ${EXE_DIR} 
     739    cd ${SETTE_DIR} 
     740    . ./param.cfg 
     741    . ./all_functions.sh 
     742    . ./prepare_exe_dir.sh 
     743    JOB_FILE=${EXE_DIR}/run_job.sh 
     744    NPROC=32 
     745    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     746    cd ${EXE_DIR} 
     747    set_namelist namelist_cfg cn_exp \"AMM12_84\" 
    737748    set_namelist namelist_cfg nn_it000 1 
    738749    set_namelist namelist_cfg nn_itend 576 
     
    742753    set_namelist namelist_cfg ln_read_cfg .true. 
    743754    set_namelist namelist_cfg ln_linssh .false. 
     755##SF  
     756    set_namelist namelist_cfg ln_lin .true. 
     757    set_namelist namelist_cfg ln_loglayer .false. 
     758##SF 
    744759    set_namelist namelist_cfg jpni 8 
    745760    set_namelist namelist_cfg jpnj 4 
     
    761776    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    762777    cd ${EXE_DIR} 
     778    set_namelist namelist_cfg cn_exp \"AMM12_48\" 
    763779    set_namelist namelist_cfg nn_it000 1 
    764780    set_namelist namelist_cfg nn_itend 576 
     
    768784    set_namelist namelist_cfg ln_read_cfg .true. 
    769785    set_namelist namelist_cfg ln_linssh .false. 
     786##SF  
     787    set_namelist namelist_cfg ln_lin .true. 
     788    set_namelist namelist_cfg ln_loglayer .false. 
     789##SF 
    770790    set_namelist namelist_cfg jpni 4 
    771791    set_namelist namelist_cfg jpnj 8 
     
    784804 
    785805# TESTS FOR ORCA2_SAS_LIM3 CONFIGURATION 
    786 if [ ${config} -eq 9 ] ;  then 
     806if [ ${config} -eq 5 ] ;  then 
    787807    ## Restartability tests for SAS 
    788808    export TEST_NAME="LONG" 
    789809    cd ${CONFIG_DIR0} 
    790     . ./makenemo -m ${CMP_NAM} -n SAS_LONG -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
     810    . ./makenemo -m ${CMP_NAM} -n SAS_ST -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
    791811    cd ${SETTE_DIR} 
    792812    . ./param.cfg 
     
    810830    set_namelist namelist_cfg jpnj 8 
    811831    set_namelist namelist_cfg jpnij 32 
     832    set_namelist namelist_ice_cfg ln_icediachk .true. 
    812833    if [ ${USING_MPMD} == "yes" ] ; then 
    813834       set_xio_using_server iodef.xml true 
     
    836857    set_namelist namelist_cfg ln_rstart .true. 
    837858    set_namelist namelist_cfg nn_rstctl 2 
    838     set_namelist namelist_cfg nn_date0 010106 
     859    set_namelist namelist_cfg nn_date0 010109 
    839860    set_namelist namelist_cfg cn_ocerst_in \"SAS_00000120_restart\" 
    840861    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_00000120_restart_ice\" 
     
    857878 
    858879# TESTS FOR ISOMIP CONFIGURATION 
    859 if [ ${config} -eq 10 ] ;  then 
     880if [ ${config} -eq 6 ] ;  then 
    860881    ## Restartability tests for ISOMIP 
    861882    export TEST_NAME="LONG" 
    862883    cd ${CONFIG_DIR0} 
    863     . ./makenemo -m ${CMP_NAM} -n ISOMIP_LONG -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
     884    . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
    864885    cd ${SETTE_DIR} 
    865886    . ./param.cfg 
     
    875896    set_namelist namelist_cfg nn_stock 48 
    876897    set_namelist namelist_cfg ln_clobber .true. 
    877     set_namelist namelist_cfg ln_read_cfg .false. 
     898    #SF come back to reading of domain_cfg for ISOMIP 
     899    #SF change after merge, when usrdef_zgr will be correct 
     900    set_namelist namelist_cfg ln_read_cfg .true. 
     901    set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
     902    #SF come back to reading of domain_cfg for ISOMIP 
     903    set_namelist namelist_cfg ln_icebergs .false. 
     904    set_namelist namelist_cfg ln_bergdia .false. 
     905    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     906    set_namelist namelist_cfg ln_non_lin .false. 
     907    set_namelist namelist_cfg ln_lin .true. 
     908    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    878909    set_namelist namelist_cfg jpni 4 
    879910    set_namelist namelist_cfg jpnj 8 
     
    898929    set_namelist namelist_cfg nn_rstctl 2 
    899930    set_namelist namelist_cfg ln_clobber .true. 
    900     set_namelist namelist_cfg ln_read_cfg .false. 
     931    #SF come back to reading of domain_cfg for ISOMIP 
     932    #SF change after merge, when usrdef_zgr will be correct 
     933    set_namelist namelist_cfg ln_read_cfg .true. 
     934    set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
     935    #SF come back to reading of domain_cfg for ISOMIP 
     936    set_namelist namelist_cfg ln_bergdia .false. 
     937    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     938    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     939    set_namelist namelist_cfg ln_non_lin .false. 
     940    set_namelist namelist_cfg ln_lin .true. 
     941    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    901942    set_namelist namelist_cfg jpni 4 
    902943    set_namelist namelist_cfg jpnj 8 
     
    922963    cd ${SETTE_DIR} 
    923964    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    924 fi 
    925 if [ ${config} -eq 11 ] ;  then 
     965 
    926966    ## Reproducibility tests for ISOMIP 
    927967    export TEST_NAME="REPRO_4_8" 
    928968    cd ${CONFIG_DIR0} 
    929     . ./makenemo -m ${CMP_NAM} -n ISOMIP_32 -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
    930     cd ${SETTE_DIR} 
    931     . ./param.cfg 
    932     . ./all_functions.sh 
    933     . ./prepare_exe_dir.sh 
    934     JOB_FILE=${EXE_DIR}/run_job.sh 
    935     NPROC=32 
    936     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    937     cd ${EXE_DIR} 
    938     set_namelist namelist_cfg cn_exp \"ISOMIP_14\" 
     969    cd ${SETTE_DIR} 
     970    . ./param.cfg 
     971    . ./all_functions.sh 
     972    . ./prepare_exe_dir.sh 
     973    JOB_FILE=${EXE_DIR}/run_job.sh 
     974    NPROC=32 
     975    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     976    cd ${EXE_DIR} 
     977    set_namelist namelist_cfg cn_exp \"ISOMIP_48\" 
    939978    set_namelist namelist_cfg nn_it000 1 
    940979    set_namelist namelist_cfg nn_itend 48 
    941980    set_namelist namelist_cfg ln_ctl .false. 
    942981    set_namelist namelist_cfg ln_clobber .true. 
    943     set_namelist namelist_cfg ln_read_cfg .false. 
     982    #SF come back to reading of domain_cfg for ISOMIP 
     983    #SF change after merge, when usrdef_zgr will be correct 
     984    set_namelist namelist_cfg ln_read_cfg .true. 
     985    set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
     986    #SF come back to reading of domain_cfg for ISOMIP 
     987    set_namelist namelist_cfg ln_bergdia .false. 
     988    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     989    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     990    set_namelist namelist_cfg ln_non_lin .false. 
     991    set_namelist namelist_cfg ln_lin .true. 
     992    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    944993    set_namelist namelist_cfg jpni 4 
    945994    set_namelist namelist_cfg jpnj 8 
     
    9621011    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    9631012    cd ${EXE_DIR} 
    964     set_namelist namelist_cfg cn_exp \"ISOMIP_22\" 
     1013    set_namelist namelist_cfg cn_exp \"ISOMIP_84\" 
    9651014    set_namelist namelist_cfg nn_it000 1 
    9661015    set_namelist namelist_cfg nn_itend 48 
    9671016    set_namelist namelist_cfg ln_ctl .false. 
    9681017    set_namelist namelist_cfg ln_clobber .true. 
    969     set_namelist namelist_cfg ln_read_cfg .false. 
     1018    #SF come back to reading of domain_cfg for ISOMIP 
     1019    #SF change after merge, when usrdef_zgr will be correct 
     1020    set_namelist namelist_cfg ln_read_cfg .true. 
     1021    set_namelist namelist_cfg cn_domcfg ISOMIP_zps_domcfg 
     1022    #SF come back to reading of domain_cfg for ISOMIP 
     1023    set_namelist namelist_cfg ln_bergdia .false. 
     1024    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     1025    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
     1026    set_namelist namelist_cfg ln_non_lin .false. 
     1027    set_namelist namelist_cfg ln_lin .true. 
     1028    #SF TO BE REMOVED AFTER BUG CORRECTION OF ln_not_lin drg 
    9701029    set_namelist namelist_cfg jpni 8 
    9711030    set_namelist namelist_cfg jpnj 4 
     
    9851044## Test assimilation interface code, OBS and ASM for reproducibility 
    9861045## Restartability not tested (ASM code not restartable while increments are being applied) 
    987 if [ ${config} -eq 12 ] ; then 
     1046if [ ${config} -eq 7 ] ; then 
    9881047   ## Reproducibility tests for ORCA2_LIM3_OBS 
    9891048    export TEST_NAME="REPRO_4_8" 
    9901049    cd ${CONFIG_DIR0} 
    991     . ./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" 
    992     cd ${SETTE_DIR} 
    993     . ./param.cfg 
    994     . ./all_functions.sh 
    995     . ./prepare_exe_dir.sh 
    996     JOB_FILE=${EXE_DIR}/run_job.sh 
    997     NPROC=32 
    998     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    999     cd ${EXE_DIR} 
     1050    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top" 
     1051    cd ${SETTE_DIR} 
     1052    . ./param.cfg 
     1053    . ./all_functions.sh 
     1054    . ./prepare_exe_dir.sh 
     1055    JOB_FILE=${EXE_DIR}/run_job.sh 
     1056    NPROC=32 
     1057    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1058    cd ${EXE_DIR} 
     1059    set_namelist namelist_cfg cn_exp \"O2L3OBS_48\" 
    10001060    set_namelist namelist_cfg nn_it000 1 
    10011061    set_namelist namelist_cfg nn_itend 75 
     
    10511111    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    10521112    cd ${EXE_DIR} 
     1113    set_namelist namelist_cfg cn_exp \"O2L3OBS_84\" 
    10531114    set_namelist namelist_cfg nn_it000 1 
    10541115    set_namelist namelist_cfg nn_itend 75 
     
    10971158    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    10981159fi 
    1099 # TEST FOR ORCA2_LIM3_AGRIF : simple test of running AGRIF (no restartability neither reproducibility tests) 
    1100 if [ ${config} -eq 13 ] ;  then 
    1101     ## ORCA2_LIM3 with Agulhas AGRIF zoom in MPI 
    1102     export TEST_NAME="SHORT" 
    1103     cd ${CONFIG_DIR0} 
    1104     . ./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" 
    1105     cd ${SETTE_DIR} 
    1106     . ./param.cfg 
    1107     . ./all_functions.sh 
    1108     . ./prepare_exe_dir.sh 
    1109     JOB_FILE=${EXE_DIR}/run_job.sh 
    1110     NPROC=2 
    1111     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1112     cd ${EXE_DIR} 
    1113     set_namelist namelist_cfg nn_it000 1 
    1114     set_namelist namelist_cfg nn_itend 75 
    1115     set_namelist namelist_cfg ln_ctl .false. 
    1116     set_namelist namelist_cfg ln_clobber .true. 
    1117     set_namelist namelist_cfg ln_read_cfg .true. 
    1118     set_namelist namelist_cfg ln_linssh .true. 
    1119     set_namelist namelist_cfg ln_hpg_sco .false. 
    1120     set_namelist namelist_cfg ln_hpg_zps .true.  
    1121     set_namelist namelist_cfg nn_fwb 0 
    1122     set_namelist namelist_cfg jpni 1 
    1123     set_namelist namelist_cfg jpnj 2 
    1124     set_namelist namelist_cfg jpnij 2 
    1125     set_namelist 1_namelist_cfg nn_it000 1 
    1126     set_namelist 1_namelist_cfg nn_itend 150 
    1127     set_namelist 1_namelist_cfg ln_ctl .false. 
    1128     set_namelist 1_namelist_cfg ln_clobber .true. 
    1129     set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1130     set_namelist 1_namelist_cfg ln_linssh .true. 
    1131     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1132     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    1133     if [ ${USING_MPMD} == "yes" ] ; then 
    1134        set_xio_using_server iodef.xml true 
    1135     else 
    1136        set_xio_using_server iodef.xml false 
    1137     fi 
    1138     cd ${SETTE_DIR} 
    1139     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1140     cd ${SETTE_DIR} 
    1141     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1142 fi 
    1143  
    1144 # test code corruption with AGRIF 
    1145 # Compile and run with or without AGRIF ORCA2_LIM3 
    1146 if [ ${config} -eq 14 ] ;  then 
    1147     # First run same as 15 but without zoom 
    1148     export TEST_NAME="SHORT_NOZOOM" 
    1149     cd ${CONFIG_DIR0} 
    1150     . ./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" 
     1160# TEST FOR ORCA2_LIM3_AGRIF : AGULHAS AGRIF 
     1161if [ ${config} -eq 8 ] ;  then 
     1162## Restartability tests 
     1163    export TEST_NAME="LONG" 
     1164    cd ${CONFIG_DIR0} 
     1165    . ./makenemo -m ${CMP_NAM} -n ORCA2AGR_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
    11511166    cd ${SETTE_DIR} 
    11521167    . ./param.cfg 
     
    11571172    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    11581173    cd ${EXE_DIR} 
    1159     set_namelist namelist_cfg nn_it000 1 
    1160     set_namelist namelist_cfg nn_itend 75 
    1161     set_namelist namelist_cfg ln_ctl .false. 
     1174    set_namelist namelist_cfg cn_exp \"O2AGRIF_LONG\" 
     1175    set_namelist namelist_cfg nn_it000 1 
     1176    set_namelist namelist_cfg nn_itend 150 
     1177    set_namelist namelist_cfg nn_stock 75 
    11621178    set_namelist namelist_cfg ln_clobber .true. 
    11631179    set_namelist namelist_cfg ln_read_cfg .true. 
     
    11691185    set_namelist namelist_cfg jpnj 2 
    11701186    set_namelist namelist_cfg jpnij 4 
    1171 #  
    1172 #   Set the number of fine grids to zero:     
    1173     sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
    1174  
    1175     if [ ${USING_MPMD} == "yes" ] ; then 
    1176        set_xio_using_server iodef.xml true 
    1177     else 
    1178        set_xio_using_server iodef.xml false 
    1179     fi 
    1180     cd ${SETTE_DIR} 
    1181     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1182     cd ${SETTE_DIR} 
    1183     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1184  
    1185     export TEST_NAME="SHORT_NOAGRIF" 
    1186     cd ${CONFIG_DIR0} 
    1187     . ./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" 
    1188     cd ${SETTE_DIR} 
    1189     . ./param.cfg 
    1190     . ./all_functions.sh 
    1191     . ./prepare_exe_dir.sh 
    1192     JOB_FILE=${EXE_DIR}/run_job.sh 
    1193     NPROC=4 
    1194     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1195     cd ${EXE_DIR} 
    1196     set_namelist namelist_cfg nn_it000 1 
    1197     set_namelist namelist_cfg nn_itend 75 
    1198     set_namelist namelist_cfg ln_ctl .false. 
    1199     set_namelist namelist_cfg ln_clobber .true. 
    1200     set_namelist namelist_cfg ln_read_cfg .true. 
    1201     set_namelist namelist_cfg ln_linssh .true. 
    1202     set_namelist namelist_cfg ln_hpg_sco .false. 
    1203     set_namelist namelist_cfg ln_hpg_zps .true.  
    1204     set_namelist namelist_cfg nn_fwb 0 
    1205     set_namelist namelist_cfg jpni 2 
    1206     set_namelist namelist_cfg jpnj 2 
    1207     set_namelist namelist_cfg jpnij 4 
    1208 # 
    1209     if [ ${USING_MPMD} == "yes" ] ; then 
    1210        set_xio_using_server iodef.xml true 
    1211     else 
    1212        set_xio_using_server iodef.xml false 
    1213     fi 
    1214     cd ${SETTE_DIR} 
    1215     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1216     cd ${SETTE_DIR} 
    1217     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1218  
    1219 fi 
    1220  
    1221 ## Restartability tests for ORCA2_LIM3_AGRIF  
    1222 if [ ${config} -eq 15 ] ;  then 
    1223     export TEST_NAME="LONG" 
    1224     cd ${CONFIG_DIR0} 
    1225     . ./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 key_zdftmx" del_key "key_zdftmx_new key_top" 
    1226     cd ${SETTE_DIR} 
    1227     . ./param.cfg 
    1228     . ./all_functions.sh 
    1229     . ./prepare_exe_dir.sh 
    1230     JOB_FILE=${EXE_DIR}/run_job.sh 
    1231     NPROC=4 
    1232     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1233     cd ${EXE_DIR} 
    1234     set_namelist namelist_cfg cn_exp \"O2LP_LONG\" 
    1235     set_namelist namelist_cfg nn_it000 1 
    1236     set_namelist namelist_cfg nn_itend 150 
    1237     set_namelist namelist_cfg nn_stock 75 
    1238     set_namelist namelist_cfg ln_clobber .true. 
    1239     set_namelist namelist_cfg ln_read_cfg .true. 
    1240     set_namelist namelist_cfg ln_linssh .true. 
    1241     set_namelist namelist_cfg ln_hpg_sco .false. 
    1242     set_namelist namelist_cfg ln_hpg_zps .true.  
    1243     set_namelist namelist_cfg nn_fwb 0 
    1244     set_namelist namelist_cfg jpni 2 
    1245     set_namelist namelist_cfg jpnj 2 
    1246     set_namelist namelist_cfg jpnij 4 
    1247     set_namelist 1_namelist_cfg cn_exp \"O2LP_LONG\" 
     1187    set_namelist 1_namelist_cfg cn_exp \"O2AGRIF_LONG\" 
    12481188    set_namelist 1_namelist_cfg nn_it000 1 
    12491189    set_namelist 1_namelist_cfg nn_itend 300 
     
    12541194    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    12551195    set_namelist 1_namelist_cfg ln_linssh .true. 
     1196    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    12561197    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    12571198    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     
    12691210    . ./prepare_exe_dir.sh 
    12701211    cd ${EXE_DIR} 
    1271     set_namelist namelist_cfg cn_exp \"O2LP_SHORT\" 
     1212    set_namelist namelist_cfg cn_exp \"O2AGRIF_SHORT\" 
    12721213    set_namelist namelist_cfg nn_it000 76 
    12731214    set_namelist namelist_cfg nn_itend 150 
     
    12841225    set_namelist namelist_cfg jpnj 2 
    12851226    set_namelist namelist_cfg jpnij 4 
    1286     set_namelist 1_namelist_cfg cn_exp \"O2LP_SHORT\" 
     1227    set_namelist 1_namelist_cfg cn_exp \"O2AGRIF_SHORT\" 
    12871228    set_namelist 1_namelist_cfg nn_it000 151 
    12881229    set_namelist 1_namelist_cfg nn_itend 300 
     
    12941235    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    12951236    set_namelist 1_namelist_cfg ln_linssh .true. 
     1237    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    12961238    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    12971239    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    1298     set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    1299     set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
    1300     set_namelist 1_namelist_cfg cn_ocerst_in \"O2LP_LONG_00000150_restart\" 
    1301     set_namelist 1_namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000150_restart_ice\" 
     1240    set_namelist namelist_cfg cn_ocerst_in \"O2AGRIF_LONG_00000075_restart\" 
     1241    set_namelist namelist_ice_cfg cn_icerst_in \"O2AGRIF_LONG_00000075_restart_ice\" 
     1242    set_namelist 1_namelist_cfg cn_ocerst_in \"O2AGRIF_LONG_00000150_restart\" 
     1243    set_namelist 1_namelist_ice_cfg cn_icerst_in \"O2AGRIF_LONG_00000150_restart_ice\" 
    13021244 
    13031245    for (( i=1; i<=$NPROC; i++)) ; do 
    13041246        L_NPROC=$(( $i - 1 )) 
    13051247        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    1306         ln -sf ../LONG/O2LP_LONG_00000075_restart_${L_NPROC}.nc . 
    1307         ln -sf ../LONG/O2LP_LONG_00000075_restart_ice_${L_NPROC}.nc . 
    1308         ln -sf ../LONG/1_O2LP_LONG_00000150_restart_${L_NPROC}.nc . 
    1309         ln -sf ../LONG/1_O2LP_LONG_00000150_restart_ice_${L_NPROC}.nc . 
     1248        ln -sf ../LONG/O2AGRIF_LONG_00000075_restart_${L_NPROC}.nc . 
     1249        ln -sf ../LONG/O2AGRIF_LONG_00000075_restart_ice_${L_NPROC}.nc . 
     1250        ln -sf ../LONG/1_O2AGRIF_LONG_00000150_restart_${L_NPROC}.nc . 
     1251        ln -sf ../LONG/1_O2AGRIF_LONG_00000150_restart_ice_${L_NPROC}.nc . 
    13101252    done 
    13111253    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13181260    cd ${SETTE_DIR} 
    13191261    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1320 fi 
     1262 
    13211263 
    13221264## Reproducibility tests for ORCA2_LIM3_AGRIF 
    1323 if [ ${config} -eq 16 ] ;  then 
    13241265    export TEST_NAME="REPRO_4_4" 
    13251266    cd ${CONFIG_DIR0} 
    1326     . ./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 key_zdftmx" del_key "key_zdftmx_new key_top" 
    13271267    cd ${SETTE_DIR} 
    13281268    . ./param.cfg 
     
    13331273    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    13341274    cd ${EXE_DIR} 
     1275    set_namelist namelist_cfg cn_exp \"O2AGRIF_44\" 
    13351276    set_namelist namelist_cfg nn_it000 1 
    13361277    set_namelist namelist_cfg nn_itend 75 
     
    13511292    set_namelist 1_namelist_cfg ln_clobber .true. 
    13521293    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1294    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    13531295    set_namelist 1_namelist_cfg ln_linssh .true. 
    13541296    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     
    13721314    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    13731315    cd ${EXE_DIR} 
     1316    set_namelist namelist_cfg cn_exp \"O2AGRIF_28\" 
    13741317    set_namelist namelist_cfg nn_it000 1 
    13751318    set_namelist namelist_cfg nn_itend 75 
     
    13881331    set_namelist 1_namelist_cfg nn_fsbc 1 
    13891332    set_namelist 1_namelist_cfg ln_ctl .false. 
     1333    set_namelist 1_namelist_cfg nn_fsbc 1 
    13901334    set_namelist 1_namelist_cfg ln_clobber .true. 
    13911335    set_namelist 1_namelist_cfg ln_read_cfg .true. 
    13921336    set_namelist 1_namelist_cfg ln_linssh .true. 
     1337    set_namelist 1_namelist_cfg ln_zdfiwm .false. 
    13931338    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    13941339    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     
    14051350fi 
    14061351 
     1352# test code corruption with AGRIF 
     1353if [ ${config} -eq 9 ] ;  then 
     1354 
     1355# Compile with AGRIF but run with no zoom 
     1356    export TEST_NAME="AGRIFNOZ" 
     1357    cd ${CONFIG_DIR0} 
     1358    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_NOZOOM_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_top" 
     1359    cd ${SETTE_DIR} 
     1360    . ./param.cfg 
     1361    . ./all_functions.sh 
     1362    . ./prepare_exe_dir.sh 
     1363    JOB_FILE=${EXE_DIR}/run_job.sh 
     1364    NPROC=4 
     1365    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1366    cd ${EXE_DIR} 
     1367    set_namelist namelist_cfg cn_exp \"AGRIFNOZ_SHORT\" 
     1368    set_namelist namelist_cfg nn_it000 1 
     1369    set_namelist namelist_cfg nn_itend 75 
     1370    set_namelist namelist_cfg ln_ctl .false. 
     1371    set_namelist namelist_cfg ln_clobber .true. 
     1372    set_namelist namelist_cfg ln_read_cfg .true. 
     1373    set_namelist namelist_cfg ln_linssh .true. 
     1374    set_namelist namelist_cfg ln_hpg_sco .false. 
     1375    set_namelist namelist_cfg ln_hpg_zps .true.  
     1376    set_namelist namelist_cfg nn_fwb 0 
     1377    set_namelist namelist_cfg jpni 2 
     1378    set_namelist namelist_cfg jpnj 2 
     1379    set_namelist namelist_cfg jpnij 4 
     1380    set_namelist namelist_cfg ln_icebergs .false.    
     1381#  
     1382#   Set the number of fine grids to zero:     
     1383    sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
     1384 
     1385    if [ ${USING_MPMD} == "yes" ] ; then 
     1386       set_xio_using_server iodef.xml true 
     1387    else 
     1388       set_xio_using_server iodef.xml false 
     1389    fi 
     1390    cd ${SETTE_DIR} 
     1391    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1392    cd ${SETTE_DIR} 
     1393    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1394 
     1395fi 
     1396 
     1397if [ ${config} -eq 10 ] ;  then 
     1398# Compile with same option as 9 = ORCA2AGUL_NOZOOM, except ne key_agrif to check AGRIF does not hurt... 
     1399    export TEST_NAME="AGRIFNO" 
     1400    cd ${CONFIG_DIR0} 
     1401    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_NOAGR_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_top" 
     1402    cd ${SETTE_DIR} 
     1403    . ./param.cfg 
     1404    . ./all_functions.sh 
     1405    . ./prepare_exe_dir.sh 
     1406    JOB_FILE=${EXE_DIR}/run_job.sh 
     1407    NPROC=4 
     1408    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1409    cd ${EXE_DIR} 
     1410    set_namelist namelist_cfg cn_exp \"AGRIFNO_SHORT\" 
     1411    set_namelist namelist_cfg nn_it000 1 
     1412    set_namelist namelist_cfg nn_itend 75 
     1413    set_namelist namelist_cfg ln_ctl .false. 
     1414    set_namelist namelist_cfg ln_clobber .true. 
     1415    set_namelist namelist_cfg ln_read_cfg .true. 
     1416    set_namelist namelist_cfg ln_linssh .true. 
     1417    set_namelist namelist_cfg ln_hpg_sco .false. 
     1418    set_namelist namelist_cfg ln_hpg_zps .true.  
     1419    set_namelist namelist_cfg nn_fwb 0 
     1420    set_namelist namelist_cfg jpni 2 
     1421    set_namelist namelist_cfg jpnj 2 
     1422    set_namelist namelist_cfg jpnij 4 
     1423    set_namelist namelist_cfg ln_icebergs .false.        
     1424# 
     1425    if [ ${USING_MPMD} == "yes" ] ; then 
     1426       set_xio_using_server iodef.xml true 
     1427    else 
     1428       set_xio_using_server iodef.xml false 
     1429    fi 
     1430    cd ${SETTE_DIR} 
     1431    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1432    cd ${SETTE_DIR} 
     1433    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1434 
     1435fi 
     1436 
    14071437done 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_beginner.sh

    r4796 r9019  
    5555#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5656#   post_test_tidyup : creates validation storage directory and copies required output files  
    57 #                      (solver.stat and ocean.output) in it after execution of test. 
     57#                      (run.stat and ocean.output) in it after execution of test. 
    5858# 
    5959#  VALIDATION tree is: 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

    r8815 r9019  
    11#!/bin/bash -f 
    2 #set -vx 
    3 # 
     2# set -vx 
    43# simple SETTE report generator. 
    54# 
     
    1716# Compares LONG rebuild restart ice file with equivalent entry from the SHORT rebuild restart ice file. 
    1817# 
     18# check nco module loaded, and load it if not 
     19if [ ! $( echo $LOADEDMODULES | grep cdo ) ]; then module load cdo >& /dev/null ; fi 
     20# 
    1921  vdir=$1 
    2022  nam=$2 
    2123  pass=$3 
     24 
    2225# 
    2326  if [ -d $vdir/$nam ]; then 
     
    3235    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3336    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    34     ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     37    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3538    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    36     ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     39    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    3740    cd ${SAS_RESTART_DIR}/LONG 
    3841    #SF echo "COPY rebuild restart files" 
     
    4952    done_oce=0 
    5053    # 
    51     if  [  -f $f1o ] && [  -f $f2o ]; then 
    52       cmp -s $f1o $f2o  
    53       #SF  cmp SAS_00000240_restart_ice.nc  ../SHORT/SAS_00000240_restart_ice.nc  > diff_restart.txt 
    54       if [ $? == 0 ]; then 
    55         if [ $pass == 0 ]; then 
    56           printf "%-20s %s %s\n" $nam  " SAS restart files are IDENTICAL :  passed : " $dorv 
    57         fi 
    58       else 
    59         printf "%-20s %s %s\n" $nam  " SAS restart files are DIFFERENT : FAILED : " $dorv  
     54  if  [  -f $f1o ] && [  -f $f2o ]; then 
     55## Compare the two netcdf files 
     56    cdo diffn $f1o $f2o > cdo_diff.out 2> /dev/null 
     57## Identical if cdo_diff.out exists but has zero size 
     58    if [ ! -s cdo_diff.out ]; then 
     59       difi=0 
     60    else 
     61## Identical if first character of $dif ==0 
     62       dif=$( grep -om1 '[0-9]* of [0-9]* records differ' cdo_diff.out ) 
     63# difi contains the first character of summary of cdo dif. if = 0, then 0 record differ between the 2 files     
     64       if [ -n "$dif" ]; then 
     65           difi=`echo $dif | cut -c -1` 
     66       fi 
     67    fi 
     68    \rm cdo_diff.out  
     69 
     70    if [ $difi == 0 ]; then    
     71       if [ $pass == 0 ]; then 
     72         printf "%-20s %s %s\n" $nam  " ice restarts are IDENTICAL  passed : " $dorv 
     73       fi 
     74    else 
     75       printf "%-20s %s %s\n" $nam  " ice restarts are DIFFERENT  FAILED : " $dorv  
    6076        # 
    6177   # Offer view of differences on the second pass 
    6278   # 
    6379        if [ $pass == 1 ]; then 
    64           echo "BE CAREFUL:  NEED cdo to see differences!!!!! " 
    65           echo "DO which cdo and replace cdo PATH to the cdo command in SETTE_rpt.sh " 
    66           echo "IF cdo is not available you need to do difference of netcdf file by hand" 
    6780          echo "<return> to view restart_ice.nc differences" 
    6881          read y 
     
    7285          #read y 
    7386        fi 
    74       fi 
    75     fi 
     87    fi 
     88  else 
     89      printf "%-20s %s\n" $nam " incomplete test"; 
     90      return; 
     91  fi 
    7692# 
    7793fi 
     
    91107    dorv=`echo $dorv | sed -e 's:.*/::'` 
    92108    f1o=$vdir/$nam/$mach/$dorv/LONG/ocean.output 
    93     f1s=$vdir/$nam/$mach/$dorv/LONG/solver.stat 
     109    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
    94110    f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
    95111    f2o=$vdir/$nam/$mach/$dorv/SHORT/ocean.output 
    96     f2s=$vdir/$nam/$mach/$dorv/SHORT/solver.stat 
     112    f2s=$vdir/$nam/$mach/$dorv/SHORT/run.stat 
    97113    f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat 
    98114 
     
    114130      if [ $? == 0 ]; then 
    115131        if [ $pass == 0 ]; then  
    116           printf "%-20s %s %s\n" $nam  " solver.stat restartability  passed : " $dorv 
     132          printf "%-20s %s %s\n" $nam  " run.stat    restartability  passed : " $dorv 
    117133        fi 
    118134      else 
    119         printf "%-20s %s %s\n" $nam  " solver.stat restartability  FAILED : " $dorv  
     135        printf "%-20s %s %s\n" $nam  " run.stat    restartability  FAILED : " $dorv  
    120136# 
    121137# Offer view of differences on the second pass 
    122138# 
    123139        if [ $pass == 1 ]; then 
    124           echo "<return> to view solver.stat differences" 
     140          echo "<return> to view run.stat differences" 
    125141          read y 
    126142          sdiff f1.tmp$$ $f2s 
     
    183199    dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l ` 
    184200    dorv=`echo $dorv | sed -e 's:.*/::'` 
    185     rep1=`ls -1rt $vdir/$nam/$mach/$dorv/ | tail -2l | head -1 ` 
    186     rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | tail -1l` 
     201    rep1=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -2l | head -1 ` 
     202    rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -1l` 
    187203    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    188     f1s=$vdir/$nam/$mach/$dorv/$rep1/solver.stat 
     204    f1s=$vdir/$nam/$mach/$dorv/$rep1/run.stat 
    189205    f1t=$vdir/$nam/$mach/$dorv/$rep1/tracer.stat 
    190206    f2o=$vdir/$nam/$mach/$dorv/$rep2/ocean.output 
    191     f2s=$vdir/$nam/$mach/$dorv/$rep2/solver.stat 
     207    f2s=$vdir/$nam/$mach/$dorv/$rep2/run.stat 
    192208    f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat 
    193209 
     
    207223      if [ $? == 0 ]; then 
    208224        if [ $pass == 0 ]; then  
    209           printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv 
     225          printf "%-20s %s %s\n" $nam  " run.stat    reproducibility passed : " $dorv 
    210226        fi 
    211227      else 
    212         printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv  
     228        printf "%-20s %s %s\n" $nam  " run.stat    reproducibility FAILED : " $dorv  
    213229# 
    214230# Offer view of differences on the second pass 
    215231# 
    216232        if [ $pass == 1 ]; then 
    217           echo "<return> to view solver.stat differences" 
     233          echo "<return> to view run.stat differences" 
    218234          read y 
    219235          sdiff f1.tmp$$ $f2s 
     
    257273      fi 
    258274    fi 
     275  fi 
     276} 
     277 
     278function identictest(){ 
     279# 
     280#  checks AGRIF does not corrupe results with no AGRIF zoom. Expects ORCA2AGUL/AGRIFNOZ and ORCA2AGUL_NAGR/AGRIFNO  run directories 
     281# Compares solver.stat files for each 
     282# 
     283  vdir=$1 
     284  dir1=$2 
     285  dir2=$3 
     286  pass=$4 
     287# 
     288  if [ -d $vdir/$dir1 ] && [ -d $vdir/$dir2 ]; then 
     289    dorv1=`ls -1rt $vdir/$dir1/$mach/ | tail -1l ` 
     290    dorv1=`echo $dorv1 | sed -e 's:.*/::'` 
     291    dorv2=`ls -1rt $vdir/$dir2/$mach/ | tail -1l ` 
     292    dorv2=`echo $dorv2 | sed -e 's:.*/::'` 
     293 
     294    rep1=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -2l | head -1 ` 
     295    rep2=`ls -1rt $vdir/$dir2/$mach/$dorv2/ |  tail -1l` 
     296    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/run.stat 
     297    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/run.stat 
     298 
     299    if  [ ! -f $f1s ] && [ ! -f $f2s ] ; then  
     300      printf "%-20s %s\n" $dir1 $dir2 " incomplete test"; 
     301      return;  
     302    fi 
     303# 
     304    done_oce=0 
     305 
     306    if  [ -f $f1s ] && [ -f $f2s ] ; then 
     307      cmp -s $f1s $f2s 
     308      if [ $? == 0 ]; then 
     309        if [ $pass == 0 ]; then  
     310          printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: run.stat unchanged - test  passed : " $dorv1 $dorv2 
     311        fi 
     312      else 
     313        printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, run.stat test FAILED : " $dorv1 $dorv2 
     314# 
     315# Offer view of differences on the second pass 
     316# 
     317        if [ $pass == 1 ]; then 
     318          echo "<return> to view run.stat differences" 
     319          read y 
     320          sdiff $f1s $f2s 
     321          done_oce=1 
     322          echo "<return> to continue" 
     323          read y 
     324        fi 
     325      fi 
     326    fi 
     327  else 
     328    printf "%-20s %s\n" $dir1 $dir2 " incomplete test"; 
    259329  fi 
    260330} 
     
    267337  mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'` 
    268338  NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'` 
    269 # Directory to run the tests 
    270  SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    271  MAIN_DIR=$(dirname $SETTE_DIR) 
    272  CONFIG_DIR0=${MAIN_DIR}/CONFIG 
    273  TOOLS_DIR=${MAIN_DIR}/TOOLS 
    274  COMPIL_DIR=${TOOLS_DIR}/COMPILE 
    275  NPROC=32 
    276  
    277   SAS_RESTART_DIR=${CONFIG_DIR0}/SAS_LONG 
     339  NEMO_VALID=`eval "echo $NEMO_VALID"` 
    278340# 
    279341  if [ ! -d $NEMO_VALID ]; then 
     
    282344  fi 
    283345# 
    284  
     346# Directory to run the tests 
     347  SETTE_DIR=$(cd $(dirname "$0"); pwd) 
     348  MAIN_DIR=$(dirname $SETTE_DIR) 
     349  CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     350  TOOLS_DIR=${MAIN_DIR}/TOOLS 
     351  COMPIL_DIR=${TOOLS_DIR}/COMPILE 
     352  NPROC=32 
     353  SAS_RESTART_DIR=${CONFIG_DIR0}/SAS_ST 
     354# 
     355# Show current revision tag and branch name 
     356# 
     357cmd="svn" 
     358[ ! -d "$SETTE_DIR/.svn" ] && cmd="git $cmd" 
     359revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '` 
     360branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev` 
     361echo "SETTE validation report : $branchname @ r$revision" 
     362# 
    285363# The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory 
    286364 
     
    293371# Rebuild and restartability test for SAS 
    294372# 
    295  for restart_file in WSAS_LONG 
     373 for restart_file in WSAS_ST 
    296374 do 
    297  #  restfile $SAS_RESTART_DIR LONG $pass 
    298375   restfile $NEMO_VALID $restart_file $pass 
    299376 done 
     
    301378# Restartability test 
    302379# 
    303  for restart_test in WGYREPIS_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 
     380 for restart_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
    304381 do 
    305382   resttest $NEMO_VALID $restart_test $pass 
     
    308385# Reproducibility tests 
    309386# 
    310  for repro_test in WGYREPIS_32 WORCA2LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
     387 for repro_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST 
    311388 do 
    312389   reprotest $NEMO_VALID $repro_test $pass 
    313390 done 
    314 # 
     391 
     392 
     393 
     394# AGRIF special check 
     395 dir1=WORCA2AGUL_NOZOOM_ST 
     396 dir2=WORCA2AGUL_NOAGR_ST 
     397 identictest $NEMO_VALID $dir1 $dir2 $pass  
     398 
     399 
    315400done 
     401# 
     402## Additional checks for ORCA2AGUL/FIRST standalone AGRIF test 
     403## still to be added 
     404 
     405 
     406 
    316407exit 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_xios.sh

    r4990 r9019  
    5252#   set_namelist     : function declared in all_functions that sets namelist parameters  
    5353#   post_test_tidyup : creates validation storage directory and copies required output files  
    54 #                      (solver.stat and ocean.output) in it after execution of test. 
     54#                      (run.stat and ocean.output) in it after execution of test. 
    5555# 
    5656#  VALIDATION tree is: 
Note: See TracChangeset for help on using the changeset viewer.