New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13754 – NEMO

Changeset 13754


Ignore:
Timestamp:
2020-11-09T17:11:35+01:00 (4 years ago)
Author:
andmirek
Message:

Ticket #2462 merge with default sette

Location:
utils/CI/r12931_sette_ticket2462
Files:
4 deleted
16 edited
2 copied

Legend:

Unmodified
Added
Removed

  • utils/CI/r12931_sette_ticket2462/BATCH_TEMPLATE/batch-X64_IRENE_DEBUG

    r12128 r13754  
    11#!/bin/bash 
    2 #MSUB -T 3600                # elapsed time limit in seconds   (60 minutes) 
     2#MSUB -T 1790                # elapsed time limit in seconds   (60 minutes) 
    33#MSUB -r SETTE_JOB           # Job name 
    44#MSUB -o sette.jobid_%I.txt  # standard output 

  • utils/CI/r12931_sette_ticket2462/BATCH_TEMPLATE/batch-X64_IRENE_GCC_DEBUG

    r12653 r13754  
    11#!/bin/bash 
    2 #MSUB -T 4000                # elapsed time limit in seconds   (60 minutes) 
     2#MSUB -T 1790                # elapsed time limit in seconds   (60 minutes) 
    33#MSUB -r SETTE_JOB           # Job name 
    44#MSUB -o sette.jobid_%I.txt  # standard output 

  • utils/CI/r12931_sette_ticket2462/BATCH_TEMPLATE/batch-X64_JEANZAY_DEBUG

    r11645 r13754  
    88# de Slurm "multithread" fait bien référence à l'hyperthreading. 
    99#SBATCH --hint=nomultithread       # 1 processus MPI par coeur physique (pas d'hyperthreading) 
    10 #SBATCH --time=00:59:00            # Temps d’exécution maximum demande (HH:MM:SS) 
     10#SBATCH --time=00:29:00            # Temps d’exécution maximum demande (HH:MM:SS) 
    1111#SBATCH --output=sette.jobid_%j.out  # Nom du fichier de sortie 
    1212#SBATCH --error=sette.jobid_%j.out   # Nom du fichier d'erreur (ici commun avec la sortie) 

  • utils/CI/r12931_sette_ticket2462/all_functions.sh

    r12569 r13754  
    129129         # rsync keep preserve the modification time stamp. 
    130130         # To avoid case where a file in MY_SRC is replace by an older file, we touch the file 
    131          touch $lCFG/MY_SRC/* 
     131         touch --no-create $lCFG/MY_SRC/* 
    132132      fi 
    133133 

  • utils/CI/r12931_sette_ticket2462/input_AGRIF.cfg

    r9776 r13754  
    1 ORCA2_ICE_v4.0.tar ORCA2_ICE_v4.0 
    2 AGRIF_DEMO_v4.0.tar AGRIF_DEMO_v4.0 
     1ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     2AGRIF_DEMO_v4.x.tar.gz AGRIF_DEMO_v4.x 

  • utils/CI/r12931_sette_ticket2462/input_ICE_AGRIF.cfg

    r10517 r13754  
    1 ICE_AGRIF_v4.0.tar ICE_AGRIF_v4.0 
     1ICE_AGRIF_v4.x.tar.gz ICE_AGRIF_v4.x 

  • utils/CI/r12931_sette_ticket2462/input_ORCA2_ICE_OBS.cfg

    r9663 r13754  
    1 ORCA2_ICE_v4.0.tar ORCA2_ICE_v4.0 
     1ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 

  • utils/CI/r12931_sette_ticket2462/input_ORCA2_ICE_PISCES.cfg

    r9663 r13754  
    1 ORCA2_ICE_v4.0.tar  ORCA2_ICE_v4.0 
     1ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 

  • utils/CI/r12931_sette_ticket2462/input_ORCA2_OFF_PISCES.cfg

    r9904 r13754  
    1 ORCA2_OFF_v4.0.tar ORCA2_OFF_v4.0 
     1ORCA2_OFF_v4.x.tar.gz ORCA2_OFF_v4.x 

  • utils/CI/r12931_sette_ticket2462/input_SAS.cfg

    r9579 r13754  
    1 ORCA2_ICE_v4.0.tar ORCA2_ICE_v4.0 
    2 INPUTS_SAS_v4.0.tar SAS 
     1ORCA2_ICE_v4.x.tar.gz ORCA2_ICE_v4.x 
     2SAS_v4.x.tar.gz SAS_v4.x 

  • utils/CI/r12931_sette_ticket2462/param.cfg

    r12569 r13754  
    7474# LIST OF CONFIGURATIONS 
    7575# to be updated if you added an new configuration in sette_test-cases.sh or sette_reference-configuration.sh 
    76 TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF SPITZ12 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP"} 
     76TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF WED025 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP+"} 
    7777# ------------------------------------------------------------------------------------------ 
    7878# 

  • utils/CI/r12931_sette_ticket2462/prepare_job.sh

    r12798 r13754  
    122122# loop on tarfiles 
    123123# read file name and directory 
    124 while read tar_file dir_conf_forc  
    125 do 
    126       echo looking for tarfile ${tar_file} and directory ${FORCING_DIR}/${dir_conf_forc} ; echo looking for tarfile ${tar_file} and directory ${FORCING_DIR}/${dir_conf_forc} >> ${SETTE_DIR}/output.sette 
    127       if [ -f ${FORCING_DIR}/${tar_file} ] && [ -d ${FORCING_DIR}/${dir_conf_forc} ] ; then 
    128 # Tarfile and input dir ar there, only check the links 
    129          echo "Tarfile and input dir ar there, only check the links" >> ${SETTE_DIR}/output.sette 
    130 # extract tarfile 
    131       else  
    132  
    133 if [ ! -f ${FORCING_DIR}/${tar_file} ] ; then   
    134      echo "tarfile  ${FORCING_DIR}/${tar_file} cannot be found we stop " ; exit 2 ; fi  
    135  
    136 echo "mkdir ${FORCING_DIR}/${dir_conf_forc}" >> ${SETTE_DIR}/output.sette 
    137          mkdir ${FORCING_DIR}/${dir_conf_forc}   
    138          cd    ${FORCING_DIR}/${dir_conf_forc} 
    139 echo " extract from tarfile ${FORCING_DIR}/${tar_file} in  ${FORCING_DIR}/${dir_conf_forc}" >> ${SETTE_DIR}/output.sette 
    140          tar xvof ${FORCING_DIR}/${tar_file} ; gunzip -f `find . -name "*.gz"`  
    141       fi 
    142 # Tarfile and input dir ar there, only check the links 
    143       cd ${FORCING_DIR}/${dir_conf_forc} 
    144       for fida in * 
    145          do 
     124   while read tar_file dir_conf_forc  
     125   do 
     126       echo looking for tarfile ${tar_file} and directory ${FORCING_DIR}/${dir_conf_forc} 
     127       echo looking for tarfile ${tar_file} and directory ${FORCING_DIR}/${dir_conf_forc} >> ${SETTE_DIR}/output.sette 
     128       if [ -d ${FORCING_DIR}/${dir_conf_forc} ] ; then 
     129      # input dir ar there, only check the links 
     130           echo "input dir ar there, only check the links" >> ${SETTE_DIR}/output.sette 
     131      # extract tarfile 
     132       else        
     133      if [ ! -f ${FORCING_DIR}/${tar_file} ] ; then   
     134          echo "tarfile  ${FORCING_DIR}/${tar_file} cannot be found we stop " ; exit 2 ; fi  
     135 
     136      echo " extract from tarfile ${FORCING_DIR}/${tar_file} in  ${FORCING_DIR}/${dir_conf_forc}" >> ${SETTE_DIR}/output.sette 
     137 
     138      istgz=$( echo ${FORCING_DIR}/${tar_file} | grep -c "gz$" ) 
     139      if [ $istgz -eq 1 ] 
     140      then 
     141          withdir=$( tar tfz ${FORCING_DIR}/${tar_file} | head -n 1  | grep -c "${dir_conf_forc}/$" ) 
     142      else 
     143          withdir=$( tar tf  ${FORCING_DIR}/${tar_file} | head -n 1  | grep -c "${dir_conf_forc}/$" ) 
     144      fi 
     145      if [ $withdir -eq 0 ] 
     146      then 
     147          mkdir ${FORCING_DIR}/${dir_conf_forc}   
     148          cd    ${FORCING_DIR}/${dir_conf_forc} 
     149      else 
     150          cd    ${FORCING_DIR} 
     151      fi 
     152      if [ $istgz -eq 1 ] 
     153      then 
     154          tar xvfz ${FORCING_DIR}/${tar_file} 
     155      else 
     156               tar xvf ${FORCING_DIR}/${tar_file} 
     157          [ $( ls -1 *gz 2>/dev/null | wc -l ) -gt 0 ] && gunzip -f *gz 
     158      fi 
     159       fi 
     160       # Tarfile and input dir ar there, only check the links 
     161       cd ${FORCING_DIR}/${dir_conf_forc} 
     162       for fida in * 
     163       do 
    146164           [ -f ${EXE_DIR}/${fida} ] || ln -s ${FORCING_DIR}/${dir_conf_forc}/${fida} ${EXE_DIR}/${fida} 
    147          done 
    148     done < ${SETTE_DIR}/$INPUTARFILE 
    149  
     165       done 
     166   done < ${SETTE_DIR}/$INPUTARFILE 
     167    
    150168else 
    151   echo "no input file to be searched " 
     169    echo "no input file to be searched " 
    152170fi 
    153171################################################################ 
    … …  
    252270                                ;; 
    253271                        X64_JEANZAY*) #Setup for Jean-Zay 
    254                                 export GROUP_IDRIS=`echo ${USER} |cut -c 2-4` 
     272                                export GROUP_IDRIS=`echo ${IDRPROJ}` 
    255273                                ;; 
    256274                        openmpi_KARA_MERCATOR*) 

  • utils/CI/r12931_sette_ticket2462/sette_list_avail_cfg.sh

    r11161 r13754  
    99printf "%-15s \n" ORCA2_ICE_OBS 
    1010printf "%-15s \n" AGRIF 
    11 printf "%-15s \n" SPITZ12 
     11printf "%-15s \n" WED025 
    1212echo '' 
    1313echo 'Test cases available are named :' 
    … …  
    1616printf "%-15s \n" VORTEX 
    1717printf "%-15s \n" ICE_AGRIF 
    18 printf "%-15s \n" ISOMIP 
     18printf "%-15s \n" ISOMIP+ 
    1919echo '' 

  • utils/CI/r12931_sette_ticket2462/sette_reference-configurations.sh

    r12999 r13754  
    150150# AGRIF             : test AGRIF in a double zoom configuration in the nordic seas + 1 zoom in the eq. Pacific (AGRIF_DEMO) 
    151151#                       and check that key_agrif without zoom = no key_agrif 
    152 # SPITZ12           : regional configuration including sea-ice and tides (Spitzbergen) 
     152# WED025           : regional configuration including sea-ice and tides (Spitzbergen) 
    153153 
    154154for config in ${TEST_CONFIGS} 
    … …  
    160160if [ ${config} == "GYRE_PISCES" ] ;  then 
    161161## Restartability tests for GYRE_PISCES 
     162    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     163    then 
     164   ITEND=12    # 1 day 
     165    else 
     166   ITEND=1080  # 90 days 
     167    fi 
     168    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    162169    export TEST_NAME="LONG" 
    163170    cd ${MAIN_DIR} 
    … …  
    181188    set_namelist namelist_cfg cn_exp \"GYREPIS_LONG\" 
    182189    set_namelist namelist_cfg nn_it000 1 
    183     set_namelist namelist_cfg nn_itend 1080 
    184     set_namelist namelist_cfg nn_stock  540 
     190    set_namelist namelist_cfg nn_itend ${ITEND} 
     191    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    185192    set_namelist namelist_cfg ln_linssh .true. 
    186193    set_namelist namelist_cfg jpni 2 
    … …  
    207214    cd ${EXE_DIR} 
    208215    set_namelist namelist_cfg cn_exp \"GYREPIS_SHORT\" 
    209     set_namelist namelist_cfg nn_it000 541 
    210     set_namelist namelist_cfg nn_itend 1080 
    211     set_namelist namelist_cfg nn_stock 540 
     216    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     217    set_namelist namelist_cfg nn_itend ${ITEND} 
     218    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    212219    set_namelist namelist_cfg ln_rstart .true. 
    213220    set_namelist namelist_cfg nn_rstctl 2 
    … …  
    219226    set_namelist namelist_top_cfg ln_rsttr .true. 
    220227    set_namelist namelist_top_cfg nn_rsttr 2 
    221     set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_00000540_restart\" 
    222     set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_00000540_restart_trc\" 
     228    set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_${ITRST}_restart\" 
     229    set_namelist namelist_top_cfg cn_trcrst_in \"GYREPIS_LONG_${ITRST}_restart_trc\" 
    223230    if [ ${USING_XIOS_RRW} == "yes" ] 
    224231       then 
    … …  
    231238       set_xio_using_server iodef.xml false 
    232239    fi 
    233     if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    234             ln -sf ../LONG/GYREPIS_LONG_00000540_restart.nc . 
    235             ln -sf ../LONG/GYREPIS_LONG_00000540_restart_trc.nc . 
    236        else 
    237             for (( i=1; i<=$NPROC; i++)) ; do 
    238                 L_NPROC=$(( $i - 1 )) 
    239                 L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    240                 ln -sf ../LONG/GYREPIS_LONG_00000540_restart_${L_NPROC}.nc . 
    241                 ln -sf ../LONG/GYREPIS_LONG_00000540_restart_trc_${L_NPROC}.nc . 
    242             done 
    243     fi 
     240    for (( i=1; i<=$NPROC; i++)) ; do 
     241        L_NPROC=$(( $i - 1 )) 
     242        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     243        ln -sf ../LONG/GYREPIS_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     244        ln -sf ../LONG/GYREPIS_LONG_${ITRST}_restart_trc_${L_NPROC}.nc . 
     245    done 
    244246    cd ${SETTE_DIR} 
    245247    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    … …  
    262264    set_namelist namelist_cfg cn_exp \"GYREPIS_48\" 
    263265    set_namelist namelist_cfg nn_it000 1 
    264     set_namelist namelist_cfg nn_itend 1080 
     266    set_namelist namelist_cfg nn_itend ${ITEND} 
    265267    set_namelist namelist_cfg ln_linssh .true. 
    266268    set_namelist namelist_cfg jpni 2 
    … …  
    293295    set_namelist namelist_cfg cn_exp \"GYREPIS_84\" 
    294296    set_namelist namelist_cfg nn_it000 1 
    295     set_namelist namelist_cfg nn_itend 1080 
     297    set_namelist namelist_cfg nn_itend ${ITEND} 
    296298    set_namelist namelist_cfg ln_linssh .true. 
    297299    set_namelist namelist_cfg jpni 4 
    … …  
    320322if [ ${config} == "ORCA2_ICE_PISCES" ] ;  then 
    321323## Restartability tests for ORCA2_ICE_PISCES 
     324    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     325    then 
     326   ITEND=16   # 1 day 
     327    else 
     328   ITEND=992  # 62 days 
     329    fi 
     330    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    322331    export TEST_NAME="LONG" 
    323332    cd ${MAIN_DIR} 
    … …  
    341350    set_namelist namelist_cfg cn_exp \"O2L3P_LONG\" 
    342351    set_namelist namelist_cfg nn_it000 1 
    343     set_namelist namelist_cfg nn_itend 992 
    344     set_namelist namelist_cfg nn_stock 496 
     352    set_namelist namelist_cfg nn_itend ${ITEND} 
     353    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    345354    set_namelist namelist_cfg jpni 4 
    346355    set_namelist namelist_cfg jpnj 8 
    … …  
    387396    cd ${EXE_DIR} 
    388397    set_namelist namelist_cfg cn_exp \"O2L3P_SHORT\" 
    389     set_namelist namelist_cfg nn_it000 497 
    390     set_namelist namelist_cfg nn_itend 992 
    391     set_namelist namelist_cfg nn_stock 496 
     398    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     399    set_namelist namelist_cfg nn_itend ${ITEND} 
     400    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    392401    set_namelist namelist_cfg ln_rstart .true. 
    393402    set_namelist namelist_cfg nn_rstctl 2 
    … …  
    415424    set_namelist namelist_top_cfg ln_rsttr .true. 
    416425    set_namelist namelist_top_cfg nn_rsttr 2 
    417     set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000496_restart\" 
    418     set_namelist namelist_cfg cn_icbrst_in \"O2L3P_LONG_00000496_restart_icb\" 
    419     set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000496_restart_trc\" 
    420     set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000496_restart_ice\" 
     426    set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_${ITRST}_restart\" 
     427    set_namelist namelist_cfg cn_icbrst_in \"O2L3P_LONG_${ITRST}_restart_icb\" 
     428    set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_${ITRST}_restart_trc\" 
     429    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_${ITRST}_restart_ice\" 
    421430    set_namelist namelist_top_cfg ln_trcbc  .false. 
    422431    # put ln_ironsed, ln_hydrofe to false 
    … …  
    431440        L_NPROC=$(( $i - 1 )) 
    432441        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     442        ln -sf ../LONG/O2L3P_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     443        ln -sf ../LONG/O2L3P_LONG_${ITRST}_restart_trc_${L_NPROC}.nc . 
     444        ln -sf ../LONG/O2L3P_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
    433445        if [ ${USING_ICEBERGS} == "yes" ] 
    434446            then 
    435              ln -sf ../LONG/O2L3P_LONG_00000496_restart_icb_${L_NPROC}.nc O2L3P_LONG_00000496_restart_icb_${L_NPROC}.nc 
     447             ln -sf ../LONG/O2L3P_LONG_${ITRST}_restart_icb_${L_NPROC}.nc O2L3P_LONG_${ITRST}_restart_icb_${L_NPROC}.nc 
    436448        fi 
    437449    done 
    … …  
    474486    set_namelist namelist_cfg cn_exp \"O2L3P_48\" 
    475487    set_namelist namelist_cfg nn_it000 1 
    476     set_namelist namelist_cfg nn_itend 992 
     488    set_namelist namelist_cfg nn_itend ${ITEND} 
    477489    set_namelist namelist_cfg jpni 4 
    478490    set_namelist namelist_cfg jpnj 8 
    … …  
    523535    set_namelist namelist_cfg cn_exp \"O2L3P_84\" 
    524536    set_namelist namelist_cfg nn_it000 1 
    525     set_namelist namelist_cfg nn_itend 992 
     537    set_namelist namelist_cfg nn_itend ${ITEND} 
    526538    set_namelist namelist_cfg jpni 8 
    527539    set_namelist namelist_cfg jpnj 4 
    … …  
    567579if [ ${config} == "ORCA2_OFF_PISCES" ] ;  then 
    568580## Restartability tests for ORCA2_OFF_PISCES 
     581    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     582    then 
     583   ITEND=16   # 4 days 
     584    else 
     585   ITEND=380  # 95 days 
     586    fi 
     587    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    569588    export TEST_NAME="LONG" 
    570589    cd ${MAIN_DIR} 
    … …  
    588607    set_namelist namelist_cfg cn_exp \"OFFP_LONG\" 
    589608    set_namelist namelist_cfg nn_it000 1 
    590     set_namelist namelist_cfg nn_itend 380 
    591     set_namelist namelist_cfg nn_stock 190 
     609    set_namelist namelist_cfg nn_itend ${ITEND} 
     610    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    592611    set_namelist namelist_cfg jpni 4 
    593612    set_namelist namelist_cfg jpnj 8 
    … …  
    623642    cd ${EXE_DIR} 
    624643    set_namelist namelist_cfg cn_exp \"OFFP_SHORT\" 
    625     set_namelist namelist_cfg nn_it000 191 
    626     set_namelist namelist_cfg nn_itend 380 
    627     set_namelist namelist_cfg nn_stock 190 
     644    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     645    set_namelist namelist_cfg nn_itend ${ITEND} 
     646    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    628647    set_namelist namelist_cfg jpni 4 
    629648    set_namelist namelist_cfg jpnj 8 
    … …  
    637656    set_namelist namelist_top_cfg ln_rsttr .true. 
    638657    set_namelist namelist_top_cfg nn_rsttr 2 
    639     set_namelist namelist_top_cfg cn_trcrst_in \"OFFP_LONG_00000190_restart_trc\" 
    640     if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    641         ln -s ../LONG/OFFP_LONG_00000190_restart_trc.nc ./ 
    642     else 
    643         for (( i=1; i<=$NPROC; i++)) ; do 
    644             L_NPROC=$(( $i - 1 )) 
    645             L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    646             ln -sf ../LONG/OFFP_LONG_00000190_restart_trc_${L_NPROC}.nc . 
    647         done 
    648     fi 
     658    set_namelist namelist_top_cfg cn_trcrst_in \"OFFP_LONG_${ITRST}_restart_trc\" 
     659    for (( i=1; i<=$NPROC; i++)) ; do 
     660        L_NPROC=$(( $i - 1 )) 
     661        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     662        ln -sf ../LONG/OFFP_LONG_${ITRST}_restart_trc_${L_NPROC}.nc . 
     663    done 
    649664    set_namelist namelist_top_cfg ln_trcbc  .false. 
    650665    # put ln_ironsed, ln_hydrofe to false 
    … …  
    681696    set_namelist namelist_cfg cn_exp \"OFFP_48\" 
    682697    set_namelist namelist_cfg nn_it000 1 
    683     set_namelist namelist_cfg nn_itend 380 
     698    set_namelist namelist_cfg nn_itend ${ITEND} 
    684699    set_namelist namelist_cfg jpni 4 
    685700    set_namelist namelist_cfg jpnj 8 
    … …  
    721736    set_namelist namelist_cfg cn_exp \"OFFP_84\" 
    722737    set_namelist namelist_cfg nn_it000 1 
    723     set_namelist namelist_cfg nn_itend 380 
     738    set_namelist namelist_cfg nn_itend ${ITEND} 
    724739    set_namelist namelist_cfg jpni 8 
    725740    set_namelist namelist_cfg jpnj 4 
    … …  
    756771if [ ${config} == "AMM12" ] ;  then 
    757772    ## Restartability tests for AMM12 
     773    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     774    then 
     775   ITEND=12   # 3 h 
     776    else 
     777   ITEND=576  # 4 days 
     778    fi 
     779    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    758780    export TEST_NAME="LONG" 
    759781    cd ${MAIN_DIR} 
    … …  
    777799    set_namelist namelist_cfg cn_exp \"AMM12_LONG\" 
    778800    set_namelist namelist_cfg nn_it000 1 
    779     set_namelist namelist_cfg nn_itend 576 
    780     set_namelist namelist_cfg nn_stock 288 
     801    set_namelist namelist_cfg nn_itend ${ITEND} 
     802    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    781803    set_namelist namelist_cfg jpni 4 
    782804    set_namelist namelist_cfg jpnj 8 
    … …  
    801823    cd ${EXE_DIR} 
    802824    set_namelist namelist_cfg cn_exp \"AMM12_SHORT\" 
    803     set_namelist namelist_cfg nn_it000 289 
    804     set_namelist namelist_cfg nn_itend 576 
     825    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     826    set_namelist namelist_cfg nn_itend ${ITEND} 
     827    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    805828    set_namelist namelist_cfg jpni 4 
    806829    set_namelist namelist_cfg jpnj 8 
    … …  
    808831    set_namelist namelist_cfg ln_rstart .true. 
    809832    set_namelist namelist_cfg nn_rstctl 2 
    810     set_namelist namelist_cfg cn_ocerst_in \"AMM12_LONG_00000288_restart\" 
     833    set_namelist namelist_cfg cn_ocerst_in \"AMM12_LONG_${ITRST}_restart\" 
    811834    set_namelist namelist_cfg nn_date0 20120102 
    812     if [ ${USING_XIOS_RRW} == "yes" ] 
    813        then 
    814        set_namelist namelist_cfg nn_wxios 1 
    815        set_namelist namelist_cfg ln_xios_read .true. 
    816     fi 
    817     if [ ${USING_XIOS_RRW} == "yes" ]; then 
    818         ln -sf ../LONG/AMM12_LONG_00000288_restart.nc . 
    819     else 
    820         for (( i=1; i<=$NPROC; i++)) ; do 
    821              L_NPROC=$(( $i - 1 )) 
    822              L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    823              ln -sf ../LONG/AMM12_LONG_00000288_restart_${L_NPROC}.nc . 
    824         done 
    825     fi 
     835    for (( i=1; i<=$NPROC; i++)) ; do 
     836        L_NPROC=$(( $i - 1 )) 
     837        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     838        ln -sf ../LONG/AMM12_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     839    done 
    826840    if [ ${USING_MPMD} == "yes" ] ; then 
    827841       set_xio_using_server iodef.xml true 
    … …  
    849863    set_namelist namelist_cfg cn_exp \"AMM12_84\" 
    850864    set_namelist namelist_cfg nn_it000 1 
    851     set_namelist namelist_cfg nn_itend 576 
     865    set_namelist namelist_cfg nn_itend ${ITEND} 
    852866    set_namelist namelist_cfg jpni 8 
    853867    set_namelist namelist_cfg jpnj 4 
    … …  
    876890    set_namelist namelist_cfg cn_exp \"AMM12_48\" 
    877891    set_namelist namelist_cfg nn_it000 1 
    878     set_namelist namelist_cfg nn_itend 576 
     892    set_namelist namelist_cfg nn_itend ${ITEND} 
    879893    set_namelist namelist_cfg jpni 4 
    880894    set_namelist namelist_cfg jpnj 8 
    … …  
    900914if [ ${config} == "SAS" ] ;  then 
    901915## Restartability tests 
     916    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     917    then 
     918   ITEND=16   # 1 day 
     919    else 
     920   ITEND=256  # 16 days 
     921    fi 
     922    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    902923    export TEST_NAME="LONG" 
    903924    cd ${MAIN_DIR} 
    … …  
    921942    set_namelist namelist_cfg cn_exp \"SAS\" 
    922943    set_namelist namelist_cfg nn_it000 1 
    923     set_namelist namelist_cfg nn_itend 256 
    924     set_namelist namelist_cfg nn_stock 128 
     944    set_namelist namelist_cfg nn_itend ${ITEND} 
     945    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    925946    set_namelist namelist_cfg jpni 4 
    926947    set_namelist namelist_cfg jpnj 8 
    … …  
    946967    cd ${EXE_DIR} 
    947968    set_namelist namelist_cfg cn_exp \"SAS\" 
    948     set_namelist namelist_cfg nn_it000 129 
    949     set_namelist namelist_cfg nn_itend 256 
     969    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     970    set_namelist namelist_cfg nn_itend ${ITEND} 
     971    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    950972    set_namelist namelist_cfg jpni 4 
    951973    set_namelist namelist_cfg jpnj 8 
    … …  
    954976    set_namelist namelist_cfg nn_rstctl 2 
    955977    set_namelist namelist_cfg nn_date0 010109 
    956     set_namelist namelist_cfg cn_ocerst_in \"SAS_00000128_restart\" 
    957     set_namelist namelist_ice_cfg cn_icerst_in \"SAS_00000128_restart_ice\" 
     978    set_namelist namelist_cfg cn_ocerst_in \"SAS_${ITRST}_restart\" 
     979    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_${ITRST}_restart_ice\" 
    958980    if [ ${USING_XIOS_RRW} == "yes" ] 
    959981       then 
    … …  
    966988       set_xio_using_server iodef.xml false 
    967989    fi 
    968     if [ ${USING_XIOS_RRW} == "yes" ]; then 
    969         ln -sf ../LONG/SAS_00000128_restart.nc . 
    970         ln -sf ../LONG/SAS_00000128_restart_ice.nc . 
    971     else 
    972         for (( i=1; i<=$NPROC; i++)) ; do 
    973             L_NPROC=$(( $i - 1 )) 
    974             L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    975             ln -sf ../LONG/SAS_00000128_restart_${L_NPROC}.nc . 
    976             ln -sf ../LONG/SAS_00000128_restart_ice_${L_NPROC}.nc . 
    977         done 
    978     fi 
     990    for (( i=1; i<=$NPROC; i++)) ; do 
     991        L_NPROC=$(( $i - 1 )) 
     992        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     993        ln -sf ../LONG/SAS_${ITRST}_restart_${L_NPROC}.nc . 
     994        ln -sf ../LONG/SAS_${ITRST}_restart_ice_${L_NPROC}.nc . 
     995    done 
    979996    cd ${SETTE_DIR} 
    980997    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    … …  
    9831000 
    9841001## Reproducibility tests 
     1002    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     1003    then 
     1004   ITEND=16  # 1 day 
     1005    else 
     1006   ITEND=80  # 5 days 
     1007    fi 
    9851008    export TEST_NAME="REPRO_4_8" 
    9861009    cd ${MAIN_DIR} 
    … …  
    9971020    set_namelist namelist_cfg cn_exp \"SAS_48\" 
    9981021    set_namelist namelist_cfg nn_it000 1 
    999     set_namelist namelist_cfg nn_itend 80 
     1022    set_namelist namelist_cfg nn_itend ${ITEND} 
    10001023    set_namelist namelist_cfg jpni 4 
    10011024    set_namelist namelist_cfg jpnj 8 
    … …  
    10251048    set_namelist namelist_cfg cn_exp \"SAS_84\" 
    10261049    set_namelist namelist_cfg nn_it000 1 
    1027     set_namelist namelist_cfg nn_itend 80 
     1050    set_namelist namelist_cfg nn_itend ${ITEND} 
    10281051    set_namelist namelist_cfg jpni 8 
    10291052    set_namelist namelist_cfg jpnj 4 
    … …  
    10521075if [ ${config} == "ORCA2_ICE_OBS" ] ; then 
    10531076## Reproducibility tests 
     1077    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     1078    then 
     1079   ITEND=16  # 1 day 
     1080    else 
     1081   ITEND=80  # 5 days 
     1082    fi 
    10541083    export TEST_NAME="REPRO_4_8" 
    10551084    cd ${MAIN_DIR} 
    … …  
    10601089    clean_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST 'cfgs' 
    10611090    # 
    1062     . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc ${ADD_KEYS}" del_key "key_top" 
     1091    . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST -r ORCA2_ICE_PISCES -d "OCE ICE"  -j 8 add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}" 
    10631092    cd ${SETTE_DIR} 
    10641093    . ./param.cfg 
    … …  
    10731102    set_namelist namelist_cfg cn_exp \"O2L3OBS_48\" 
    10741103    set_namelist namelist_cfg nn_it000 1 
    1075     set_namelist namelist_cfg nn_itend 80 
     1104    set_namelist namelist_cfg nn_itend ${ITEND} 
    10761105    set_namelist namelist_cfg ln_read_cfg .true. 
    10771106    set_namelist namelist_cfg jpni 4 
    … …  
    11251154    set_namelist namelist_cfg cn_exp \"O2L3OBS_84\" 
    11261155    set_namelist namelist_cfg nn_it000 1 
    1127     set_namelist namelist_cfg nn_itend 80 
     1156    set_namelist namelist_cfg nn_itend ${ITEND} 
    11281157    set_namelist namelist_cfg ln_read_cfg .true. 
    11291158    set_namelist namelist_cfg jpni 8 
    … …  
    11721201if [ ${config} == "AGRIF" ] ;  then 
    11731202## Restartability tests 
     1203    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     1204    then 
     1205   ITEND=4   # 6h 
     1206    else 
     1207   ITEND=20  # 1d and 6h 
     1208    fi 
     1209    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
     1210    ITRST_1=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
     1211    ITRST_2=$( printf "%08d" $(( ${ITEND} * 4 / 2 )) ) 
     1212    ITRST_3=$( printf "%08d" $(( ${ITEND} * 4 * 3 / 2 )) ) 
    11741213    export TEST_NAME="LONG" 
    11751214    cd ${MAIN_DIR} 
    … …  
    11931232    set_namelist namelist_cfg cn_exp \"AGRIF_LONG\" 
    11941233    set_namelist namelist_cfg nn_it000 1 
    1195     set_namelist namelist_cfg nn_itend 20 
    1196     set_namelist namelist_cfg nn_stock 10 
     1234    set_namelist namelist_cfg nn_itend ${ITEND} 
     1235    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    11971236    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    11981237    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    … …  
    12011240    set_namelist 1_namelist_cfg cn_exp \"AGRIF_LONG\" 
    12021241    set_namelist 1_namelist_cfg nn_it000 1 
    1203     set_namelist 1_namelist_cfg nn_itend 20 
    1204     set_namelist 1_namelist_cfg nn_stock 10 
     1242    set_namelist 1_namelist_cfg nn_itend ${ITEND} 
     1243    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    12051244    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    12061245    set_namelist 2_namelist_cfg cn_exp \"AGRIF_LONG\" 
    12071246    set_namelist 2_namelist_cfg nn_it000 1 
    1208     set_namelist 2_namelist_cfg nn_itend 80 
    1209     set_namelist 2_namelist_cfg nn_stock 40 
     1247    set_namelist 2_namelist_cfg nn_itend $(( ${ITEND} * 4 )) 
     1248    set_namelist 2_namelist_cfg nn_stock $(( ${ITEND} * 4 / 2 )) 
    12101249    set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true. 
    12111250    set_namelist 3_namelist_cfg cn_exp \"AGRIF_LONG\" 
    12121251    set_namelist 3_namelist_cfg nn_it000 1 
    1213     set_namelist 3_namelist_cfg nn_itend 240 
    1214     set_namelist 3_namelist_cfg nn_stock 120 
     1252    set_namelist 3_namelist_cfg nn_itend $(( ${ITEND} * 4 * 3 )) 
     1253    set_namelist 3_namelist_cfg nn_stock $(( ${ITEND} * 4 * 3 / 2 )) 
    12151254    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    12161255 
    … …  
    12301269    cd ${EXE_DIR} 
    12311270    set_namelist namelist_cfg cn_exp \"AGRIF_SHORT\" 
    1232     set_namelist namelist_cfg nn_it000 11 
    1233     set_namelist namelist_cfg nn_itend 20 
    1234     set_namelist namelist_cfg nn_stock 10 
     1271    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     1272    set_namelist namelist_cfg nn_itend ${ITEND} 
     1273    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    12351274    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    12361275    set_namelist namelist_cfg ln_rstart .true. 
    … …  
    12411280    fi 
    12421281    set_namelist 1_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    1243     set_namelist 1_namelist_cfg nn_it000 11 
    1244     set_namelist 1_namelist_cfg nn_itend 20 
    1245     set_namelist 1_namelist_cfg nn_stock 10 
     1282    set_namelist 1_namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     1283    set_namelist 1_namelist_cfg nn_itend ${ITEND} 
     1284    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    12461285    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    12471286    set_namelist 1_namelist_cfg ln_rstart .true. 
    12481287    set_namelist 1_namelist_cfg nn_rstctl 2 
    12491288    set_namelist 2_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    1250     set_namelist 2_namelist_cfg nn_it000 41 
    1251     set_namelist 2_namelist_cfg nn_itend 80 
    1252     set_namelist 2_namelist_cfg nn_stock 40 
     1289    set_namelist 2_namelist_cfg nn_it000 $(( ${ITEND} * 4 / 2 + 1 )) 
     1290    set_namelist 2_namelist_cfg nn_itend $(( ${ITEND} * 4 )) 
     1291    set_namelist 2_namelist_cfg nn_stock $(( ${ITEND} * 4 / 2 )) 
    12531292    set_namelist 2_namelist_cfg sn_cfctl%l_runstat .true. 
    12541293    set_namelist 2_namelist_cfg ln_rstart .true. 
    12551294    set_namelist 2_namelist_cfg nn_rstctl 2 
    12561295    set_namelist 3_namelist_cfg cn_exp \"AGRIF_SHORT\" 
    1257     set_namelist 3_namelist_cfg nn_it000 121 
    1258     set_namelist 3_namelist_cfg nn_itend 240 
    1259     set_namelist 3_namelist_cfg nn_stock 120 
     1296    set_namelist 3_namelist_cfg nn_it000 $(( ${ITEND} * 4 * 3 / 2 + 1 )) 
     1297    set_namelist 3_namelist_cfg nn_itend $(( ${ITEND} * 4 * 3 )) 
     1298    set_namelist 3_namelist_cfg nn_stock $(( ${ITEND} * 4 * 3 / 2 )) 
    12601299    set_namelist 3_namelist_cfg sn_cfctl%l_runstat .true. 
    12611300    set_namelist 3_namelist_cfg ln_rstart .true. 
    12621301    set_namelist 3_namelist_cfg nn_rstctl 2 
    1263     set_namelist namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000010_restart\" 
    1264     set_namelist namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000010_restart_ice\" 
    1265     set_namelist 1_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000010_restart\" 
    1266     set_namelist 1_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000010_restart_ice\" 
    1267     set_namelist 2_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000040_restart\" 
    1268     set_namelist 2_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000040_restart_ice\" 
    1269     set_namelist 3_namelist_cfg cn_ocerst_in \"AGRIF_LONG_00000120_restart\" 
    1270     set_namelist 3_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_00000120_restart_ice\" 
    1271  
    1272     if [ ${USING_XIOS_RRW} == "yes" ]; then 
    1273         ln -sf ../LONG/AGRIF_LONG_00000010_restart.nc . 
    1274         ln -sf ../LONG/1_AGRIF_LONG_00000010_restart.nc . 
    1275         ln -sf ../LONG/2_AGRIF_LONG_00000040_restart.nc . 
    1276         ln -sf ../LONG/3_AGRIF_LONG_00000120_restart.nc . 
    1277         ln -sf ../LONG/AGRIF_LONG_00000010_restart_ice.nc . 
    1278         ln -sf ../LONG/1_AGRIF_LONG_00000010_restart_ice.nc . 
    1279         ln -sf ../LONG/2_AGRIF_LONG_00000040_restart_ice.nc . 
    1280         ln -sf ../LONG/3_AGRIF_LONG_00000120_restart_ice.nc . 
    1281     else 
    1282         for (( i=1; i<=$NPROC; i++)) ; do 
    1283             L_NPROC=$(( $i - 1 )) 
    1284             L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    1285             ln -sf ../LONG/AGRIF_LONG_00000010_restart_${L_NPROC}.nc . 
    1286             ln -sf ../LONG/1_AGRIF_LONG_00000010_restart_${L_NPROC}.nc . 
    1287             ln -sf ../LONG/2_AGRIF_LONG_00000040_restart_${L_NPROC}.nc . 
    1288             ln -sf ../LONG/3_AGRIF_LONG_00000120_restart_${L_NPROC}.nc . 
    1289             ln -sf ../LONG/AGRIF_LONG_00000010_restart_ice_${L_NPROC}.nc . 
    1290             ln -sf ../LONG/1_AGRIF_LONG_00000010_restart_ice_${L_NPROC}.nc . 
    1291             ln -sf ../LONG/2_AGRIF_LONG_00000040_restart_ice_${L_NPROC}.nc . 
    1292             ln -sf ../LONG/3_AGRIF_LONG_00000120_restart_ice_${L_NPROC}.nc . 
    1293         done 
    1294     fi 
     1302    set_namelist namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST}_restart\" 
     1303    set_namelist namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST}_restart_ice\" 
     1304    set_namelist 1_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_1}_restart\" 
     1305    set_namelist 1_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_1}_restart_ice\" 
     1306    set_namelist 2_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_2}_restart\" 
     1307    set_namelist 2_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_2}_restart_ice\" 
     1308    set_namelist 3_namelist_cfg cn_ocerst_in \"AGRIF_LONG_${ITRST_3}_restart\" 
     1309    set_namelist 3_namelist_ice_cfg cn_icerst_in \"AGRIF_LONG_${ITRST_3}_restart_ice\" 
     1310 
     1311    for (( i=1; i<=$NPROC; i++)) ; do 
     1312        L_NPROC=$(( $i - 1 )) 
     1313        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     1314        ln -sf ../LONG/AGRIF_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     1315        ln -sf ../LONG/AGRIF_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
     1316        ln -sf ../LONG/1_AGRIF_LONG_${ITRST_1}_restart_${L_NPROC}.nc . 
     1317        ln -sf ../LONG/1_AGRIF_LONG_${ITRST_1}_restart_ice_${L_NPROC}.nc . 
     1318        ln -sf ../LONG/2_AGRIF_LONG_${ITRST_2}_restart_${L_NPROC}.nc . 
     1319        ln -sf ../LONG/2_AGRIF_LONG_${ITRST_2}_restart_ice_${L_NPROC}.nc . 
     1320        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_${L_NPROC}.nc . 
     1321        ln -sf ../LONG/3_AGRIF_LONG_${ITRST_3}_restart_ice_${L_NPROC}.nc . 
     1322    done 
    12951323    if [ ${USING_MPMD} == "yes" ] ; then 
    12961324       set_xio_using_server iodef.xml true 
    … …  
    13181346    set_namelist namelist_cfg cn_exp \"AGRIF_28\" 
    13191347    set_namelist namelist_cfg nn_it000 1 
    1320     set_namelist namelist_cfg nn_itend 20 
     1348    set_namelist namelist_cfg nn_itend ${ITEND} 
    13211349    set_namelist namelist_cfg jpni 2 
    13221350    set_namelist namelist_cfg jpnj 8 
    … …  
    13271355    set_namelist 1_namelist_cfg cn_exp \"AGRIF_28\" 
    13281356    set_namelist 1_namelist_cfg nn_it000 1 
    1329     set_namelist 1_namelist_cfg nn_itend 20 
     1357    set_namelist 1_namelist_cfg nn_itend ${ITEND} 
    13301358    set_namelist 1_namelist_cfg jpni 2 
    13311359    set_namelist 1_namelist_cfg jpnj 8 
    … …  
    13331361    set_namelist 2_namelist_cfg cn_exp \"AGRIF_28\" 
    13341362    set_namelist 2_namelist_cfg nn_it000 1 
    1335     set_namelist 2_namelist_cfg nn_itend 80 
     1363    set_namelist 2_namelist_cfg nn_itend $(( ${ITEND} * 4 )) 
    13361364    set_namelist 2_namelist_cfg jpni 2 
    13371365    set_namelist 2_namelist_cfg jpnj 8 
    … …  
    13391367    set_namelist 3_namelist_cfg cn_exp \"AGRIF_28\" 
    13401368    set_namelist 3_namelist_cfg nn_it000 1 
    1341     set_namelist 3_namelist_cfg nn_itend 240 
     1369    set_namelist 3_namelist_cfg nn_itend $(( ${ITEND} * 4 * 3 )) 
    13421370    set_namelist 3_namelist_cfg jpni 2 
    13431371    set_namelist 3_namelist_cfg jpnj 8 
    … …  
    13651393    set_namelist namelist_cfg cn_exp \"AGRIF_44\" 
    13661394    set_namelist namelist_cfg nn_it000 1 
    1367     set_namelist namelist_cfg nn_itend 20 
     1395    set_namelist namelist_cfg nn_itend ${ITEND} 
    13681396    set_namelist namelist_cfg jpni 4 
    13691397    set_namelist namelist_cfg jpnj 4 
    … …  
    13741402    set_namelist 1_namelist_cfg cn_exp \"AGRIF_44\" 
    13751403    set_namelist 1_namelist_cfg nn_it000 1 
    1376     set_namelist 1_namelist_cfg nn_itend 20 
     1404    set_namelist 1_namelist_cfg nn_itend ${ITEND} 
    13771405    set_namelist 1_namelist_cfg jpni 4 
    13781406    set_namelist 1_namelist_cfg jpnj 4 
    … …  
    13801408    set_namelist 2_namelist_cfg cn_exp \"AGRIF_44\" 
    13811409    set_namelist 2_namelist_cfg nn_it000 1 
    1382     set_namelist 2_namelist_cfg nn_itend 80 
     1410    set_namelist 2_namelist_cfg nn_itend $(( ${ITEND} * 4 )) 
    13831411    set_namelist 2_namelist_cfg jpni 4 
    13841412    set_namelist 2_namelist_cfg jpnj 4 
    … …  
    13861414    set_namelist 3_namelist_cfg cn_exp \"AGRIF_44\" 
    13871415    set_namelist 3_namelist_cfg nn_it000 1 
    1388     set_namelist 3_namelist_cfg nn_itend 240 
     1416    set_namelist 3_namelist_cfg nn_itend $(( ${ITEND} * 4 * 3 )) 
    13891417    set_namelist 3_namelist_cfg jpni 4 
    13901418    set_namelist 3_namelist_cfg jpnj 4 
    … …  
    14021430 
    14031431## test code corruption with AGRIF (phase 1) ==> Compile with key_agrif but run with no zoom 
     1432    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     1433    then 
     1434   ITEND=16   # 1d 
     1435    else 
     1436   ITEND=150  # 5d and 9h  
     1437    fi 
    14041438    export TEST_NAME="ORCA2" 
    14051439    cd ${MAIN_DIR} 
    … …  
    14161450    set_namelist namelist_cfg cn_exp \"ORCA2\" 
    14171451    set_namelist namelist_cfg nn_it000 1 
    1418     set_namelist namelist_cfg nn_itend 150 
     1452    set_namelist namelist_cfg nn_itend ${ITEND} 
    14191453    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    14201454    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    … …  
    14481482    clean_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST 'cfgs' 
    14491483    # 
    1450     . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "key_agrif" 
     1484    . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST -r AGRIF_DEMO -j 8 add_key "${ADD_KEYS}" del_key "key_agrif ${DEL_KEYS}" 
    14511485    cd ${SETTE_DIR} 
    14521486    . ./param.cfg 
    … …  
    14611495    set_namelist namelist_cfg cn_exp \"ORCA2\" 
    14621496    set_namelist namelist_cfg nn_it000 1 
    1463     set_namelist namelist_cfg nn_itend 150 
     1497    set_namelist namelist_cfg nn_itend ${ITEND} 
    14641498    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    14651499    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    … …  
    14801514 
    14811515# ------- 
    1482 # SPITZ12 
     1516# WED025 
    14831517# ------- 
    1484 if [ ${config} == "SPITZ12" ] ;  then 
     1518if [ ${config} == "WED025" ] ;  then 
    14851519## Restartability tests 
     1520    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     1521    then 
     1522   ITEND=12   # 4h 
     1523    else 
     1524   ITEND=720  # 10 days 
     1525    fi 
     1526    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    14861527    export TEST_NAME="LONG" 
    14871528    cd ${MAIN_DIR} 
    … …  
    14891530    # syncronisation if target directory/file exist (not done by makenemo) 
    14901531    . ${SETTE_DIR}/all_functions.sh 
    1491     sync_config  SPITZ12 SPITZ12_ST 'cfgs' 
    1492     clean_config SPITZ12 SPITZ12_ST 'cfgs' 
    1493     # 
    1494     . ./makenemo -m ${CMP_NAM} -n SPITZ12_ST -r SPITZ12 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     1532    sync_config  WED025 WED025_ST 'cfgs' 
     1533    clean_config WED025 WED025_ST 'cfgs' 
     1534    # 
     1535    . ./makenemo -m ${CMP_NAM} -n WED025_ST -r WED025 -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    14951536    cd ${SETTE_DIR} 
    14961537    . ./param.cfg 
    … …  
    15031544    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    15041545    cd ${EXE_DIR} 
    1505     set_namelist namelist_cfg cn_exp \"S12_LONG\" 
    1506     set_namelist namelist_cfg nn_it000 1 
    1507     set_namelist namelist_cfg nn_itend 240 
    1508     set_namelist namelist_cfg nn_stock 120 
    1509     set_namelist namelist_cfg nn_date0 20020101 
     1546    set_namelist namelist_cfg cn_exp \"WED025_LONG\" 
     1547    set_namelist namelist_cfg nn_it000 1 
     1548    set_namelist namelist_cfg nn_itend ${ITEND} 
     1549    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     1550    set_namelist namelist_cfg nn_date0 20000115 
    15101551    set_namelist namelist_cfg jpni 4 
    15111552    set_namelist namelist_cfg jpnj 8 
    … …  
    15221563    fi 
    15231564    cd ${SETTE_DIR} 
    1524     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     1565    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    15251566     
    15261567    cd ${SETTE_DIR} 
    … …  
    15301571    clean_valid_dir 
    15311572    cd ${EXE_DIR} 
    1532     set_namelist namelist_cfg cn_exp \"S12_SHORT\" 
    1533     set_namelist namelist_cfg nn_it000 121 
    1534     set_namelist namelist_cfg nn_itend 240 
    1535     set_namelist namelist_cfg nn_stock 120 
     1573    set_namelist namelist_cfg cn_exp \"WED025_SHORT\" 
     1574    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     1575    set_namelist namelist_cfg nn_itend ${ITEND} 
     1576    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    15361577    set_namelist namelist_cfg ln_rstart .true. 
    15371578    set_namelist namelist_cfg nn_rstctl 2 
    … …  
    15391580    set_namelist namelist_cfg jpnj 8 
    15401581    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1541     set_namelist namelist_cfg cn_ocerst_in \"S12_LONG_00000120_restart\" 
    1542     set_namelist namelist_ice_cfg cn_icerst_in \"S12_LONG_00000120_restart_ice\" 
    1543     if [ ${USING_XIOS_RRW} == "yes" ] 
    1544        then 
    1545        set_namelist namelist_cfg nn_wxios 1 
    1546        set_namelist namelist_cfg ln_xios_read .true. 
    1547     fi 
    1548  
    1549     if [ ${USING_XIOS_RRW} == "yes" ]; then 
    1550         ln -sf ../LONG/S12_LONG_00000120_restart.nc . 
    1551         ln -sf ../LONG/S12_LONG_00000120_restart_ice.nc . 
    1552     else 
    1553         for (( i=1; i<=$NPROC; i++)) ; do 
    1554             L_NPROC=$(( $i - 1 )) 
    1555             L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    1556             ln -sf ../LONG/S12_LONG_00000120_restart_${L_NPROC}.nc . 
    1557             ln -sf ../LONG/S12_LONG_00000120_restart_ice_${L_NPROC}.nc . 
    1558         done 
    1559     fi 
    1560     if [ ${USING_MPMD} == "yes" ] ; then 
    1561        set_xio_using_server iodef.xml true 
    1562     else 
    1563        set_xio_using_server iodef.xml false 
    1564     fi 
    1565     cd ${SETTE_DIR} 
    1566     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     1582    set_namelist namelist_cfg cn_ocerst_in \"WED025_LONG_${ITRST}_restart\" 
     1583    set_namelist namelist_ice_cfg cn_icerst_in \"WED025_LONG_${ITRST}_restart_ice\" 
     1584    for (( i=1; i<=$NPROC; i++)) ; do 
     1585        L_NPROC=$(( $i - 1 )) 
     1586        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     1587        ln -sf ../LONG/WED025_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     1588        ln -sf ../LONG/WED025_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
     1589    done 
     1590    if [ ${USING_MPMD} == "yes" ] ; then 
     1591       set_xio_using_server iodef.xml true 
     1592    else 
     1593       set_xio_using_server iodef.xml false 
     1594    fi 
     1595    cd ${SETTE_DIR} 
     1596    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    15671597    cd ${SETTE_DIR} 
    15681598    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    15691599 
    15701600## Reproducibility tests 
    1571     export TEST_NAME="REPRO_4_8" 
     1601    export TEST_NAME="REPRO_5_6" 
    15721602    cd ${MAIN_DIR} 
    15731603    cd ${SETTE_DIR} 
    … …  
    15811611    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    15821612    cd ${EXE_DIR} 
    1583     set_namelist namelist_cfg cn_exp \"S12_48\" 
    1584     set_namelist namelist_cfg nn_it000 1 
    1585     set_namelist namelist_cfg nn_itend 120 
    1586     set_namelist namelist_cfg nn_date0 20020101 
    1587     set_namelist namelist_cfg jpni 4 
    1588     set_namelist namelist_cfg jpnj 8 
    1589     set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    1590     if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    1591        set_namelist namelist_cfg nn_wxios 1 
    1592     fi 
    1593     if [ ${USING_MPMD} == "yes" ] ; then 
    1594        set_xio_using_server iodef.xml true 
    1595     else 
    1596        set_xio_using_server iodef.xml false 
    1597     fi 
    1598     cd ${SETTE_DIR} 
    1599     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     1613    set_namelist namelist_cfg cn_exp \"WED025_56\" 
     1614    set_namelist namelist_cfg nn_it000 1 
     1615    set_namelist namelist_cfg nn_itend ${ITEND} 
     1616    set_namelist namelist_cfg nn_date0 20000115 
     1617    set_namelist namelist_cfg jpni 6 
     1618    set_namelist namelist_cfg jpnj 7 
     1619    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     1620    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
     1621       set_namelist namelist_cfg nn_wxios 1 
     1622    fi 
     1623    if [ ${USING_MPMD} == "yes" ] ; then 
     1624       set_xio_using_server iodef.xml true 
     1625    else 
     1626       set_xio_using_server iodef.xml false 
     1627    fi 
     1628    cd ${SETTE_DIR} 
     1629    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    16001630    cd ${SETTE_DIR} 
    16011631    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    16101640    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    16111641    cd ${EXE_DIR} 
    1612     set_namelist namelist_cfg cn_exp \"S12_84\" 
    1613     set_namelist namelist_cfg nn_it000 1 
    1614     set_namelist namelist_cfg nn_itend 120 
    1615     set_namelist namelist_cfg nn_date0 20020101 
     1642    set_namelist namelist_cfg cn_exp \"WED025_84\" 
     1643    set_namelist namelist_cfg nn_it000 1 
     1644    set_namelist namelist_cfg nn_itend ${ITEND} 
     1645    set_namelist namelist_cfg nn_date0 20000115 
    16161646    set_namelist namelist_cfg jpni 8 
    16171647    set_namelist namelist_cfg jpnj 4 
    … …  
    16261656    fi 
    16271657    cd ${SETTE_DIR} 
    1628     . ./prepare_job.sh input_SPITZ12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     1658    . ./prepare_job.sh input_WED025.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    16291659    cd ${SETTE_DIR} 
    16301660    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 

  • utils/CI/r12931_sette_ticket2462/sette_rpt.sh

    r12569 r13754  
    489489 echo "" 
    490490 echo "   !----restart----!   " 
    491  for restart_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WICE_AGRIF_ST  
     491 for restart_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WICE_AGRIF_ST  
    492492 do 
    493493   resttest $NEMO_VALID $restart_test $pass 
    … …  
    497497 echo "" 
    498498 echo "   !----repro----!   " 
    499  for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WORCA2_ICE_OBS_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WICE_AGRIF_ST 
     499 for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WORCA2_ICE_OBS_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WVORTEX_ST WICE_AGRIF_ST 
    500500 do 
    501501   reprotest $NEMO_VALID $repro_test $pass 
    … …  
    524524     echo "REFERENCE directory : $NEMO_VALID_REF at rev $NEMO_REV_REF" 
    525525     echo '' 
    526      for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WISOMIP_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WICE_AGRIF_ST 
     526     for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WWED025_ST WISOMIP+_ST WVORTEX_ST WICE_AGRIF_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST 
    527527     do 
    528528       runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass 

  • utils/CI/r12931_sette_ticket2462/sette_test-cases.sh

    r12999 r13754  
    150150# VORTEX         :  
    151151# ICE_AGRIF      :  
    152 # ISOMIP         :  
     152# ISOMIP+         :  
    153153# WAD 
    154154 
    … …  
    162162if [ ${config} == "OVERFLOW" ] ;  then 
    163163    ## Restartability tests for OVERFLOW 
     164    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     165    then 
     166   ITEND=12 
     167    else 
     168   ITEND=120 
     169    fi 
     170    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    164171    export TEST_NAME="LONG" 
    165172    cd ${MAIN_DIR} 
    … …  
    184191    set_namelist namelist_cfg cn_exp \"OVF_LONG\" 
    185192    set_namelist namelist_cfg nn_it000 1 
    186     set_namelist namelist_cfg nn_itend 120 
    187     set_namelist namelist_cfg nn_stock 60 
     193    set_namelist namelist_cfg nn_itend ${ITEND} 
     194    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    188195    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    189196    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    … …  
    205212    cd ${EXE_DIR} 
    206213    set_namelist namelist_cfg cn_exp \"OVF_SHORT\" 
    207     set_namelist namelist_cfg nn_it000 61 
    208     set_namelist namelist_cfg nn_itend 120 
    209     set_namelist namelist_cfg nn_stock 60 
     214    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     215    set_namelist namelist_cfg nn_itend ${ITEND} 
     216    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    210217    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    211218    set_namelist namelist_cfg ln_rstart .true. 
    212219    set_namelist namelist_cfg nn_rstctl 2 
    213     set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_00000060_restart\" 
     220    set_namelist namelist_cfg cn_ocerst_in \"OVF_LONG_${ITRST}_restart\" 
    214221    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    215222       set_namelist namelist_cfg nn_wxios 1 
    … …  
    221228       set_xio_using_server iodef.xml false 
    222229    fi 
    223     ln -sf ../LONG/OVF_LONG_00000060_restart.nc . 
     230    ln -sf ../LONG/OVF_LONG_${ITRST}_restart.nc . 
    224231 
    225232    cd ${SETTE_DIR} 
    … …  
    231238    ## Test for all advection, vert. coordinates, vector form, flux form: test runability and complete all time steps 
    232239    ## Needed namelist-xxxx for every type of run tested 
     240    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     241    then 
     242   ITEND=12 
     243    else 
     244   ITEND=6120 
     245    fi 
    233246    cd ${CONFIG_DIR}/${NEW_CONF}/EXP00 
    234247 
    … …  
    251264        rm namelist_*_*_*_* 
    252265        cp -pL ${CONFIG_DIR}/${NEW_CONF}/EXP00/$file namelist_cfg 
     266   set_namelist namelist_cfg nn_it000 1 
     267   set_namelist namelist_cfg nn_itend ${ITEND} 
    253268        if [ ${USING_MPMD} == "yes" ] ; then 
    254269           set_xio_using_server iodef.xml true 
    … …  
    269284if [ ${config} == "LOCK_EXCHANGE" ] ;  then 
    270285    ## Restartability tests for LOCK_EXCHANGE 
     286    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     287    then 
     288   ITEND=12 
     289    else 
     290   ITEND=120 
     291    fi 
     292    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    271293    export TEST_NAME="LONG" 
    272294    cd ${MAIN_DIR} 
    … …  
    292314    set_namelist namelist_cfg cn_exp \"LOCK_LONG\" 
    293315    set_namelist namelist_cfg nn_it000 1 
    294     set_namelist namelist_cfg nn_stock 60 
    295     set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    296     set_namelist namelist_cfg nn_itend 120 
     316    set_namelist namelist_cfg nn_itend ${ITEND} 
     317    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     318    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    297319    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    298320       set_namelist namelist_cfg nn_wxios 1 
    … …  
    313335    cd ${EXE_DIR} 
    314336    set_namelist namelist_cfg cn_exp \"LOCK_SHORT\" 
    315     set_namelist namelist_cfg nn_it000 61 
    316     set_namelist namelist_cfg nn_itend 120 
    317     set_namelist namelist_cfg nn_stock 60 
     337    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     338    set_namelist namelist_cfg nn_itend ${ITEND} 
     339    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    318340    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    319341    set_namelist namelist_cfg ln_rstart .true. 
    320342    set_namelist namelist_cfg nn_rstctl 2 
    321     set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_00000060_restart\" 
    322     if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    323        set_namelist namelist_cfg nn_wxios 1 
    324     fi 
    325     if [ ${USING_MPMD} == "yes" ] ; then 
    326        set_xio_using_server iodef.xml true 
    327     else 
    328        set_xio_using_server iodef.xml false 
    329     fi 
    330     ln -sf ../LONG/LOCK_LONG_00000060_restart.nc . 
     343    set_namelist namelist_cfg cn_ocerst_in \"LOCK_LONG_${ITRST}_restart\" 
     344    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
     345       set_namelist namelist_cfg nn_wxios 1 
     346    fi 
     347    if [ ${USING_MPMD} == "yes" ] ; then 
     348       set_xio_using_server iodef.xml true 
     349    else 
     350       set_xio_using_server iodef.xml false 
     351    fi 
     352    ln -sf ../LONG/LOCK_LONG_${ITRST}_restart.nc . 
    331353 
    332354    cd ${SETTE_DIR} 
    … …  
    377399if [ ${config} == "VORTEX" ] ;  then  
    378400## Restartability tests for VORTEX 
     401    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     402    then 
     403   ITEND=12 
     404    else 
     405   ITEND=240 
     406    fi 
     407    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
     408    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
    379409    export TEST_NAME="LONG" 
    380410    cd ${MAIN_DIR} 
    … …  
    400430    set_namelist namelist_cfg cn_exp \"VORTEX_LONG\" 
    401431    set_namelist namelist_cfg nn_it000 1 
    402     set_namelist namelist_cfg nn_itend 240 
    403     set_namelist namelist_cfg nn_stock 120 
    404     set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
     432    set_namelist namelist_cfg nn_itend ${ITEND} 
     433    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     434    set_namelist namelist_cfg sn_cfctl%l_runstat .true.   
    405435    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    406436       set_namelist namelist_cfg nn_wxios 1 
    … …  
    409439    set_namelist 1_namelist_cfg cn_exp \"VORTEX_LONG\" 
    410440    set_namelist 1_namelist_cfg nn_it000 1 
    411     set_namelist 1_namelist_cfg nn_itend 720 
    412     set_namelist 1_namelist_cfg nn_stock 360 
     441    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     442    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    413443    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    414444 
    … …  
    433463    cd ${EXE_DIR} 
    434464    set_namelist namelist_cfg cn_exp \"VORTEX_SHORT\" 
    435     set_namelist namelist_cfg nn_it000 121 
    436     set_namelist namelist_cfg nn_itend 240 
    437     set_namelist namelist_cfg nn_stock 120 
     465    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     466    set_namelist namelist_cfg nn_itend ${ITEND} 
     467    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    438468    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    439469    set_namelist namelist_cfg ln_rstart .true. 
    440470    set_namelist namelist_cfg nn_rstctl 2 
    441     set_namelist namelist_cfg cn_ocerst_in \"VORTEX_LONG_00000120_restart\" 
     471    set_namelist namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST}_restart\" 
    442472    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    443473       set_namelist namelist_cfg nn_wxios 1 
    … …  
    446476     
    447477    set_namelist 1_namelist_cfg cn_exp \"VORTEX_SHORT\" 
    448     set_namelist 1_namelist_cfg nn_it000 361 
    449     set_namelist 1_namelist_cfg nn_itend 720 
     478    set_namelist 1_namelist_cfg nn_it000 $(( ${ITEND} * 3 / 2 + 1 )) 
     479    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     480    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    450481    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    451     set_namelist 1_namelist_cfg nn_stock 360 
    452482    set_namelist 1_namelist_cfg ln_rstart .true. 
    453483    set_namelist 1_namelist_cfg nn_rstctl 2 
    454     set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_00000360_restart\" 
     484    set_namelist 1_namelist_cfg cn_ocerst_in \"VORTEX_LONG_${ITRST_1}_restart\" 
    455485       
    456486    if [ ${USING_MPMD} == "yes" ] ; then 
    … …  
    460490    fi 
    461491    if [[ ($NPROC -eq 1 || ${USING_XIOS_RRW} == "yes") ]];  then 
    462         ln -sf ../LONG/VORTEX_LONG_00000120_restart.nc . 
    463         ln -sf ../LONG/1_VORTEX_LONG_00000360_restart.nc . 
     492        ln -sf ../LONG/VORTEX_LONG_${ITRST}_restart.nc . 
     493        ln -sf ../LONG/1_VORTEX_LONG_${ITRST_1}_restart.nc . 
    464494    else 
    465495        for (( i=1; i<=$NPROC; i++)) ; do 
    466496            L_NPROC=$(( $i - 1 )) 
    467497            L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    468             ln -sf ../LONG/VORTEX_LONG_00000120_restart_${L_NPROC}.nc . 
    469             ln -sf ../LONG/1_VORTEX_LONG_00000360_restart_${L_NPROC}.nc . 
     498            ln -sf ../LONG/VORTEX_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     499            ln -sf ../LONG/1_VORTEX_LONG_${ITRST_1}_restart_${L_NPROC}.nc . 
    470500        done 
    471501    fi 
    … …  
    490520    set_namelist namelist_cfg cn_exp \"VORTEX_23\" 
    491521    set_namelist namelist_cfg nn_it000 1 
    492     set_namelist namelist_cfg nn_itend 240 
    493     set_namelist namelist_cfg nn_stock 120 
     522    set_namelist namelist_cfg nn_itend ${ITEND} 
     523    set_namelist namelist_cfg nn_stock ${ITEND} 
    494524    set_namelist namelist_cfg jpni 2 
    495525    set_namelist namelist_cfg jpnj 3 
    … …  
    502532    set_namelist 1_namelist_cfg cn_exp \"VORTEX_23\" 
    503533    set_namelist 1_namelist_cfg nn_it000 1 
    504     set_namelist 1_namelist_cfg nn_itend 720 
    505     set_namelist 1_namelist_cfg nn_stock 360 
     534    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     535    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 )) 
    506536    set_namelist 1_namelist_cfg jpni 2 
    507537    set_namelist 1_namelist_cfg jpnj 3 
    … …  
    530560    set_namelist namelist_cfg cn_exp \"VORTEX_32\" 
    531561    set_namelist namelist_cfg nn_it000 1 
    532     set_namelist namelist_cfg nn_itend 240 
    533     set_namelist namelist_cfg nn_stock 120 
     562    set_namelist namelist_cfg nn_itend ${ITEND} 
     563    set_namelist namelist_cfg nn_stock ${ITEND} 
    534564    set_namelist namelist_cfg jpni 3 
    535565    set_namelist namelist_cfg jpnj 2 
    … …  
    541571    set_namelist 1_namelist_cfg cn_exp \"VORTEX_32\" 
    542572    set_namelist 1_namelist_cfg nn_it000 1 
    543     set_namelist 1_namelist_cfg nn_itend 720 
    544     set_namelist 1_namelist_cfg nn_stock 360 
     573    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     574    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 )) 
    545575    set_namelist 1_namelist_cfg jpni 3 
    546576    set_namelist 1_namelist_cfg jpnj 2 
    … …  
    565595if [ ${config} == "ICE_AGRIF" ] ;  then  
    566596## Restartability tests for ICE_AGRIF 
     597    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     598    then 
     599   ITEND=10 
     600    else 
     601   ITEND=200 
     602    fi 
     603    ITRST=$(   printf "%08d" $(( ${ITEND} / 2 )) ) 
     604    ITRST_1=$( printf "%08d" $(( ${ITEND} * 3 / 2 )) ) 
    567605    export TEST_NAME="LONG" 
    568606    cd ${MAIN_DIR} 
    … …  
    588626    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_LONG\" 
    589627    set_namelist namelist_cfg nn_it000 1 
    590     set_namelist namelist_cfg nn_itend 200 
    591     set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    592     set_namelist namelist_cfg nn_stock 100 
     628    set_namelist namelist_cfg nn_itend ${ITEND} 
     629    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     630    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    593631    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    594632       set_namelist namelist_cfg nn_wxios 1 
    … …  
    596634    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_LONG\" 
    597635    set_namelist 1_namelist_cfg nn_it000 1 
    598     set_namelist 1_namelist_cfg nn_itend 600 
     636    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     637    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    599638    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    600     set_namelist 1_namelist_cfg nn_stock 300 
    601639     
    602640    if [ ${USING_MPMD} == "yes" ] ; then 
    … …  
    615653    cd ${EXE_DIR} 
    616654    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_SHORT\" 
    617     set_namelist namelist_cfg nn_it000 101 
    618     set_namelist namelist_cfg nn_itend 200 
    619     set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    620     set_namelist namelist_cfg nn_stock 100 
     655    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     656    set_namelist namelist_cfg nn_itend ${ITEND} 
     657    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     658    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    621659    set_namelist namelist_cfg ln_rstart .true. 
    622660    set_namelist namelist_cfg nn_rstctl 2 
    623     set_namelist namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_00000100_restart\" 
    624     set_namelist namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_00000100_restart_ice\" 
     661    set_namelist namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST}_restart\" 
     662    set_namelist namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST}_restart_ice\" 
    625663    if [ ${USING_XIOS_RRW} == "yes" ] ; then 
    626664       set_namelist namelist_cfg nn_wxios 1 
    … …  
    629667     
    630668    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_SHORT\" 
    631     set_namelist 1_namelist_cfg nn_it000 301 
    632     set_namelist 1_namelist_cfg nn_itend 600 
     669    set_namelist 1_namelist_cfg nn_it000 $(( ${ITEND} * 3 / 2 + 1 )) 
     670    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     671    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    633672    set_namelist 1_namelist_cfg sn_cfctl%l_runstat .true. 
    634     set_namelist 1_namelist_cfg nn_stock 300 
    635673    set_namelist 1_namelist_cfg ln_rstart .true. 
    636674    set_namelist 1_namelist_cfg nn_rstctl 2 
    637     set_namelist 1_namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_00000300_restart\" 
    638     set_namelist 1_namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_00000300_restart_ice\" 
     675    set_namelist 1_namelist_cfg cn_ocerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart\" 
     676    set_namelist 1_namelist_ice_cfg cn_icerst_in \"ICE_AGRIF_LONG_${ITRST_1}_restart_ice\" 
    639677     
    640678     
    … …  
    645683    fi 
    646684    if [[ ($NPROC -eq 1 || ${USING_XIOS_RRW} == "yes") ]] ;  then 
    647         ln -sf ../LONG/ICE_AGRIF_LONG_00000100_restart.nc . 
    648         ln -sf ../LONG/ICE_AGRIF_LONG_00000100_restart_ice.nc . 
    649         ln -sf ../LONG/1_ICE_AGRIF_LONG_00000300_restart.nc . 
    650         ln -sf ../LONG/1_ICE_AGRIF_LONG_00000300_restart_ice.nc . 
     685        ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart.nc . 
     686        ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart_ice.nc . 
     687        ln -sf ../LONG/1_ICE_AGRIF_LONG_${ITRST_1}_restart.nc . 
     688        ln -sf ../LONG/1_ICE_AGRIF_LONG_${ITRST_1}_restart_ice.nc . 
    651689    else 
    652690        for (( i=1; i<=$NPROC; i++)) ; do 
    653691            L_NPROC=$(( $i - 1 )) 
    654692            L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    655             ln -sf ../LONG/ICE_AGRIF_LONG_00000100_restart_${L_NPROC}.nc . 
    656             ln -sf ../LONG/ICE_AGRIF_LONG_00000100_restart_ice_${L_NPROC}.nc . 
    657             ln -sf ../LONG/1_ICE_AGRIF_LONG_00000300_restart_${L_NPROC}.nc . 
    658             ln -sf ../LONG/1_ICE_AGRIF_LONG_00000300_restart_ice_${L_NPROC}.nc . 
     693            ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     694            ln -sf ../LONG/ICE_AGRIF_LONG_${ITRST}_restart_ice_${L_NPROC}.nc . 
     695            ln -sf ../LONG/1_ICE_AGRIF_LONG_${ITRST_1}_restart_${L_NPROC}.nc . 
     696            ln -sf ../LONG/1_ICE_AGRIF_LONG_${ITRST_1}_restart_ice_${L_NPROC}.nc . 
    659697        done 
    660698    fi 
    … …  
    681719    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_23\" 
    682720    set_namelist namelist_cfg nn_it000 1 
    683     set_namelist namelist_cfg nn_itend 200 
    684     set_namelist namelist_cfg nn_stock 100 
     721    set_namelist namelist_cfg nn_itend ${ITEND} 
     722    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    685723    set_namelist namelist_cfg jpni 2 
    686724    set_namelist namelist_cfg jpnj 3 
    … …  
    692730    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_23\" 
    693731    set_namelist 1_namelist_cfg nn_it000 1 
    694     set_namelist 1_namelist_cfg nn_itend 600 
    695     set_namelist 1_namelist_cfg nn_stock 300 
     732    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     733    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    696734    set_namelist 1_namelist_cfg jpni 2 
    697735    set_namelist 1_namelist_cfg jpnj 3 
    … …  
    720758    set_namelist namelist_cfg cn_exp \"ICE_AGRIF_32\" 
    721759    set_namelist namelist_cfg nn_it000 1 
    722     set_namelist namelist_cfg nn_itend 200 
    723     set_namelist namelist_cfg nn_stock 100 
     760    set_namelist namelist_cfg nn_itend ${ITEND} 
     761    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    724762    set_namelist namelist_cfg jpni 3 
    725763    set_namelist namelist_cfg jpnj 2 
    … …  
    731769    set_namelist 1_namelist_cfg cn_exp \"ICE_AGRIF_32\" 
    732770    set_namelist 1_namelist_cfg nn_it000 1 
    733     set_namelist 1_namelist_cfg nn_itend 600 
    734     set_namelist 1_namelist_cfg nn_stock 300 
     771    set_namelist 1_namelist_cfg nn_itend $(( ${ITEND} * 3 )) 
     772    set_namelist 1_namelist_cfg nn_stock $(( ${ITEND} * 3 / 2 )) 
    735773    set_namelist 1_namelist_cfg jpni 3 
    736774    set_namelist 1_namelist_cfg jpnj 2 
    … …  
    750788 
    751789# ------ 
    752 # ISOMIP 
     790# ISOMIP+ 
    753791# ------ 
    754 if [ ${config} == "ISOMIP" ] ;  then 
     792if [ ${config} == "ISOMIP+" ] ;  then 
    755793## Restartability tests 
     794    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     795    then 
     796   ITEND=12 
     797    else 
     798   ITEND=1200 
     799    fi 
     800    ITRST=$( printf "%08d" $(( ${ITEND} / 2 )) ) 
    756801    export TEST_NAME="LONG" 
    757802    cd ${MAIN_DIR} 
    … …  
    760805    . ${SETTE_DIR}/all_functions.sh 
    761806    # 
    762     clean_config ISOMIP ISOMIP_ST 'tests' 
    763     # 
    764     sync_config  ISOMIP ISOMIP_ST 'tests' 
    765     # 
    766     . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -a ISOMIP -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
     807    clean_config ISOMIP+ ISOMIP+_ST 'tests' 
     808    # 
     809    sync_config  ISOMIP+ ISOMIP+_ST 'tests' 
     810    # 
     811    . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST -a ISOMIP+ -j 8 add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 
    767812    cd ${SETTE_DIR} 
    768813    . ./param.cfg 
    … …  
    772817    clean_valid_dir 
    773818    JOB_FILE=${EXE_DIR}/run_job.sh 
    774     NPROC=15 
     819    NPROC=27 
    775820    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    776821    cd ${EXE_DIR} 
    777     set_namelist namelist_cfg cn_exp \"ISOMIP_LONG\" 
    778     set_namelist namelist_cfg nn_it000 1 
    779     set_namelist namelist_cfg nn_itend 96 
    780     set_namelist namelist_cfg nn_stock 48 
    781     set_namelist namelist_cfg jpni 5 
     822    set_namelist namelist_cfg cn_exp \"ISOMIP+_LONG\" 
     823    set_namelist namelist_cfg nn_it000 1 
     824    set_namelist namelist_cfg nn_itend ${ITEND} 
     825    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
     826    set_namelist namelist_cfg jpni 9 
    782827    set_namelist namelist_cfg jpnj 3 
    783828    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    … …  
    792837    fi 
    793838    cd ${SETTE_DIR} 
    794     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     839    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    795840 
    796841    cd ${SETTE_DIR} 
    … …  
    800845    clean_valid_dir 
    801846    cd ${EXE_DIR} 
    802     set_namelist namelist_cfg cn_exp \"ISOMIP_SHORT\" 
    803     set_namelist namelist_cfg nn_it000 49 
    804     set_namelist namelist_cfg nn_itend 96 
    805     set_namelist namelist_cfg nn_stock 48 
     847    set_namelist namelist_cfg cn_exp \"ISOMIP+_SHORT\" 
     848    set_namelist namelist_cfg nn_it000 $(( ${ITEND} / 2 + 1 )) 
     849    set_namelist namelist_cfg nn_itend ${ITEND} 
     850    set_namelist namelist_cfg nn_stock $(( ${ITEND} / 2 )) 
    806851    set_namelist namelist_cfg ln_rstart .true. 
    807852    set_namelist namelist_cfg nn_rstctl 2 
    808     set_namelist namelist_cfg jpni 5 
     853    set_namelist namelist_cfg jpni 9 
    809854    set_namelist namelist_cfg jpnj 3 
    810855    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    811     set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\" 
     856    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP+_LONG_${ITRST}_restart\" 
    812857    if [ ${USING_XIOS_RRW} == "yes" ] 
    813858       then 
    … …  
    820865       set_xio_using_server iodef.xml false 
    821866    fi 
    822     if [ ${USING_XIOS_RRW} == "yes" ]; then 
    823         ln -sf ../LONG/ISOMIP_LONG_00000048_restart.nc . 
    824     else 
    825         for (( i=1; i<=$NPROC; i++)) ; do 
    826             L_NPROC=$(( $i - 1 )) 
    827             L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    828             ln -sf ../LONG/ISOMIP_LONG_00000048_restart_${L_NPROC}.nc . 
    829         done 
    830     fi 
    831     cd ${SETTE_DIR} 
    832     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     867    for (( i=1; i<=$NPROC; i++)) ; do 
     868        L_NPROC=$(( $i - 1 )) 
     869        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     870        ln -sf ../LONG/ISOMIP+_LONG_${ITRST}_restart_${L_NPROC}.nc . 
     871    done 
     872 
     873    cd ${SETTE_DIR} 
     874    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    833875    cd ${SETTE_DIR} 
    834876    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    835877 
    836878## Reproducibility tests 
    837     export TEST_NAME="REPRO_7_3" 
     879    if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 
     880    then 
     881   ITEND=12 
     882    else 
     883   ITEND=600 
     884    fi 
     885    export TEST_NAME="REPRO_9_3" 
    838886    cd ${MAIN_DIR} 
    839887    cd ${SETTE_DIR} 
    … …  
    844892    clean_valid_dir 
    845893    JOB_FILE=${EXE_DIR}/run_job.sh 
    846     NPROC=21 
     894    NPROC=27 
    847895    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    848896    cd ${EXE_DIR} 
    849     set_namelist namelist_cfg cn_exp \"ISOMIP_73\" 
    850     set_namelist namelist_cfg nn_it000 1 
    851     set_namelist namelist_cfg nn_itend 48 
    852     set_namelist namelist_cfg jpni 7 
     897    set_namelist namelist_cfg cn_exp \"ISOMIP+_93\" 
     898    set_namelist namelist_cfg nn_it000 1 
     899    set_namelist namelist_cfg nn_itend ${ITEND} 
     900    set_namelist namelist_cfg jpni 9 
    853901    set_namelist namelist_cfg jpnj 3 
    854902    set_namelist namelist_cfg sn_cfctl%l_runstat .true. 
    … …  
    862910    fi 
    863911    cd ${SETTE_DIR} 
    864     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     912    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    865913    cd ${SETTE_DIR} 
    866914    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    … …  
    875923    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    876924    cd ${EXE_DIR} 
    877     set_namelist namelist_cfg cn_exp \"ISOMIP_84\" 
    878     set_namelist namelist_cfg nn_it000 1 
    879     set_namelist namelist_cfg nn_itend 48 
     925    set_namelist namelist_cfg cn_exp \"ISOMIP+_84\" 
     926    set_namelist namelist_cfg nn_it000 1 
     927    set_namelist namelist_cfg nn_itend ${ITEND} 
    880928    set_namelist namelist_cfg jpni 8 
    881929    set_namelist namelist_cfg jpnj 4 
    … …  
    890938    fi 
    891939    cd ${SETTE_DIR} 
    892     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
     940    . ./prepare_job.sh input_ISOMIP+.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${NEMO_VALID} 
    893941    cd ${SETTE_DIR} 
    894942    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
Note: See TracChangeset for help on using the changeset viewer.