Changeset 7646 for trunk/NEMOGCM/SETTE


Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (4 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

Location:
trunk/NEMOGCM/SETTE
Files:
2 deleted
16 edited
6 copied

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS

    r4692 r7646  
    1515  export XCORES=NXIOPROCS 
    1616  export SETTE_DIR=DEF_SETTE_DIR 
    17   export XIO_HOME=/home/acc/XIOS 
     17  export XIO_HOME=/home/acc/XIOS_2.0 
    1818# 
    1919# load sette functions (only post_test_tidyup needed) 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena

    r6140 r7646  
    44#BSUB -n NPROCS 
    55#BSUB -a poe 
    6 #BSUB -J MPI_config 
     6#BSUB -J NEMO_SETTE 
    77#BSUB -o poe.stdout.%J 
    88#BSUB -e poe.stderr.%J 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios

    r6409 r7646  
    44#BSUB -n TOTAL_NPROCS 
    55#BSUB -a poe 
    6 #BSUB -J MPI_config 
     6#BSUB -J NEMO_SETTE 
    77#BSUB -o poe.stdout.%J 
    88#BSUB -e poe.stderr.%J 
  • trunk/NEMOGCM/SETTE/README

    r3635 r7646  
    2121                        -n : config name (in examples config_name_nproci_nprocj), see ./makenemo -n help 
    2222                        -r : reference configuration (if you don't give it you have to choise directories to install) 
    23                         add_key : to add list of keys (for example to test reproductibility: add_key mpp_rep) 
     23                        add_key : to add list of keys 
    2424                        del_key : to del list of keys 
    2525               and for more details and options of makenemo see ./makenemo -h 
  • trunk/NEMOGCM/SETTE/all_functions.sh

    r4316 r7646  
    1212###################################################### 
    1313#set -x 
    14 set -o posix 
     14#set -o posix 
    1515#set -u 
    1616#set -e 
     
    197197    cd ${CONFIG_DIR} 
    198198    cd ../ 
    199     REVISION_NB=`svn info | grep -i "Revision:" | sed -e "s/ //" | cut -d ":" -f 2` 
     199    REVISION_NB=`svn info | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
    200200    if [ ${#REVISION_NB} -eq 0 ] 
    201201    then 
     
    256256#   set_xio_using_server iodef.xml true 
    257257#   set_xio_buffer_size  iodef.xml 50000000 
     258#   set_xio_field_defs   iodef.xml 
    258259# 
    259260############################################################# 
     
    262263usage3=" Usage : set_xio_using_server input_iodef.xml true||false" 
    263264usage4=" Usage : set_xio_buffer_size input_iodef.xml int_buffer_size" 
     265usage5=" Usage : set_xio_field_defs input_iodef.xml" 
    264266 
    265267set_xio_file_type () { 
     
    333335        echo "################" >> ${SETTE_DIR}/output.sette 
    334336 
    335         VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*boolean" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 
     337        VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*bool" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 
    336338        if [ ${#VAR_NAME} -eq 0 ] 
    337339        then 
    338340                echo "doing \"set_xio_using_server $@\". " 
    339                 echo "xml_tag: "variable id=using_server" with variable: boolean is empty" 
     341                echo "xml_tag: "variable id=using_server" with variable: bool is empty" 
    340342                echo "confirm that an appropriate variable id is in \"${EXE_DIR}/$1\" " 
    341343                echo "exit" 
     
    394396} 
    395397 
     398set_xio_field_defs () { 
     399        minargcount=1 
     400        if [ ${#} -lt ${minargcount} ] 
     401        then 
     402                echo "not enough arguments for set_xio_field_defs" 
     403                echo "${usage5}" 
     404                exit 1 
     405        fi 
     406        unset minargcount 
     407        if [  ! -f ${SETTE_DIR}/output.sette ] ; then 
     408                touch ${SETTE_DIR}/output.sette 
     409        fi 
     410 
     411        echo "executing script : set_xio_field_defs $@" >> ${SETTE_DIR}/output.sette 
     412        echo "################" >> ${SETTE_DIR}/output.sette 
     413 
     414 
     415        [ -f ${EXE_DIR}/field_def_nemo-opa.xml ] || sed -i '/field_def_nemo-opa/d' $1 
     416        [ -f ${EXE_DIR}/field_def_nemo-lim.xml ] || sed -i '/field_def_nemo-lim/d' $1 
     417        [ -f ${EXE_DIR}/field_def_nemo-pisces.xml ] || sed -i '/field_def_nemo-pisces/d' $1 
     418 
     419        echo "finished script : set_xio_field_defs $@" >> ${SETTE_DIR}/output.sette 
     420        echo "++++++++++++++++" >> ${SETTE_DIR}/output.sette 
     421        echo "                " >> ${SETTE_DIR}/output.sette 
     422} 
  • trunk/NEMOGCM/SETTE/input_AMM12.cfg

    r4261 r7646  
    1 AMM12_v3.6.tar AMM12_v3.6 
     1AMM12_v3.7.tar AMM12_v3.7 
  • trunk/NEMOGCM/SETTE/input_ISOMIP.cfg

    r4990 r7646  
    1  
     1ISOMIP_v3.7.tar ISOMIP_v3.7 
  • trunk/NEMOGCM/SETTE/input_ORCA2_LIM3.cfg

    r5398 r7646  
    1 ORCA2_LIM_nemo_v3.6.tar ORCA2_LIM_nemo_v3.6 
     1ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
  • trunk/NEMOGCM/SETTE/input_ORCA2_OFF_PISCES.cfg

    r4318 r7646  
    1 INPUTS_DYNA_v3.6.tar ORCA2_OFF_PISCES 
     1ORCA2_OFF_v3.7.tar ORCA2_OFF_PISCES_3.7 
  • trunk/NEMOGCM/SETTE/input_SAS.cfg

    r4324 r7646  
    1 ORCA2_LIM_nemo_v3.6.tar ORCA2_LIM_nemo_v3.6 
     1ORCA2_LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.7 
    22INPUTS_SAS_v3.5.tar SAS  
  • trunk/NEMOGCM/SETTE/iodef_sette.xml

    r4773 r7646  
    22<simulation>  
    33 
    4  <context id="nemo" time_origin="1950-01-01 00:00:00" > 
     4 <context id="nemo"> 
    55     
    66    <!-- $id$ --> 
     
    1212============================================================================================================ 
    1313    --> 
    14     <field_definition src="./field_def.xml"/> 
     14    <field_definition src="../../SHARED/field_def_nemo-opa.xml"/> 
     15    <field_definition src="../../SHARED/field_def_nemo-lim.xml"/> 
     16    <field_definition src="../../SHARED/field_def_nemo-pisces.xml"/> 
    1517    <!--  
    1618============================================================================================================ 
     
    5052============================================================================================================ 
    5153    --> 
    52      
    53    <axis_definition>   
     54    <axis_definition> 
    5455      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" /> 
    5556      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" /> 
    5657      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" /> 
    5758      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    58       <axis id="nfloat" long_name="Float number"      unit="-"  /> 
    59       <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    60    </axis_definition>  
    61      
    62    <domain_definition src="./domain_def.xml"/> 
    63     
    64    <grid_definition>     
    65      <grid id="grid_T_2D" domain_ref="grid_T"/> 
    66      <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/> 
    67      <grid id="grid_U_2D" domain_ref="grid_U"/> 
    68      <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/> 
    69      <grid id="grid_V_2D" domain_ref="grid_V"/> 
    70      <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/> 
    71      <grid id="grid_W_2D" domain_ref="grid_W"/> 
    72      <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/> 
     59      <axis id="nfloat" long_name="Float number"      unit="-"                 /> 
     60      <axis id="icbcla"  long_name="Iceberg class"      unit="1"               /> 
     61      <axis id="ncatice" long_name="Ice category"       unit="1"               /> 
     62      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            /> 
     63      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            /> 
     64    </axis_definition> 
     65  
     66    <domain_definition src="./domain_def_nemo.xml"/> 
     67   
     68    <grid_definition>     
     69 
     70        <!--  --> 
     71       <grid id="grid_T_2D" > 
     72         <domain id="grid_T" /> 
     73       </grid> 
     74        <!--  --> 
     75       <grid id="grid_T_3D_ncatice" > 
     76         <domain id="grid_T" /> 
     77         <axis id="ncatice" /> 
     78       </grid> 
     79        <!--  --> 
     80       <grid id="grid_T_3D" > 
     81         <domain id="grid_T" /> 
     82         <axis id="deptht" /> 
     83       </grid> 
     84        <!--  --> 
     85       <grid id="grid_U_2D" > 
     86         <domain id="grid_U" /> 
     87       </grid> 
     88        <!--  --> 
     89       <grid id="grid_U_3D" > 
     90         <domain id="grid_U" /> 
     91         <axis id="depthu" /> 
     92       </grid> 
     93        <!--  --> 
     94       <grid id="grid_V_2D" > 
     95         <domain id="grid_V" /> 
     96       </grid> 
     97        <!--  --> 
     98       <grid id="grid_V_3D" > 
     99         <domain id="grid_V" /> 
     100         <axis id="depthv" /> 
     101       </grid> 
     102        <!--  --> 
     103       <grid id="grid_W_2D" > 
     104         <domain id="grid_W" /> 
     105       </grid> 
     106        <!--  --> 
     107       <grid id="grid_W_3D" > 
     108         <domain id="grid_W" /> 
     109         <axis id="depthw" /> 
     110       </grid> 
     111        <!--  --> 
     112       <grid id="grid_1point" > 
     113         <domain domain_ref="1point"/> 
     114       </grid> 
     115        <!--  --> 
     116       <grid id="grid_T_nfloat" > 
     117         <domain id="grid_T" /> 
     118         <axis id="nfloat" /> 
     119       </grid> 
     120        <!--  --> 
     121       <grid id="grid_EqT" > 
     122         <domain domain_ref="EqT" /> 
     123       </grid> 
     124        <!--  --> 
     125       <grid id="grid_znl_T_2D"> 
     126         <domain id="gznl" /> 
     127       </grid> 
     128        <!--  --> 
     129       <grid id="grid_znl_T_3D"> 
     130         <domain id="gznl" /> 
     131         <axis id="deptht" /> 
     132       </grid> 
     133        <!--  --> 
     134       <grid id="grid_znl_W_3D"> 
     135         <domain id="gznl" /> 
     136         <axis id="depthw" /> 
     137       </grid> 
     138 
     139      <grid id="grid_ptr_T_2D"> 
     140       <domain id="ptr" /> 
     141      </grid> 
     142 
     143      <grid id="grid_ptr_T_3D"> 
     144       <domain id="ptr" /> 
     145         <axis id="deptht" /> 
     146       </grid> 
     147 
     148      <grid id="grid_ptr_W_3D"> 
     149       <domain id="ptr" /> 
     150         <axis id="depthw" /> 
     151      </grid> 
     152 
    73153    </grid_definition>    
    74   </context> 
     154 
     155 </context> 
    75156   
    76  <context id="1_nemo" time_origin="1950-01-01 00:00:00" > 
     157 <context id="1_nemo" > 
    77158     
    78159    <!-- $id$ --> 
     
    84165============================================================================================================ 
    85166    --> 
    86     <field_definition src="./field_def.xml"/> 
     167    <field_definition src="../../SHARED/field_def_nemo-opa.xml"/> 
     168    <field_definition src="../../SHARED/field_def_nemo-lim.xml"/> 
     169    <field_definition src="../../SHARED/field_def_nemo-pisces.xml"/> 
    87170    <!--  
    88171============================================================================================================ 
     
    122205============================================================================================================ 
    123206    --> 
    124      
    125    <axis_definition>   
     207    <axis_definition> 
    126208      <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" /> 
    127209      <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" /> 
    128210      <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" /> 
    129211      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    130       <axis id="nfloat" long_name="Float number"      unit="-"  /> 
    131       <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    132    </axis_definition>  
    133      
    134    <domain_definition src="./domain_def.xml"/> 
    135     
    136    <grid_definition>     
    137      <grid id="grid_T_2D" domain_ref="grid_T"/> 
    138      <grid id="grid_T_3D" domain_ref="grid_T" axis_ref="deptht"/> 
    139      <grid id="grid_U_2D" domain_ref="grid_U"/> 
    140      <grid id="grid_U_3D" domain_ref="grid_U" axis_ref="depthu"/> 
    141      <grid id="grid_V_2D" domain_ref="grid_V"/> 
    142      <grid id="grid_V_3D" domain_ref="grid_V" axis_ref="depthv"/> 
    143      <grid id="grid_W_2D" domain_ref="grid_W"/> 
    144      <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/> 
    145     </grid_definition>    
     212      <axis id="nfloat" long_name="Float number"      unit="-"                 /> 
     213      <axis id="icbcla"  long_name="Iceberg class"      unit="1"               /> 
     214      <axis id="ncatice" long_name="Ice category"       unit="1"               /> 
     215      <axis id="iax_20C" long_name="20 degC isotherm"   unit="degC"            /> 
     216      <axis id="iax_28C" long_name="28 degC isotherm"   unit="degC"            /> 
     217    </axis_definition> 
     218  
     219    <domain_definition src="./domain_def_nemo.xml"/> 
     220   
     221    <grid_definition>     
     222 
     223        <!--  --> 
     224       <grid id="grid_T_2D" > 
     225         <domain id="grid_T" /> 
     226       </grid> 
     227        <!--  --> 
     228       <grid id="grid_T_3D_ncatice" > 
     229         <domain id="grid_T" /> 
     230         <axis id="ncatice" /> 
     231       </grid> 
     232        <!--  --> 
     233       <grid id="grid_T_3D" > 
     234         <domain id="grid_T" /> 
     235         <axis id="deptht" /> 
     236       </grid> 
     237        <!--  --> 
     238       <grid id="grid_U_2D" > 
     239         <domain id="grid_U" /> 
     240       </grid> 
     241        <!--  --> 
     242       <grid id="grid_U_3D" > 
     243         <domain id="grid_U" /> 
     244         <axis id="depthu" /> 
     245       </grid> 
     246        <!--  --> 
     247       <grid id="grid_V_2D" > 
     248         <domain id="grid_V" /> 
     249       </grid> 
     250        <!--  --> 
     251       <grid id="grid_V_3D" > 
     252         <domain id="grid_V" /> 
     253         <axis id="depthv" /> 
     254       </grid> 
     255        <!--  --> 
     256       <grid id="grid_W_2D" > 
     257         <domain id="grid_W" /> 
     258       </grid> 
     259        <!--  --> 
     260       <grid id="grid_W_3D" > 
     261         <domain id="grid_W" /> 
     262         <axis id="depthw" /> 
     263       </grid> 
     264        <!--  --> 
     265       <grid id="grid_1point" > 
     266         <domain domain_ref="1point"/> 
     267       </grid> 
     268        <!--  --> 
     269       <grid id="grid_T_nfloat" > 
     270         <domain id="grid_T" /> 
     271         <axis id="nfloat" /> 
     272       </grid> 
     273        <!--  --> 
     274       <grid id="grid_EqT" > 
     275         <domain domain_ref="EqT" /> 
     276       </grid> 
     277        <!--  --> 
     278       <grid id="grid_znl_T_2D"> 
     279         <domain id="gznl" /> 
     280       </grid> 
     281        <!--  --> 
     282       <grid id="grid_znl_T_3D"> 
     283         <domain id="gznl" /> 
     284         <axis id="deptht" /> 
     285       </grid> 
     286        <!--  --> 
     287       <grid id="grid_znl_W_3D"> 
     288         <domain id="gznl" /> 
     289         <axis id="depthw" /> 
     290       </grid> 
     291 
     292      <grid id="grid_ptr_T_2D"> 
     293       <domain id="ptr" /> 
     294      </grid> 
     295 
     296      <grid id="grid_ptr_T_3D"> 
     297       <domain id="ptr" /> 
     298         <axis id="deptht" /> 
     299       </grid> 
     300 
     301      <grid id="grid_ptr_W_3D"> 
     302       <domain id="ptr" /> 
     303         <axis id="depthw" /> 
     304      </grid> 
     305 
     306    </grid_definition>   
    146307  </context> 
    147308 
     
    153314        We must have buffer_size > jpi*jpj*jpk*8 (with jpi and jpj the subdomain size) 
    154315--> 
    155      <variable id="buffer_size"               type="integer">10155778</variable> 
    156      <variable id="buffer_server_factor_size" type="integer">2</variable> 
    157      <variable id="info_level"                type="integer">0</variable> 
    158      <variable id="using_server"              type="boolean">false</variable> 
    159      <variable id="using_oasis"               type="boolean">false</variable> 
     316     <variable id="info_level"                type="int">0</variable> 
     317     <variable id="using_server"              type="bool">false</variable> 
     318     <variable id="using_oasis"               type="bool">false</variable> 
    160319     <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    161320    
  • trunk/NEMOGCM/SETTE/param.cfg

    r5836 r7646  
    66#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    77#- VALIDATION files storing 
    8 NEMO_VALIDATION_DIR=~/NEMO_VALIDATION 
     8NEMO_VALIDATION_DIR=~/NEMO_VALIDATION_DIR 
  • trunk/NEMOGCM/SETTE/prepare_exe_dir.sh

    r5656 r7646  
    7070export EXE_DIR=${CONFIG_DIR}/${NEW_CONF}/${TEST_NAME} 
    7171 
    72 cp -rL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/. 
    73 cp -r ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml 
     72cp -RL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/. 
     73cp -R ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml 
    7474cd ${EXE_DIR} 
  • trunk/NEMOGCM/SETTE/sette.sh

    r7212 r7646  
    8888# 
    8989# Compiler among those in NEMOGCM/ARCH 
    90 COMPILER=X64_ADA 
     90COMPILER=X64_ADA_DEBUG 
    9191export BATCH_COMMAND_PAR="llsubmit" 
    9292export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR 
     
    133133cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    134134# Description of configuration tested: 
    135 # GYRE            : 1 &  2 
    136 # ORCA2_LIM_PISCES: 3 &  4 
    137 # ORCA2_OFF_PISCES: 5 &  6 
    138 # ORCA2_LIM3      : 7 &  8 
    139 # AMM12           : 9 & 10 
    140 # SAS             :11 & 12 
    141 # ISOMIP          :13 & 14 
    142 # ORCA2_LIM_OBS   :15 
    143 # ORCA2_AGRIF_LIM :16 & 17  
    144 #                  18 & 19  
    145  
    146 for config in  1 2 3 4 5 6 7 8 9 10 11 12 15 16 
     135# GYRE              : 1 &  2 
     136# ORCA2_LIM3        : 3 &  4 
     137# ORCA2_LIM3_PISCES : 5 &  6 
     138# ORCA2_OFF_PISCES  : 7 &  8 
     139# AMM12             :  9 & 10  
     140# SAS               : 11     fos SAS there is no solver so is useless to test REPRO 
     141# ISOMIP            : 12 & 13 
     142# ORCA2_LIM3_OBS    : 14 
     143# ORCA2_AGRIF_LIM   : 15 & 16  
     144#                     17 & 18  
     145 
     146for config in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 
    147147 
    148148do 
     
    159159    . ./prepare_exe_dir.sh 
    160160    JOB_FILE=${EXE_DIR}/run_job.sh 
    161     NPROC=4 
     161    NPROC=32 
    162162    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    163163    cd ${EXE_DIR}   
     
    167167    set_namelist namelist_cfg nn_stock 60 
    168168    set_namelist namelist_cfg ln_clobber .true. 
    169     set_namelist namelist_cfg nn_fwb 0 
    170 #   set_namelist namelist_cfg nn_solv 2 
    171     set_namelist namelist_cfg jpni 2 
    172     set_namelist namelist_cfg jpnj 2 
    173     set_namelist namelist_cfg jpnij 4 
     169    set_namelist namelist_cfg ln_linssh .true. 
     170    set_namelist namelist_cfg ln_read_cfg .false. 
     171    set_namelist namelist_cfg nn_fwb 0 
     172    set_namelist namelist_cfg jpni 4 
     173    set_namelist namelist_cfg jpnj 8 
     174    set_namelist namelist_cfg jpnij 32 
    174175    if [ ${USING_MPMD} == "yes" ] ; then 
    175176       set_xio_using_server iodef.xml true 
     
    191192    set_namelist namelist_cfg nn_rstctl 2 
    192193    set_namelist namelist_cfg ln_clobber .true. 
    193     set_namelist namelist_cfg nn_fwb 0 
    194 #   set_namelist namelist_cfg nn_solv 2 
    195     set_namelist namelist_cfg jpni 2 
    196     set_namelist namelist_cfg jpnj 2 
    197     set_namelist namelist_cfg jpnij 4 
     194    set_namelist namelist_cfg ln_linssh .true. 
     195    set_namelist namelist_cfg ln_read_cfg .false. 
     196    set_namelist namelist_cfg nn_fwb 0 
     197    set_namelist namelist_cfg jpni 4 
     198    set_namelist namelist_cfg jpnj 8 
     199    set_namelist namelist_cfg jpnij 32 
    198200    set_namelist namelist_cfg cn_ocerst_in \"GYRE_LONG_00000060_restart\" 
    199201    if [ ${USING_MPMD} == "yes" ] ; then 
     
    220222if [ ${config} -eq 2 ] ;  then 
    221223    ## Reproducibility tests for GYRE 
    222     export TEST_NAME="REPRO_1_4" 
    223     cd ${CONFIG_DIR} 
    224     . ./makenemo -m ${CMP_NAM} -n GYRE_4 -r GYRE -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
     224    export TEST_NAME="REPRO_4_8" 
     225    cd ${CONFIG_DIR} 
     226    . ./makenemo -m ${CMP_NAM} -n GYRE_32 -r GYRE -j 8 del_key ${DEL_KEYS} 
     227    cd ${SETTE_DIR} 
     228    . ./param.cfg 
     229    . ./all_functions.sh 
     230    . ./prepare_exe_dir.sh 
     231    JOB_FILE=${EXE_DIR}/run_job.sh 
     232    NPROC=32 
     233    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     234    cd ${EXE_DIR} 
     235    set_namelist namelist_cfg cn_exp \"GYRE_48\" 
     236    set_namelist namelist_cfg nn_it000 1 
     237    set_namelist namelist_cfg nn_itend 60 
     238    set_namelist namelist_cfg nn_fwb 0 
     239    set_namelist namelist_cfg ln_ctl .false. 
     240    set_namelist namelist_cfg ln_clobber .true. 
     241    set_namelist namelist_cfg ln_linssh .true. 
     242    set_namelist namelist_cfg ln_read_cfg .false. 
     243    set_namelist namelist_cfg jpni 4 
     244    set_namelist namelist_cfg jpnj 8 
     245    set_namelist namelist_cfg jpnij 32 
     246    if [ ${USING_MPMD} == "yes" ] ; then 
     247       set_xio_using_server iodef.xml true 
     248    else 
     249       set_xio_using_server iodef.xml false 
     250    fi 
     251    cd ${SETTE_DIR} 
     252    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     253    cd ${SETTE_DIR} 
     254    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     255 
     256    cd ${SETTE_DIR} 
     257    export TEST_NAME="REPRO_8_4" 
     258    . ./prepare_exe_dir.sh 
     259    JOB_FILE=${EXE_DIR}/run_job.sh 
     260    NPROC=32 
     261    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     262    cd ${EXE_DIR} 
     263    set_namelist namelist_cfg cn_exp \"GYRE_84\" 
     264    set_namelist namelist_cfg nn_it000 1 
     265    set_namelist namelist_cfg nn_itend 60 
     266    set_namelist namelist_cfg nn_fwb 0 
     267    set_namelist namelist_cfg ln_ctl .false. 
     268    set_namelist namelist_cfg ln_clobber .true. 
     269    set_namelist namelist_cfg ln_linssh .true. 
     270    set_namelist namelist_cfg ln_read_cfg .false. 
     271    set_namelist namelist_cfg jpni 8 
     272    set_namelist namelist_cfg jpnj 4 
     273    set_namelist namelist_cfg jpnij 32 
     274    if [ ${USING_MPMD} == "yes" ] ; then 
     275       set_xio_using_server iodef.xml true 
     276    else 
     277       set_xio_using_server iodef.xml false 
     278    fi 
     279    cd ${SETTE_DIR} 
     280    . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     281    cd ${SETTE_DIR} 
     282    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     283 
     284fi 
     285 
     286# TESTS FOR ORCA2_LIM3 CONFIGURATION 
     287if [ ${config} -eq 3 ] ;  then 
     288    ## Restartability tests for ORCA2_LIM3 
     289    export TEST_NAME="LONG" 
     290    cd ${CONFIG_DIR} 
     291    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_LONG -r ORCA2_LIM3 -j 8 del_key ${DEL_KEYS} 
    225292    cd ${SETTE_DIR} 
    226293    . ./param.cfg 
     
    231298    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    232299    cd ${EXE_DIR} 
    233     set_namelist namelist_cfg cn_exp \"GYRE_14\" 
    234     set_namelist namelist_cfg nn_it000 1 
    235     set_namelist namelist_cfg nn_itend 60 
    236     set_namelist namelist_cfg nn_fwb 0 
    237     set_namelist namelist_cfg nn_bench 0 
    238     set_namelist namelist_cfg ln_ctl .false. 
    239     set_namelist namelist_cfg ln_clobber .true. 
    240 #   set_namelist namelist_cfg nn_solv 2 
    241     set_namelist namelist_cfg jpni 1 
    242     set_namelist namelist_cfg jpnj 4 
    243     set_namelist namelist_cfg jpnij 4 
    244     if [ ${USING_MPMD} == "yes" ] ; then 
    245        set_xio_using_server iodef.xml true 
    246     else 
    247        set_xio_using_server iodef.xml false 
    248     fi 
    249     cd ${SETTE_DIR} 
    250     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    251     cd ${SETTE_DIR} 
    252     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    253  
    254     cd ${SETTE_DIR} 
    255     export TEST_NAME="REPRO_2_2" 
    256     . ./prepare_exe_dir.sh 
    257     JOB_FILE=${EXE_DIR}/run_job.sh 
    258     NPROC=4 
    259     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    260     cd ${EXE_DIR} 
    261     set_namelist namelist_cfg cn_exp \"GYRE_22\" 
    262     set_namelist namelist_cfg nn_it000 1 
    263     set_namelist namelist_cfg nn_itend 60 
    264     set_namelist namelist_cfg nn_fwb 0 
    265     set_namelist namelist_cfg ln_ctl .false. 
    266     set_namelist namelist_cfg ln_clobber .true. 
    267 #   set_namelist namelist_cfg nn_solv 2 
     300    set_namelist namelist_cfg cn_exp \"O2L3_LONG\" 
     301    set_namelist namelist_cfg nn_it000 1 
     302    set_namelist namelist_cfg nn_itend 150 
     303    set_namelist namelist_cfg nn_stock 75 
     304    set_namelist namelist_cfg ln_clobber .true. 
     305    set_namelist namelist_cfg ln_read_cfg .true. 
     306    set_namelist namelist_cfg ln_linssh .false. 
     307    set_namelist namelist_cfg ln_icebergs .true. 
     308    set_namelist namelist_cfg nn_fwb 0 
    268309    set_namelist namelist_cfg jpni 2 
    269310    set_namelist namelist_cfg jpnj 2 
     
    275316    fi 
    276317    cd ${SETTE_DIR} 
    277     . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    278     cd ${SETTE_DIR} 
    279     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    280  
    281 fi 
    282  
    283 # TESTS FOR ORCA2_LIM_PISCES CONFIGURATION 
    284 if [ ${config} -eq 3 ] ;  then 
    285     ## Restartability tests for ORCA2_LIM_PISCES 
    286     export TEST_NAME="LONG" 
    287     cd ${CONFIG_DIR} 
    288     . ./makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_LONG -r ORCA2_LIM_PISCES -j 8 del_key ${DEL_KEYS} 
    289     cd ${SETTE_DIR} 
    290     . ./param.cfg 
    291     . ./all_functions.sh 
    292     . ./prepare_exe_dir.sh 
    293     JOB_FILE=${EXE_DIR}/run_job.sh 
    294     NPROC=8 
    295     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    296     cd ${EXE_DIR} 
    297     set_namelist namelist_cfg cn_exp \"O2LP_LONG\" 
    298     set_namelist namelist_cfg nn_it000 1 
     318    . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     319 
     320    cd ${SETTE_DIR} 
     321    export TEST_NAME="SHORT" 
     322    . ./prepare_exe_dir.sh 
     323    cd ${EXE_DIR} 
     324    set_namelist namelist_cfg cn_exp \"O2L3_SHORT\" 
     325    set_namelist namelist_cfg nn_it000 76 
    299326    set_namelist namelist_cfg nn_itend 150 
    300327    set_namelist namelist_cfg nn_stock 75 
    301     set_namelist namelist_cfg ln_clobber .true. 
     328    set_namelist namelist_cfg ln_rstart .true. 
     329    set_namelist namelist_cfg nn_rstctl 2 
     330    set_namelist namelist_cfg ln_clobber .true. 
     331    set_namelist namelist_cfg ln_read_cfg .true. 
     332    set_namelist namelist_cfg ln_linssh .false. 
     333    set_namelist namelist_cfg ln_icebergs .true. 
    302334    set_namelist namelist_cfg nn_fwb 0 
    303335    set_namelist namelist_cfg jpni 2 
     336    set_namelist namelist_cfg jpnj 2 
     337    set_namelist namelist_cfg jpnij 4 
     338    set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 
     339    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" 
     340    for (( i=1; i<=$NPROC; i++)) ; do 
     341        L_NPROC=$(( $i - 1 )) 
     342        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
     343        ln -sf ../LONG/O2L3_LONG_00000075_restart_${L_NPROC}.nc . 
     344        ln -sf ../LONG/O2L3_LONG_00000075_restart_ice_${L_NPROC}.nc . 
     345        ln -sf ../LONG/O2L3_LONG_icebergs_00000075_restart_${L_NPROC}.nc O2L3_LONG_00000075_restart_icebergs_${L_NPROC}.nc 
     346    done 
     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    cd ${SETTE_DIR} 
     353    . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     354    cd ${SETTE_DIR} 
     355    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     356fi 
     357 
     358if [ ${config} -eq 4 ] ;  then 
     359    ## Reproducibility tests for ORCA2_LIM3 
     360    export TEST_NAME="REPRO_8_4" 
     361    cd ${CONFIG_DIR} 
     362    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_32 -r ORCA2_LIM3 -j 8 del_key ${DEL_KEYS} 
     363    cd ${SETTE_DIR} 
     364    . ./param.cfg 
     365    . ./all_functions.sh 
     366    . ./prepare_exe_dir.sh 
     367    JOB_FILE=${EXE_DIR}/run_job.sh 
     368    NPROC=32 
     369    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     370    cd ${EXE_DIR} 
     371    set_namelist namelist_cfg nn_it000 1 
     372    set_namelist namelist_cfg nn_itend 75 
     373    set_namelist namelist_cfg nn_fwb 0 
     374    set_namelist namelist_cfg ln_ctl .false. 
     375    set_namelist namelist_cfg ln_clobber .true. 
     376    set_namelist namelist_cfg ln_read_cfg .true. 
     377    set_namelist namelist_cfg ln_linssh .false. 
     378    set_namelist namelist_cfg ln_icebergs .true. 
     379    set_namelist namelist_cfg jpni 8 
    304380    set_namelist namelist_cfg jpnj 4 
    305     set_namelist namelist_cfg jpnij 8 
    306 #   set_namelist namelist_cfg nn_solv 2 
     381    set_namelist namelist_cfg jpnij 32 
     382    if [ ${USING_MPMD} == "yes" ] ; then 
     383       set_xio_using_server iodef.xml true 
     384    else 
     385       set_xio_using_server iodef.xml false 
     386    fi 
     387    cd ${SETTE_DIR} 
     388    . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     389    cd ${SETTE_DIR} 
     390    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     391 
     392 
     393    cd ${SETTE_DIR} 
     394    export TEST_NAME="REPRO_4_8" 
     395    . ./prepare_exe_dir.sh 
     396    JOB_FILE=${EXE_DIR}/run_job.sh 
     397    NPROC=32 
     398    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     399    cd ${EXE_DIR} 
     400    set_namelist namelist_cfg nn_it000 1 
     401    set_namelist namelist_cfg nn_itend 75 
     402    set_namelist namelist_cfg ln_clobber .true. 
     403    set_namelist namelist_cfg ln_read_cfg .true. 
     404    set_namelist namelist_cfg ln_linssh .false. 
     405    set_namelist namelist_cfg ln_icebergs .true. 
     406    set_namelist namelist_cfg nn_fwb 0 
     407    set_namelist namelist_cfg jpni 4 
     408    set_namelist namelist_cfg jpnj 8 
     409    set_namelist namelist_cfg jpnij 32 
     410    if [ ${USING_MPMD} == "yes" ] ; then 
     411       set_xio_using_server iodef.xml true 
     412    else 
     413       set_xio_using_server iodef.xml false 
     414    fi 
     415 
     416    cd ${SETTE_DIR} 
     417    . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     418    cd ${SETTE_DIR} 
     419    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     420fi 
     421 
     422# TESTS FOR ORCA2_LIM3_PISCES CONFIGURATION 
     423if [ ${config} -eq 5 ] ;  then 
     424    ## Restartability tests for ORCA2_LIM3_PISCES 
     425    export TEST_NAME="LONG" 
     426    cd ${CONFIG_DIR} 
     427    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_LONG -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
     428    cd ${SETTE_DIR} 
     429    . ./param.cfg 
     430    . ./all_functions.sh 
     431    . ./prepare_exe_dir.sh 
     432    JOB_FILE=${EXE_DIR}/run_job.sh 
     433    NPROC=32 
     434    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     435    cd ${EXE_DIR} 
     436    set_namelist namelist_cfg cn_exp \"O2L3P_LONG\" 
     437    set_namelist namelist_cfg nn_it000 1 
     438    set_namelist namelist_cfg nn_itend 150 
     439    set_namelist namelist_cfg nn_stock 75 
     440    set_namelist namelist_cfg ln_clobber .true. 
     441    set_namelist namelist_cfg ln_read_cfg .true. 
     442    set_namelist namelist_cfg ln_linssh .false. 
     443    set_namelist namelist_cfg nn_fwb 0 
     444    set_namelist namelist_cfg jpni 4 
     445    set_namelist namelist_cfg jpnj 8 
     446    set_namelist namelist_cfg jpnij 32 
    307447    set_namelist namelist_top_cfg ln_trcdta .false. 
    308     set_namelist namelist_top_cfg ln_diatrc .false. 
    309448    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    310449    # if not you need input files, and for tests is not necessary 
     
    316455    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    317456    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     457    set_namelist namelist_pisces_cfg ln_ironice .false. 
    318458    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    319459    if [ ${USING_MPMD} == "yes" ] ; then 
     
    323463    fi 
    324464    cd ${SETTE_DIR} 
    325     . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     465    . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    326466     
    327467    cd ${SETTE_DIR} 
     
    329469    . ./prepare_exe_dir.sh 
    330470    cd ${EXE_DIR} 
    331     set_namelist namelist_cfg cn_exp \"O2LP_SHORT\" 
     471    set_namelist namelist_cfg cn_exp \"O2L3P_SHORT\" 
    332472    set_namelist namelist_cfg nn_it000 76 
    333473    set_namelist namelist_cfg nn_itend 150 
     
    336476    set_namelist namelist_cfg nn_rstctl 2 
    337477    set_namelist namelist_cfg ln_clobber .true. 
    338     set_namelist namelist_cfg nn_fwb 0 
    339     set_namelist namelist_cfg jpni 2 
    340     set_namelist namelist_cfg jpnj 4 
    341     set_namelist namelist_cfg jpnij 8 
    342 #   set_namelist namelist_cfg nn_solv 2 
    343     set_namelist namelist_top_cfg ln_diatrc .false. 
     478    set_namelist namelist_cfg ln_read_cfg .true. 
     479    set_namelist namelist_cfg ln_linssh .false. 
     480    set_namelist namelist_cfg nn_fwb 0 
     481    set_namelist namelist_cfg jpni 4 
     482    set_namelist namelist_cfg jpnj 8 
     483    set_namelist namelist_cfg jpnij 32 
    344484    set_namelist namelist_top_cfg ln_rsttr .true. 
    345485    set_namelist namelist_top_cfg nn_rsttr 2 
    346     set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    347     set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
    348     set_namelist namelist_top_cfg cn_trcrst_in \"O2LP_LONG_00000075_restart_trc\" 
     486    set_namelist namelist_cfg cn_ocerst_in \"O2L3P_LONG_00000075_restart\" 
     487    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3P_LONG_00000075_restart_ice\" 
     488    set_namelist namelist_top_cfg cn_trcrst_in \"O2L3P_LONG_00000075_restart_trc\" 
    349489    # put ln_ironsed, ln_river, ln_ndepo, ln_dust 
    350490    # if not you need input files, and for tests is not necessary 
     
    356496    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    357497    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     498    set_namelist namelist_pisces_cfg ln_ironice .false. 
    358499    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    359500    # put ln_pisdmp to false : no restoring to global mean value 
     
    362503        L_NPROC=$(( $i - 1 )) 
    363504        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    364         ln -sf ../LONG/O2LP_LONG_00000075_restart_${L_NPROC}.nc . 
    365         ln -sf ../LONG/O2LP_LONG_00000075_restart_trc_${L_NPROC}.nc . 
    366         ln -sf ../LONG/O2LP_LONG_00000075_restart_ice_${L_NPROC}.nc . 
     505        ln -sf ../LONG/O2L3P_LONG_00000075_restart_${L_NPROC}.nc . 
     506        ln -sf ../LONG/O2L3P_LONG_00000075_restart_trc_${L_NPROC}.nc . 
     507        ln -sf ../LONG/O2L3P_LONG_00000075_restart_ice_${L_NPROC}.nc . 
    367508    done 
    368509    if [ ${USING_MPMD} == "yes" ] ; then 
     
    372513    fi 
    373514    cd ${SETTE_DIR} 
    374     . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    375     cd ${SETTE_DIR} 
    376     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    377 fi 
    378  
    379 if [ ${config} -eq 4 ] ;  then 
    380     ## Reproducibility tests for ORCA2_LIM_PISCES 
    381     export TEST_NAME="REPRO_4_4" 
    382     cd ${CONFIG_DIR} 
    383     . ./makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_16 -r ORCA2_LIM_PISCES -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    384     cd ${SETTE_DIR} 
    385     . ./param.cfg 
    386     . ./all_functions.sh 
    387     . ./prepare_exe_dir.sh 
    388     JOB_FILE=${EXE_DIR}/run_job.sh 
    389     NPROC=16 
     515    . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     516    cd ${SETTE_DIR} 
     517    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     518fi 
     519 
     520if [ ${config} -eq 6 ] ;  then 
     521    ## Reproducibility tests for ORCA2_LIM3_PISCES 
     522    export TEST_NAME="REPRO_4_8" 
     523    cd ${CONFIG_DIR} 
     524    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_32 -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
     525    cd ${SETTE_DIR} 
     526    . ./param.cfg 
     527    . ./all_functions.sh 
     528    . ./prepare_exe_dir.sh 
     529    JOB_FILE=${EXE_DIR}/run_job.sh 
     530    NPROC=32 
    390531    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    391532    cd ${EXE_DIR} 
     
    395536    set_namelist namelist_cfg ln_ctl .false. 
    396537    set_namelist namelist_cfg ln_clobber .true. 
    397     set_namelist namelist_cfg jpni 4 
    398     set_namelist namelist_cfg jpnj 4 
    399     set_namelist namelist_cfg jpnij 16 
    400 #   set_namelist namelist_cfg nn_solv 2 
     538    set_namelist namelist_cfg ln_read_cfg .true. 
     539    set_namelist namelist_cfg ln_linssh .false. 
     540    set_namelist namelist_cfg jpni 4 
     541    set_namelist namelist_cfg jpnj 8 
     542    set_namelist namelist_cfg jpnij 32 
    401543    set_namelist namelist_top_cfg ln_trcdta .false. 
    402     set_namelist namelist_top_cfg ln_diatrc .false. 
    403544    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    404545    # if not you need input files, and for tests is not necessary 
     
    410551    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    411552    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     553    set_namelist namelist_pisces_cfg ln_ironice .false. 
    412554    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    413555    # put ln_pisdmp to false : no restoring to global mean value 
     
    419561    fi 
    420562    cd ${SETTE_DIR} 
    421     . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    422     cd ${SETTE_DIR} 
    423     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    424  
    425     cd ${SETTE_DIR} 
    426     export TEST_NAME="REPRO_2_8" 
    427     . ./prepare_exe_dir.sh 
    428     JOB_FILE=${EXE_DIR}/run_job.sh 
    429     NPROC=16 
     563    . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     564    cd ${SETTE_DIR} 
     565    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     566 
     567    cd ${SETTE_DIR} 
     568    export TEST_NAME="REPRO_8_4" 
     569    . ./prepare_exe_dir.sh 
     570    JOB_FILE=${EXE_DIR}/run_job.sh 
     571    NPROC=32 
    430572    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    431573    cd ${EXE_DIR} 
     
    433575    set_namelist namelist_cfg nn_itend 75 
    434576    set_namelist namelist_cfg ln_clobber .true. 
    435     set_namelist namelist_cfg nn_fwb 0 
    436     set_namelist namelist_cfg jpni 2 
    437     set_namelist namelist_cfg jpnj 8 
    438     set_namelist namelist_cfg jpnij 16 
    439 #   set_namelist namelist_cfg nn_solv 2 
     577    set_namelist namelist_cfg ln_read_cfg .true. 
     578    set_namelist namelist_cfg ln_linssh .false. 
     579    set_namelist namelist_cfg nn_fwb 0 
     580    set_namelist namelist_cfg jpni 8 
     581    set_namelist namelist_cfg jpnj 4 
     582    set_namelist namelist_cfg jpnij 32 
    440583    set_namelist namelist_top_cfg ln_trcdta .false. 
    441     set_namelist namelist_top_cfg ln_diatrc .false. 
    442584    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    443585    # if not you need input files, and for tests is not necessary 
     
    449591    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    450592    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     593    set_namelist namelist_pisces_cfg ln_ironice .false. 
    451594    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    452595    # put ln_pisdmp to false : no restoring to global mean value 
     
    458601    fi 
    459602    cd ${SETTE_DIR} 
    460     . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     603    . ./prepare_job.sh input_ORCA2_LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    461604    cd ${SETTE_DIR} 
    462605    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    464607 
    465608# TESTS FOR ORCA2_OFF_PISCES CONFIGURATION 
    466 if [ ${config} -eq 5 ] ;  then 
     609if [ ${config} -eq 7 ] ;  then 
    467610    ## Restartability tests for ORCA2_OFF_PISCES 
    468611    export TEST_NAME="LONG" 
    469612    cd ${CONFIG_DIR} 
    470     . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    471     cd ${SETTE_DIR} 
    472     . ./param.cfg 
    473     . ./all_functions.sh 
    474     . ./prepare_exe_dir.sh 
    475     JOB_FILE=${EXE_DIR}/run_job.sh 
    476     NPROC=8 
     613    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
     614    cd ${SETTE_DIR} 
     615    . ./param.cfg 
     616    . ./all_functions.sh 
     617    . ./prepare_exe_dir.sh 
     618    JOB_FILE=${EXE_DIR}/run_job.sh 
     619    NPROC=32 
    477620    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    478621    cd ${EXE_DIR} 
     
    482625    set_namelist namelist_cfg nn_stock 20 
    483626    set_namelist namelist_cfg ln_clobber .true. 
    484     set_namelist namelist_cfg jpni 2 
    485     set_namelist namelist_cfg jpnj 4 
    486     set_namelist namelist_cfg jpnij 8 
     627    set_namelist namelist_cfg ln_read_cfg .true. 
     628    set_namelist namelist_cfg ln_linssh .true. 
     629    set_namelist namelist_cfg jpni 4 
     630    set_namelist namelist_cfg jpnj 8 
     631    set_namelist namelist_cfg jpnij 32 
    487632    set_namelist namelist_top_cfg ln_trcdta .false. 
    488     set_namelist namelist_top_cfg ln_diatrc .false. 
    489633    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    490634    # if not you need input files, and for tests is not necessary 
     
    496640    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    497641    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     642    set_namelist namelist_pisces_cfg ln_ironice .false. 
    498643    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    499644    # put ln_pisdmp to false : no restoring to global mean value 
     
    516661    set_namelist namelist_cfg nn_stock 20 
    517662    set_namelist namelist_cfg ln_clobber .true. 
    518     set_namelist namelist_cfg jpni 2 
    519     set_namelist namelist_cfg jpnj 4 
    520     set_namelist namelist_cfg jpnij 8 
    521     set_namelist namelist_top_cfg ln_diatrc .false. 
     663    set_namelist namelist_cfg ln_read_cfg .true. 
     664    set_namelist namelist_cfg ln_linssh .true. 
     665    set_namelist namelist_cfg jpni 4 
     666    set_namelist namelist_cfg jpnj 8 
     667    set_namelist namelist_cfg jpnij 32 
    522668    set_namelist namelist_top_cfg ln_rsttr .true. 
    523669    set_namelist namelist_top_cfg nn_rsttr 2 
     
    537683    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    538684    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     685    set_namelist namelist_pisces_cfg ln_ironice .false. 
    539686    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    540687    # put ln_pisdmp to false : no restoring to global mean value 
     
    551698fi 
    552699 
    553 if [ ${config} -eq 6 ] ;  then 
     700if [ ${config} -eq 8 ] ;  then 
    554701    ## Reproducibility tests for ORCA2_OFF_PISCES 
    555     export TEST_NAME="REPRO_4_4" 
    556     cd ${CONFIG_DIR} 
    557     . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_16 -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    558     cd ${SETTE_DIR} 
    559     . ./param.cfg 
    560     . ./all_functions.sh 
    561     . ./prepare_exe_dir.sh 
    562     JOB_FILE=${EXE_DIR}/run_job.sh 
    563     NPROC=16 
     702    export TEST_NAME="REPRO_4_8" 
     703    cd ${CONFIG_DIR} 
     704    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_32 -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
     705    cd ${SETTE_DIR} 
     706    . ./param.cfg 
     707    . ./all_functions.sh 
     708    . ./prepare_exe_dir.sh 
     709    JOB_FILE=${EXE_DIR}/run_job.sh 
     710    NPROC=32 
    564711    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    565712    cd ${EXE_DIR} 
     
    568715    set_namelist namelist_cfg ln_ctl .false. 
    569716    set_namelist namelist_cfg ln_clobber .true. 
    570     set_namelist namelist_cfg jpni 4 
    571     set_namelist namelist_cfg jpnj 4 
    572     set_namelist namelist_cfg jpnij 16 
     717    set_namelist namelist_cfg ln_read_cfg .true. 
     718    set_namelist namelist_cfg ln_linssh .true. 
     719    set_namelist namelist_cfg jpni 4 
     720    set_namelist namelist_cfg jpnj 8 
     721    set_namelist namelist_cfg jpnij 32 
    573722    set_namelist namelist_top_cfg ln_trcdta .false. 
    574     set_namelist namelist_top_cfg ln_diatrc .false. 
    575723    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    576724    # if not you need input files, and for tests is not necessary 
     
    582730    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    583731    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     732    set_namelist namelist_pisces_cfg ln_ironice .false. 
    584733    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    585734    # put ln_pisdmp to false : no restoring to global mean value 
     
    596745 
    597746    cd ${SETTE_DIR} 
    598     export TEST_NAME="REPRO_2_8" 
    599     . ./prepare_exe_dir.sh 
    600     JOB_FILE=${EXE_DIR}/run_job.sh 
    601     NPROC=16 
     747    export TEST_NAME="REPRO_8_4" 
     748    . ./prepare_exe_dir.sh 
     749    JOB_FILE=${EXE_DIR}/run_job.sh 
     750    NPROC=32 
    602751    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    603752    cd ${EXE_DIR} 
     
    606755    set_namelist namelist_cfg ln_ctl .false. 
    607756    set_namelist namelist_cfg ln_clobber .true. 
    608     set_namelist namelist_cfg jpni 2 
    609     set_namelist namelist_cfg jpnj 8 
    610     set_namelist namelist_cfg jpnij 16 
     757    set_namelist namelist_cfg ln_read_cfg .true. 
     758    set_namelist namelist_cfg ln_linssh .true. 
     759    set_namelist namelist_cfg jpni 8 
     760    set_namelist namelist_cfg jpnj 4 
     761    set_namelist namelist_cfg jpnij 32 
    611762    set_namelist namelist_top_cfg ln_trcdta .false. 
    612     set_namelist namelist_top_cfg ln_diatrc .false. 
    613763    # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false 
    614764    # if not you need input files, and for tests is not necessary 
     
    620770    set_namelist namelist_pisces_cfg ln_ndepo .false. 
    621771    set_namelist namelist_pisces_cfg ln_ironsed .false. 
     772    set_namelist namelist_pisces_cfg ln_ironice .false. 
    622773    set_namelist namelist_pisces_cfg ln_hydrofe .false. 
    623774    # put ln_pisdmp to false : no restoring to global mean value 
     
    633784    . ./fcm_job.sh $NPROC  ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    634785fi 
    635  
    636  
    637 # TESTS FOR ORCA2_LIM3 CONFIGURATION 
    638 if [ ${config} -eq 7 ] ;  then 
    639     ## Restartability tests for ORCA2_LIM3 
    640     export TEST_NAME="LONG" 
    641     cd ${CONFIG_DIR} 
    642     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_LONG -r ORCA2_LIM3 -j 8 del_key ${DEL_KEYS} 
    643     cd ${SETTE_DIR} 
    644     . ./param.cfg 
    645     . ./all_functions.sh 
    646     . ./prepare_exe_dir.sh 
    647     JOB_FILE=${EXE_DIR}/run_job.sh 
    648     NPROC=4 
    649     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    650     cd ${EXE_DIR} 
    651     set_namelist namelist_cfg cn_exp \"O2L3_LONG\" 
    652     set_namelist namelist_cfg nn_it000 1 
    653     set_namelist namelist_cfg nn_itend 150 
    654     set_namelist namelist_cfg nn_stock 75 
    655     set_namelist namelist_cfg ln_clobber .true. 
    656     set_namelist namelist_cfg nn_fwb 0 
    657     set_namelist namelist_cfg jpni 2 
    658     set_namelist namelist_cfg jpnj 2 
    659     set_namelist namelist_cfg jpnij 4 
    660 #   set_namelist namelist_cfg nn_solv 2 
    661     if [ ${USING_MPMD} == "yes" ] ; then 
    662        set_xio_using_server iodef.xml true 
    663     else 
    664        set_xio_using_server iodef.xml false 
    665     fi 
    666     cd ${SETTE_DIR} 
    667     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    668      
    669     cd ${SETTE_DIR} 
    670     export TEST_NAME="SHORT" 
    671     . ./prepare_exe_dir.sh 
    672     cd ${EXE_DIR} 
    673     set_namelist namelist_cfg cn_exp \"O2L3_SHORT\" 
    674     set_namelist namelist_cfg nn_it000 76 
    675     set_namelist namelist_cfg nn_itend 150 
    676     set_namelist namelist_cfg nn_stock 75 
    677     set_namelist namelist_cfg ln_rstart .true. 
    678     set_namelist namelist_cfg nn_rstctl 2 
    679     set_namelist namelist_cfg ln_clobber .true. 
    680     set_namelist namelist_cfg nn_fwb 0 
    681     set_namelist namelist_cfg jpni 2 
    682     set_namelist namelist_cfg jpnj 2 
    683     set_namelist namelist_cfg jpnij 4 
    684 #   set_namelist namelist_cfg nn_solv 2 
    685     set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 
    686     set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" 
    687     for (( i=1; i<=$NPROC; i++)) ; do 
    688         L_NPROC=$(( $i - 1 )) 
    689         L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    690         ln -sf ../LONG/O2L3_LONG_00000075_restart_${L_NPROC}.nc . 
    691         ln -sf ../LONG/O2L3_LONG_00000075_restart_ice_${L_NPROC}.nc . 
    692         ln -sf ../LONG/O2L3_LONG_icebergs_00000075_restart_${L_NPROC}.nc O2L3_LONG_00000075_restart_icebergs_${L_NPROC}.nc 
    693     done 
    694     if [ ${USING_MPMD} == "yes" ] ; then 
    695        set_xio_using_server iodef.xml true 
    696     else 
    697        set_xio_using_server iodef.xml false 
    698     fi 
    699     cd ${SETTE_DIR} 
    700     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    701     cd ${SETTE_DIR} 
    702     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    703 fi 
    704  
    705 if [ ${config} -eq 8 ] ;  then 
    706     ## Reproducibility tests for ORCA2_LIM3 
    707     export TEST_NAME="REPRO_4_4" 
    708     cd ${CONFIG_DIR} 
    709     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_16 -r ORCA2_LIM3 -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    710     cd ${SETTE_DIR} 
    711     . ./param.cfg 
    712     . ./all_functions.sh 
    713     . ./prepare_exe_dir.sh 
    714     JOB_FILE=${EXE_DIR}/run_job.sh 
    715     NPROC=16 
    716     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    717     cd ${EXE_DIR} 
    718     set_namelist namelist_cfg nn_it000 1 
    719     set_namelist namelist_cfg nn_itend 75 
    720     set_namelist namelist_cfg nn_fwb 0 
    721     set_namelist namelist_cfg ln_ctl .false. 
    722     set_namelist namelist_cfg ln_clobber .true. 
    723     set_namelist namelist_cfg jpni 4 
    724     set_namelist namelist_cfg jpnj 4 
    725     set_namelist namelist_cfg jpnij 16 
    726 #   set_namelist namelist_cfg nn_solv 2 
    727     if [ ${USING_MPMD} == "yes" ] ; then 
    728        set_xio_using_server iodef.xml true 
    729     else 
    730        set_xio_using_server iodef.xml false 
    731     fi 
    732     cd ${SETTE_DIR} 
    733     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    734     cd ${SETTE_DIR} 
    735     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    736  
    737     cd ${SETTE_DIR} 
    738     export TEST_NAME="REPRO_2_8" 
    739     . ./prepare_exe_dir.sh 
    740     JOB_FILE=${EXE_DIR}/run_job.sh 
    741     NPROC=16 
    742     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    743     cd ${EXE_DIR} 
    744     set_namelist namelist_cfg nn_it000 1 
    745     set_namelist namelist_cfg nn_itend 75 
    746     set_namelist namelist_cfg ln_clobber .true. 
    747     set_namelist namelist_cfg nn_fwb 0 
    748     set_namelist namelist_cfg jpni 2 
    749     set_namelist namelist_cfg jpnj 8 
    750     set_namelist namelist_cfg jpnij 16 
    751 #   set_namelist namelist_cfg nn_solv 2 
    752     if [ ${USING_MPMD} == "yes" ] ; then 
    753        set_xio_using_server iodef.xml true 
    754     else 
    755        set_xio_using_server iodef.xml false 
    756     fi 
    757  
    758     cd ${SETTE_DIR} 
    759     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    760     cd ${SETTE_DIR} 
    761     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    762 fi 
    763  
    764786 
    765787# TESTS FOR AMM12 CONFIGURATION 
     
    783805    set_namelist namelist_cfg ln_ctl .false. 
    784806    set_namelist namelist_cfg ln_clobber .true. 
    785     set_namelist namelist_cfg jpni 8 
    786     set_namelist namelist_cfg jpnj 4 
     807    set_namelist namelist_cfg ln_read_cfg .true. 
     808    set_namelist namelist_cfg ln_linssh .false. 
     809    set_namelist namelist_cfg jpni 4 
     810    set_namelist namelist_cfg jpnj 8 
    787811    set_namelist namelist_cfg jpnij 32 
    788812    if [ ${USING_MPMD} == "yes" ] ; then 
     
    803827    set_namelist namelist_cfg ln_ctl .false. 
    804828    set_namelist namelist_cfg ln_clobber .true. 
    805     set_namelist namelist_cfg jpni 8 
    806     set_namelist namelist_cfg jpnj 4 
     829    set_namelist namelist_cfg ln_read_cfg .true. 
     830    set_namelist namelist_cfg ln_linssh .false. 
     831    set_namelist namelist_cfg jpni 4 
     832    set_namelist namelist_cfg jpnj 8 
    807833    set_namelist namelist_cfg jpnij 32 
    808834    set_namelist namelist_cfg ln_rstart .true. 
     
    830856    export TEST_NAME="REPRO_8_4" 
    831857    cd ${CONFIG_DIR} 
    832     . ./makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 add_key "key_mpp_rep key_tide" del_key ${DEL_KEYS} 
     858    . ./makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 del_key ${DEL_KEYS} 
    833859    cd ${SETTE_DIR} 
    834860    . ./param.cfg 
     
    844870    set_namelist namelist_cfg ln_ctl .false. 
    845871    set_namelist namelist_cfg ln_clobber .true. 
     872    set_namelist namelist_cfg ln_read_cfg .true. 
     873    set_namelist namelist_cfg ln_linssh .false. 
    846874    set_namelist namelist_cfg jpni 8 
    847875    set_namelist namelist_cfg jpnj 4 
     
    868896    set_namelist namelist_cfg ln_ctl .false. 
    869897    set_namelist namelist_cfg ln_clobber .true. 
     898    set_namelist namelist_cfg ln_read_cfg .true. 
     899    set_namelist namelist_cfg ln_linssh .false. 
    870900    set_namelist namelist_cfg jpni 4 
    871901    set_namelist namelist_cfg jpnj 8 
     
    883913 
    884914 
    885 # TESTS FOR ORCA2_SAS_LIM CONFIGURATION 
     915# TESTS FOR ORCA2_SAS_LIM3 CONFIGURATION 
    886916if [ ${config} -eq 11 ] ;  then 
    887917    ## Restartability tests for SAS 
    888918    export TEST_NAME="LONG" 
    889919    cd ${CONFIG_DIR} 
    890     . ./makenemo -m ${CMP_NAM} -n SAS_LONG -r ORCA2_SAS_LIM -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    891     cd ${SETTE_DIR} 
    892     . ./param.cfg 
    893     . ./all_functions.sh 
    894     . ./prepare_exe_dir.sh 
    895     JOB_FILE=${EXE_DIR}/run_job.sh 
    896     NPROC=32 
    897     \rm $JOB_FILE 
     920    . ./makenemo -m ${CMP_NAM} -n SAS_LONG -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
     921    cd ${SETTE_DIR} 
     922    . ./param.cfg 
     923    . ./all_functions.sh 
     924    . ./prepare_exe_dir.sh 
     925    JOB_FILE=${EXE_DIR}/run_job.sh 
     926    NPROC=32 
     927    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    898928    cd ${EXE_DIR} 
    899929    set_namelist namelist_cfg cn_exp \"SAS\" 
     
    903933    set_namelist namelist_cfg ln_ctl .false. 
    904934    set_namelist namelist_cfg ln_clobber .true. 
    905     set_namelist namelist_cfg nn_fwb 0 
    906     set_namelist namelist_cfg jpni 8 
    907     set_namelist namelist_cfg jpnj 4 
     935    set_namelist namelist_cfg ln_read_cfg .true. 
     936    set_namelist namelist_cfg ln_linssh .true. 
     937    set_namelist namelist_cfg nn_fwb 0 
     938    set_namelist namelist_cfg jpni 4 
     939    set_namelist namelist_cfg jpnj 8 
    908940    set_namelist namelist_cfg jpnij 32 
    909941    if [ ${USING_MPMD} == "yes" ] ; then 
     
    924956    set_namelist namelist_cfg ln_ctl .false. 
    925957    set_namelist namelist_cfg ln_clobber .true. 
    926     set_namelist namelist_cfg nn_fwb 0 
    927     set_namelist namelist_cfg jpni 8 
    928     set_namelist namelist_cfg jpnj 4 
    929     set_namelist namelist_cfg jpnij 32 
     958    set_namelist namelist_cfg ln_read_cfg .true. 
     959    set_namelist namelist_cfg ln_linssh .true. 
     960    set_namelist namelist_cfg nn_fwb 0 
     961    set_namelist namelist_cfg jpni 4 
     962    set_namelist namelist_cfg jpnj 8 
     963    set_namelist namelist_cfg jpnij 32 
     964    set_namelist namelist_cfg ln_rstart .true. 
    930965    set_namelist namelist_cfg nn_rstctl 2 
    931     set_namelist namelist_cfg cn_ocerst_in \"SAS_00000050_restart\" 
     966    set_namelist namelist_ice_cfg cn_icerst_in \"SAS_00000050_restart_ice\" 
     967    if [ ${USING_MPMD} == "yes" ] ; then 
     968       set_xio_using_server iodef.xml true 
     969    else 
     970       set_xio_using_server iodef.xml false 
     971    fi 
    932972    for (( i=1; i<=$NPROC; i++)) ; do 
    933973        L_NPROC=$(( $i - 1 )) 
    934974        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    935         ln -sf ../LONG/SAS_00000050_restart_${L_NPROC}.nc . 
     975        ln -sf ../LONG/SAS_00000050_restart_ice_${L_NPROC}.nc . 
    936976    done 
    937     if [ ${USING_MPMD} == "yes" ] ; then 
    938        set_xio_using_server iodef.xml true 
    939     else 
    940        set_xio_using_server iodef.xml false 
    941     fi 
    942977    cd ${SETTE_DIR} 
    943978    . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     
    946981fi 
    947982 
     983# TESTS FOR ISOMIP CONFIGURATION 
    948984if [ ${config} -eq 12 ] ;  then 
    949 ## Reproducibility tests for ORCA2_SAS_LIM 
    950     export TEST_NAME="REPRO_8_4" 
    951     cd ${CONFIG_DIR} 
    952     . ./makenemo -m ${CMP_NAM} -n SAS_32 -r ORCA2_SAS_LIM -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    953     cd ${SETTE_DIR} 
    954     . ./param.cfg 
    955     . ./all_functions.sh 
    956     . ./prepare_exe_dir.sh 
    957     JOB_FILE=${EXE_DIR}/run_job.sh 
    958     NPROC=32 
    959     \rm ${JOB_FILE} 
    960     cd ${EXE_DIR} 
    961     set_namelist namelist_cfg cn_exp \"SAS\" 
    962     set_namelist namelist_cfg nn_it000 51 
    963     set_namelist namelist_cfg nn_itend 100 
    964     set_namelist namelist_cfg ln_ctl .false. 
    965     set_namelist namelist_cfg ln_clobber .true. 
    966     set_namelist namelist_cfg nn_fwb 0 
    967     set_namelist namelist_cfg jpni 8 
    968     set_namelist namelist_cfg jpnj 4 
    969     set_namelist namelist_cfg jpnij 32 
    970     if [ ${USING_MPMD} == "yes" ] ; then 
    971        set_xio_using_server iodef.xml true 
    972     else 
    973        set_xio_using_server iodef.xml false 
    974     fi 
    975     cd ${SETTE_DIR} 
    976     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE}  ${NUM_XIOSERVERS} 
    977     cd ${SETTE_DIR} 
    978     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    979     cd ${SETTE_DIR} 
    980     export TEST_NAME="REPRO_4_8" 
    981     . ./prepare_exe_dir.sh 
    982     cd ${EXE_DIR} 
    983     set_namelist namelist_cfg cn_exp \"SAS\" 
    984     set_namelist namelist_cfg nn_it000 51 
    985     set_namelist namelist_cfg nn_itend 100 
    986     set_namelist namelist_cfg ln_ctl .false. 
    987     set_namelist namelist_cfg ln_clobber .true. 
    988     set_namelist namelist_cfg nn_fwb 0 
    989     set_namelist namelist_cfg jpni 4 
    990     set_namelist namelist_cfg jpnj 8 
    991     set_namelist namelist_cfg jpnij 32 
    992     if [ ${USING_MPMD} == "yes" ] ; then 
    993        set_xio_using_server iodef.xml true 
    994     else 
    995        set_xio_using_server iodef.xml false 
    996     fi 
    997     cd ${SETTE_DIR} 
    998     . ./prepare_job.sh input_SAS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    999     cd ${SETTE_DIR} 
    1000     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1001 fi 
    1002 # TESTS FOR ISOMIP CONFIGURATION 
    1003 if [ ${config} -eq 13 ] ;  then 
    1004985    ## Restartability tests for ISOMIP 
    1005986    export TEST_NAME="LONG" 
    1006987    cd ${CONFIG_DIR} 
    1007     . ./makenemo -m ${CMP_NAM} -n ISOMIP_LONG -u ISOMIP -j 8 del_key ${DEL_KEYS} 
    1008     cd ${SETTE_DIR} 
    1009     . ./param.cfg 
    1010     . ./all_functions.sh 
    1011     . ./prepare_exe_dir.sh 
    1012     JOB_FILE=${EXE_DIR}/run_job.sh 
    1013     NPROC=4 
     988    . ./makenemo -m ${CMP_NAM} -n ISOMIP_LONG -r ISOMIP -j 8 del_key ${DEL_KEYS} 
     989    cd ${SETTE_DIR} 
     990    . ./param.cfg 
     991    . ./all_functions.sh 
     992    . ./prepare_exe_dir.sh 
     993    JOB_FILE=${EXE_DIR}/run_job.sh 
     994    NPROC=32 
    1014995    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1015996    cd ${EXE_DIR} 
     
    10191000    set_namelist namelist_cfg nn_stock 48 
    10201001    set_namelist namelist_cfg ln_clobber .true. 
    1021     set_namelist namelist_cfg nn_fwb 0 
    1022 #   set_namelist namelist_cfg nn_solv 2 
    1023     set_namelist namelist_cfg jpni 2 
    1024     set_namelist namelist_cfg jpnj 2 
    1025     set_namelist namelist_cfg jpnij 4 
     1002    set_namelist namelist_cfg ln_read_cfg .true. 
     1003    set_namelist namelist_cfg ln_linssh .true. 
     1004    set_namelist namelist_cfg nn_fwb 0 
     1005    set_namelist namelist_cfg jpni 4 
     1006    set_namelist namelist_cfg jpnj 8 
     1007    set_namelist namelist_cfg jpnij 32 
    10261008    if [ ${USING_MPMD} == "yes" ] ; then 
    10271009       set_xio_using_server iodef.xml true 
     
    10431025    set_namelist namelist_cfg nn_rstctl 2 
    10441026    set_namelist namelist_cfg ln_clobber .true. 
    1045     set_namelist namelist_cfg nn_fwb 0 
    1046 #   set_namelist namelist_cfg nn_solv 2 
    1047     set_namelist namelist_cfg jpni 2 
    1048     set_namelist namelist_cfg jpnj 2 
    1049     set_namelist namelist_cfg jpnij 4 
     1027    set_namelist namelist_cfg ln_read_cfg .true. 
     1028    set_namelist namelist_cfg ln_linssh .true. 
     1029    set_namelist namelist_cfg nn_fwb 0 
     1030    set_namelist namelist_cfg jpni 4 
     1031    set_namelist namelist_cfg jpnj 8 
     1032    set_namelist namelist_cfg jpnij 32 
    10501033    set_namelist namelist_cfg cn_ocerst_in \"ISOMIP_LONG_00000048_restart\" 
    10511034    if [ ${USING_MPMD} == "yes" ] ; then 
     
    10691052    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    10701053fi 
    1071 if [ ${config} -eq 14 ] ;  then 
     1054if [ ${config} -eq 13 ] ;  then 
    10721055    ## Reproducibility tests for ISOMIP 
    1073     export TEST_NAME="REPRO_1_4" 
    1074     cd ${CONFIG_DIR} 
    1075     . ./makenemo -m ${CMP_NAM} -n ISOMIP_4 -u ISOMIP -j 8 add_key "key_mpp_rep" del_key ${DEL_KEYS} 
    1076     cd ${SETTE_DIR} 
    1077     . ./param.cfg 
    1078     . ./all_functions.sh 
    1079     . ./prepare_exe_dir.sh 
    1080     JOB_FILE=${EXE_DIR}/run_job.sh 
    1081     NPROC=4 
     1056    export TEST_NAME="REPRO_4_8" 
     1057    cd ${CONFIG_DIR} 
     1058    . ./makenemo -m ${CMP_NAM} -n ISOMIP_32 -r ISOMIP -j 8 del_key ${DEL_KEYS} 
     1059    cd ${SETTE_DIR} 
     1060    . ./param.cfg 
     1061    . ./all_functions.sh 
     1062    . ./prepare_exe_dir.sh 
     1063    JOB_FILE=${EXE_DIR}/run_job.sh 
     1064    NPROC=32 
    10821065    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    10831066    cd ${EXE_DIR} 
     
    10851068    set_namelist namelist_cfg nn_it000 1 
    10861069    set_namelist namelist_cfg nn_itend 48 
    1087     set_namelist namelist_cfg nn_fwb 0 
    1088     set_namelist namelist_cfg nn_bench 0 
    1089     set_namelist namelist_cfg ln_ctl .false. 
    1090     set_namelist namelist_cfg ln_clobber .true. 
    1091 #   set_namelist namelist_cfg nn_solv 2 
    1092     set_namelist namelist_cfg jpni 1 
     1070    set_namelist namelist_cfg ln_ctl .false. 
     1071    set_namelist namelist_cfg ln_clobber .true. 
     1072    set_namelist namelist_cfg ln_read_cfg .true. 
     1073    set_namelist namelist_cfg ln_linssh .true. 
     1074    set_namelist namelist_cfg nn_fwb 0 
     1075    set_namelist namelist_cfg jpni 4 
     1076    set_namelist namelist_cfg jpnj 8 
     1077    set_namelist namelist_cfg jpnij 32 
     1078    if [ ${USING_MPMD} == "yes" ] ; then 
     1079       set_xio_using_server iodef.xml true 
     1080    else 
     1081       set_xio_using_server iodef.xml false 
     1082    fi 
     1083    cd ${SETTE_DIR} 
     1084    . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1085    cd ${SETTE_DIR} 
     1086    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1087 
     1088    cd ${SETTE_DIR} 
     1089    export TEST_NAME="REPRO_8_4" 
     1090    . ./prepare_exe_dir.sh 
     1091    JOB_FILE=${EXE_DIR}/run_job.sh 
     1092    NPROC=32 
     1093    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1094    cd ${EXE_DIR} 
     1095    set_namelist namelist_cfg cn_exp \"ISOMIP_22\" 
     1096    set_namelist namelist_cfg nn_it000 1 
     1097    set_namelist namelist_cfg nn_itend 48 
     1098    set_namelist namelist_cfg ln_ctl .false. 
     1099    set_namelist namelist_cfg ln_clobber .true. 
     1100    set_namelist namelist_cfg ln_read_cfg .true. 
     1101    set_namelist namelist_cfg ln_linssh .true. 
     1102    set_namelist namelist_cfg nn_fwb 0 
     1103    set_namelist namelist_cfg jpni 8 
    10931104    set_namelist namelist_cfg jpnj 4 
    1094     set_namelist namelist_cfg jpnij 4 
    1095     if [ ${USING_MPMD} == "yes" ] ; then 
    1096        set_xio_using_server iodef.xml true 
    1097     else 
    1098        set_xio_using_server iodef.xml false 
    1099     fi 
    1100     cd ${SETTE_DIR} 
    1101     . ./prepare_job.sh input_ISOMIP.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1102     cd ${SETTE_DIR} 
    1103     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1104  
    1105     cd ${SETTE_DIR} 
    1106     export TEST_NAME="REPRO_2_2" 
    1107     . ./prepare_exe_dir.sh 
    1108     JOB_FILE=${EXE_DIR}/run_job.sh 
    1109     NPROC=4 
    1110     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1111     cd ${EXE_DIR} 
    1112     set_namelist namelist_cfg cn_exp \"ISOMIP_22\" 
    1113     set_namelist namelist_cfg nn_it000 1 
    1114     set_namelist namelist_cfg nn_itend 48 
    1115     set_namelist namelist_cfg nn_fwb 0 
    1116     set_namelist namelist_cfg ln_ctl .false. 
    1117     set_namelist namelist_cfg ln_clobber .true. 
    1118 #   set_namelist namelist_cfg nn_solv 2 
    1119     set_namelist namelist_cfg jpni 2 
    1120     set_namelist namelist_cfg jpnj 2 
    1121     set_namelist namelist_cfg jpnij 4 
     1105    set_namelist namelist_cfg jpnij 32 
    11221106    if [ ${USING_MPMD} == "yes" ] ; then 
    11231107       set_xio_using_server iodef.xml true 
     
    11341118## Test assimilation interface code, OBS and ASM for reproducibility 
    11351119## Restartability not tested (ASM code not restartable while increments are being applied) 
    1136 if [ ${config} -eq 15 ] ; then 
     1120if [ ${config} -eq 14 ] ; then 
    11371121   ## Reproducibility tests for ORCA2_LIM_OBS 
    1138     export TEST_NAME="REPRO_4_4" 
    1139     cd ${CONFIG_DIR} 
    1140     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM_OBS -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_asminc" del_key ${DEL_KEYS} 
    1141     cd ${SETTE_DIR} 
    1142     . ./param.cfg 
    1143     . ./all_functions.sh 
    1144     . ./prepare_exe_dir.sh 
    1145     JOB_FILE=${EXE_DIR}/run_job.sh 
    1146     NPROC=16 
     1122    export TEST_NAME="REPRO_4_8" 
     1123    cd ${CONFIG_DIR} 
     1124    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3 -j 8 add_key "key_asminc" del_key ${DEL_KEYS} 
     1125    cd ${SETTE_DIR} 
     1126    . ./param.cfg 
     1127    . ./all_functions.sh 
     1128    . ./prepare_exe_dir.sh 
     1129    JOB_FILE=${EXE_DIR}/run_job.sh 
     1130    NPROC=32 
    11471131    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    11481132    cd ${EXE_DIR} 
     
    11521136    set_namelist namelist_cfg ln_ctl .false. 
    11531137    set_namelist namelist_cfg ln_clobber .true. 
    1154     set_namelist namelist_cfg jpni 4 
    1155     set_namelist namelist_cfg jpnj 4 
    1156     set_namelist namelist_cfg jpnij 16 
     1138    set_namelist namelist_cfg ln_read_cfg .true. 
     1139    set_namelist namelist_cfg ln_linssh .false. 
     1140    set_namelist namelist_cfg jpni 4 
     1141    set_namelist namelist_cfg jpnj 8 
     1142    set_namelist namelist_cfg jpnij 32 
    11571143    set_namelist namelist_cfg ln_diaobs .true. 
    11581144    set_namelist namelist_cfg ln_t3d .true. 
     
    11731159    fi 
    11741160    cd ${SETTE_DIR} 
    1175     . ./prepare_job.sh input_ORCA2_LIM_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1161    . ./prepare_job.sh input_ORCA2_LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    11761162    cd ${SETTE_DIR} 
    11771163    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    11781164 
    11791165   cd ${SETTE_DIR} 
    1180     export TEST_NAME="REPRO_2_8" 
    1181     . ./prepare_exe_dir.sh 
    1182     JOB_FILE=${EXE_DIR}/run_job.sh 
    1183     NPROC=16 
     1166    export TEST_NAME="REPRO_8_4" 
     1167    . ./prepare_exe_dir.sh 
     1168    JOB_FILE=${EXE_DIR}/run_job.sh 
     1169    NPROC=32 
    11841170    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    11851171    cd ${EXE_DIR} 
     
    11891175    set_namelist namelist_cfg ln_ctl .false. 
    11901176    set_namelist namelist_cfg ln_clobber .true. 
    1191     set_namelist namelist_cfg jpni 2 
    1192     set_namelist namelist_cfg jpnj 8 
    1193     set_namelist namelist_cfg jpnij 16 
     1177    set_namelist namelist_cfg ln_read_cfg .true. 
     1178    set_namelist namelist_cfg ln_linssh .false. 
     1179    set_namelist namelist_cfg jpni 8 
     1180    set_namelist namelist_cfg jpnj 4 
     1181    set_namelist namelist_cfg jpnij 32 
    11941182    set_namelist namelist_cfg ln_diaobs .true. 
    11951183    set_namelist namelist_cfg ln_t3d .true. 
     
    12101198    fi 
    12111199    cd ${SETTE_DIR} 
    1212     . ./prepare_job.sh input_ORCA2_LIM_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1200    . ./prepare_job.sh input_ORCA2_LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    12131201    cd ${SETTE_DIR} 
    12141202    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    12151203fi 
    12161204# TEST FOR ORCA2_LIM_AGRIF : simple test of running AGRIF (no restartability neither reproducibility tests) 
    1217 if [ ${config} -eq 16 ] ;  then 
     1205if [ ${config} -eq 15 ] ;  then 
    12181206    ## ORCA2_LIM with Agulhas AGRIF zoom in MPI 
    12191207    export TEST_NAME="SHORT" 
    12201208    cd ${CONFIG_DIR} 
    1221     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1209    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
    12221210    cd ${SETTE_DIR} 
    12231211    . ./param.cfg 
     
    12321220    set_namelist namelist_cfg ln_ctl .false. 
    12331221    set_namelist namelist_cfg ln_clobber .true. 
     1222    set_namelist namelist_cfg ln_read_cfg .true. 
     1223    set_namelist namelist_cfg ln_linssh .true. 
     1224    set_namelist namelist_cfg ln_hpg_sco .false. 
     1225    set_namelist namelist_cfg ln_hpg_zps .true.  
    12341226    set_namelist namelist_cfg nn_fwb 0 
    12351227    set_namelist namelist_cfg jpni 1 
    12361228    set_namelist namelist_cfg jpnj 2 
    12371229    set_namelist namelist_cfg jpnij 2 
    1238 # 
    12391230    set_namelist 1_namelist_cfg nn_it000 1 
    12401231    set_namelist 1_namelist_cfg nn_itend 150 
    12411232    set_namelist 1_namelist_cfg ln_ctl .false. 
    12421233    set_namelist 1_namelist_cfg ln_clobber .true. 
    1243  
     1234    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1235    set_namelist 1_namelist_cfg ln_linssh .true. 
     1236    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     1237    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    12441238    if [ ${USING_MPMD} == "yes" ] ; then 
    12451239       set_xio_using_server iodef.xml true 
     
    12551249# test code corruption with AGRIF 
    12561250# Compile and run with or without AGRIF ORCA2_LIM 
    1257 if [ ${config} -eq 17 ] ;  then 
    1258     # First run same as 16 but without zoom 
     1251if [ ${config} -eq 16 ] ;  then 
     1252    # First run same as 15 but without zoom 
    12591253    export TEST_NAME="SHORT_NOZOOM" 
    12601254    cd ${CONFIG_DIR} 
    1261     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1255    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
    12621256    cd ${SETTE_DIR} 
    12631257    . ./param.cfg 
     
    12721266    set_namelist namelist_cfg ln_ctl .false. 
    12731267    set_namelist namelist_cfg ln_clobber .true. 
     1268    set_namelist namelist_cfg ln_read_cfg .true. 
     1269    set_namelist namelist_cfg ln_linssh .true. 
     1270    set_namelist namelist_cfg ln_hpg_sco .false. 
     1271    set_namelist namelist_cfg ln_hpg_zps .true.  
    12741272    set_namelist namelist_cfg nn_fwb 0 
    12751273    set_namelist namelist_cfg jpni 2 
     
    12921290    export TEST_NAME="SHORT_NOAGRIF" 
    12931291    cd ${CONFIG_DIR} 
    1294     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM -j 8 add_key "key_mpp_rep" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1292    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM -j 8 del_key "key_zdftmx" del_key ${DEL_KEYS} 
    12951293    cd ${SETTE_DIR} 
    12961294    . ./param.cfg 
     
    13051303    set_namelist namelist_cfg ln_ctl .false. 
    13061304    set_namelist namelist_cfg ln_clobber .true. 
     1305    set_namelist namelist_cfg ln_read_cfg .true. 
     1306    set_namelist namelist_cfg ln_linssh .true. 
     1307    set_namelist namelist_cfg ln_hpg_sco .false. 
     1308    set_namelist namelist_cfg ln_hpg_zps .true.  
    13071309    set_namelist namelist_cfg nn_fwb 0 
    13081310    set_namelist namelist_cfg jpni 2 
     
    13231325 
    13241326## Restartability tests for ORCA2_LIM_AGRIF  
    1325 if [ ${config} -eq 18 ] ;  then 
     1327if [ ${config} -eq 17 ] ;  then 
    13261328    export TEST_NAME="LONG" 
    13271329    cd ${CONFIG_DIR} 
    1328     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1330    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
    13291331    cd ${SETTE_DIR} 
    13301332    . ./param.cfg 
     
    13401342    set_namelist namelist_cfg nn_stock 75 
    13411343    set_namelist namelist_cfg ln_clobber .true. 
     1344    set_namelist namelist_cfg ln_read_cfg .true. 
     1345    set_namelist namelist_cfg ln_linssh .true. 
     1346    set_namelist namelist_cfg ln_hpg_sco .false. 
     1347    set_namelist namelist_cfg ln_hpg_zps .true.  
    13421348    set_namelist namelist_cfg nn_fwb 0 
    13431349    set_namelist namelist_cfg jpni 2 
    13441350    set_namelist namelist_cfg jpnj 2 
    13451351    set_namelist namelist_cfg jpnij 4 
    1346 #   set_namelist namelist_cfg nn_solv 2 
    1347 # 
    13481352    set_namelist 1_namelist_cfg cn_exp \"O2LP_LONG\" 
    13491353    set_namelist 1_namelist_cfg nn_it000 1 
     
    13521356    set_namelist 1_namelist_cfg ln_ctl .false. 
    13531357    set_namelist 1_namelist_cfg ln_clobber .true. 
     1358    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1359    set_namelist 1_namelist_cfg ln_linssh .true. 
     1360    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     1361    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    13541362# 
    13551363    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13721380    set_namelist namelist_cfg nn_rstctl 2 
    13731381    set_namelist namelist_cfg ln_clobber .true. 
     1382    set_namelist namelist_cfg ln_read_cfg .true. 
     1383    set_namelist namelist_cfg ln_linssh .true. 
     1384    set_namelist namelist_cfg ln_hpg_sco .false. 
     1385    set_namelist namelist_cfg ln_hpg_zps .true.  
    13741386    set_namelist namelist_cfg nn_fwb 0 
    13751387    set_namelist namelist_cfg jpni 2 
     
    13851397    set_namelist 1_namelist_cfg nn_rstctl 2 
    13861398    set_namelist 1_namelist_cfg ln_clobber .true. 
     1399    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1400    set_namelist 1_namelist_cfg ln_linssh .true. 
     1401    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     1402    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    13871403    set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    13881404    set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
     
    14091425 
    14101426## Reproducibility tests for ORCA2_LIM_AGRIF 
    1411 if [ ${config} -eq 19 ] ;  then 
     1427if [ ${config} -eq 18 ] ;  then 
    14121428    export TEST_NAME="REPRO_4_4" 
    14131429    cd ${CONFIG_DIR} 
    1414     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1430    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
    14151431    cd ${SETTE_DIR} 
    14161432    . ./param.cfg 
     
    14251441    set_namelist namelist_cfg ln_ctl .false. 
    14261442    set_namelist namelist_cfg ln_clobber .true. 
     1443    set_namelist namelist_cfg ln_read_cfg .true. 
     1444    set_namelist namelist_cfg ln_linssh .true. 
     1445    set_namelist namelist_cfg ln_hpg_sco .false. 
     1446    set_namelist namelist_cfg ln_hpg_zps .true.  
    14271447    set_namelist namelist_cfg nn_fwb 0 
    14281448    set_namelist namelist_cfg jpni 4 
    14291449    set_namelist namelist_cfg jpnj 4 
    14301450    set_namelist namelist_cfg jpnij 16 
    1431 #   set_namelist namelist_cfg nn_solv 2 
    1432 # 
    14331451    set_namelist 1_namelist_cfg nn_it000 1 
    14341452    set_namelist 1_namelist_cfg nn_itend 150 
    14351453    set_namelist 1_namelist_cfg ln_ctl .false. 
    14361454    set_namelist 1_namelist_cfg ln_clobber .true. 
     1455    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1456    set_namelist 1_namelist_cfg ln_linssh .true. 
     1457    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     1458    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    14371459 
    14381460    if [ ${USING_MPMD} == "yes" ] ; then 
     
    14571479    set_namelist namelist_cfg ln_ctl .false. 
    14581480    set_namelist namelist_cfg ln_clobber .true. 
     1481    set_namelist namelist_cfg ln_read_cfg .true. 
     1482    set_namelist namelist_cfg ln_linssh .true. 
     1483    set_namelist namelist_cfg ln_hpg_sco .false. 
     1484    set_namelist namelist_cfg ln_hpg_zps .true.  
    14591485    set_namelist namelist_cfg nn_fwb 0 
    14601486    set_namelist namelist_cfg jpni 2 
    14611487    set_namelist namelist_cfg jpnj 8 
    14621488    set_namelist namelist_cfg jpnij 16 
    1463 #   set_namelist namelist_cfg nn_solv 2 
    1464 # 
    14651489    set_namelist 1_namelist_cfg nn_it000 1 
    14661490    set_namelist 1_namelist_cfg nn_itend 150 
    14671491    set_namelist 1_namelist_cfg ln_ctl .false. 
    14681492    set_namelist 1_namelist_cfg ln_clobber .true. 
     1493    set_namelist 1_namelist_cfg ln_read_cfg .true. 
     1494    set_namelist 1_namelist_cfg ln_linssh .true. 
     1495    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
     1496    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    14691497 
    14701498    if [ ${USING_MPMD} == "yes" ] ; then 
  • trunk/NEMOGCM/SETTE/sette_rpt

    r6140 r7646  
    8585 
    8686   
    87   if ( -d ./WORCA2LIMPIS_LONG ) then 
    88     set dorv = `ls -1rtd ./WORCA2LIMPIS_LONG/{$mach}/* | tail -1l ` 
    89     set dorv = $dorv:t 
    90     set f1o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    91     set f1s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
    92     set f1t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat 
    93     set f2o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    94     set f2s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    95     set f2t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat 
     87  if ( -d ./WORCA2LIM3PIS_LONG ) then 
     88    set dorv = `ls -1rtd ./WORCA2LIM3PIS_LONG/{$mach}/* | tail -1l ` 
     89    set dorv = $dorv:t 
     90    set f1o = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
     91    set f1s = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
     92    set f1t = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat 
     93    set f2o = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
     94    set f2s = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
     95    set f2t = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat 
    9696 
    9797    set stato = 0 
     
    100100    cmp -s f1.tmp$$ $f2s 
    101101    if ( $status == 0 ) then 
    102       echo "ORCA2LIMPIS solver.stat restartability  passed" 
     102      echo "ORCA2LIM3PIS solver.stat restartability  passed" 
    103103    else 
    104104      set stato = 1 
    105       echo "ORCA2LIMPIS solver.stat restartability  FAILED" 
     105      echo "ORCA2LIM3PIS solver.stat restartability  FAILED" 
    106106      if ( $pass == 1 ) then 
    107107        echo "<return> to view solver.stat differences" 
     
    115115    cmp -s f1.tmp$$ $f2t 
    116116    if ( $status == 0 ) then 
    117       echo "ORCA2LIMPIS tracer.stat restartability  passed" 
     117      echo "ORCA2LIM3PIS tracer.stat restartability  passed" 
    118118    else 
    119119      set stato = 1 
    120       echo "ORCA2LIMPIS tracer.stat restartability  FAILED" 
     120      echo "ORCA2LIM3PIS tracer.stat restartability  FAILED" 
    121121      if ( $pass == 1 ) then 
    122122        echo "<return> to view tracer.stat differences" 
     
    260260NEXT1: 
    261261   
    262   if ( -d ./WGYRE_4 ) then 
    263     set dorv = `ls -1rtd ./WGYRE_4/{$mach}/* | tail -1l ` 
    264     set dorv = $dorv:t 
    265     set f1o = ./WGYRE_4/{$mach}/{$dorv}/REPRO_1_4/ocean.output 
    266     set f1s = ./WGYRE_4/{$mach}/{$dorv}/REPRO_1_4/solver.stat 
    267     set f2o = ./WGYRE_4/{$mach}/{$dorv}/REPRO_2_2/ocean.output 
    268     set f2s = ./WGYRE_4/{$mach}/{$dorv}/REPRO_2_2/solver.stat 
     262  if ( -d ./WGYRE_32 ) then 
     263    set dorv = `ls -1rtd ./WGYRE_32/{$mach}/* | tail -1l ` 
     264    set dorv = $dorv:t 
     265    set f1o = ./WGYRE_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     266    set f1s = ./WGYRE_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     267    set f2o = ./WGYRE_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     268    set f2s = ./WGYRE_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    269269   
    270270    cmp -s $f1s $f2s 
     
    286286  endif 
    287287 
    288   if ( -d ./WISOMIP_4 ) then 
    289     set dorv = `ls -1rtd ./WISOMIP_4/{$mach}/* | tail -1l ` 
    290     set dorv = $dorv:t 
    291     set f1o = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_1_4/ocean.output 
    292     set f1s = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_1_4/solver.stat 
    293     set f2o = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_2_2/ocean.output 
    294     set f2s = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_2_2/solver.stat 
     288  if ( -d ./WISOMIP_32 ) then 
     289    set dorv = `ls -1rtd ./WISOMIP_32/{$mach}/* | tail -1l ` 
     290    set dorv = $dorv:t 
     291    set f1o = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     292    set f1s = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     293    set f2o = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     294    set f2s = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    295295 
    296296    cmp -s $f1s $f2s 
     
    312312  endif 
    313313  
    314   if ( -d ./WORCA2LIMPIS_16 ) then 
    315     set dorv = `ls -1rtd ./WORCA2LIMPIS_16/{$mach}/* | tail -1l ` 
    316     set dorv = $dorv:t 
    317     set f1o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    318     set f1s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    319     set f1t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat 
    320     set f2o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    321     set f2s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    322     set f2t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat 
     314  if ( -d ./WORCA2LIM3PIS_32 ) then 
     315    set dorv = `ls -1rtd ./WORCA2LIM3PIS_32/{$mach}/* | tail -1l ` 
     316    set dorv = $dorv:t 
     317    set f1o = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     318    set f1s = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     319    set f1t = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/tracer.stat 
     320    set f2o = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     321    set f2s = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
     322    set f2t = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/tracer.stat 
    323323 
    324324    set stato = 0 
    325325    cmp -s $f1s $f2s 
    326326    if ( $status == 0 ) then 
    327       echo "ORCA2LIMPIS solver.stat reproducibility  passed" 
     327      echo "ORCA2LIM3PIS solver.stat reproducibility  passed" 
    328328    else 
    329329      set stato = 1 
    330       echo "ORCA2LIMPIS solver.stat reproducibility  FAILED" 
     330      echo "ORCA2LIM3PIS solver.stat reproducibility  FAILED" 
    331331      if ( $pass == 1 ) then 
    332332        echo "<return> to view solver.stat differences" 
     
    338338    cmp -s $f1t $f2t 
    339339    if ( $status == 0 ) then 
    340       echo "ORCA2LIMPIS tracer.stat reproducibility  passed" 
     340      echo "ORCA2LIM3PIS tracer.stat reproducibility  passed" 
    341341    else 
    342342      set stato = 1 
    343       echo "ORCA2LIMPIS tracer.stat reproducibility  FAILED" 
     343      echo "ORCA2LIM3PIS tracer.stat reproducibility  FAILED" 
    344344      if ( $pass == 1 ) then 
    345345        echo "<return> to view tracer.stat differences" 
     
    360360  endif 
    361361 
    362   if ( -d ./WORCA2OFFPIS_16 ) then 
    363     set dorv = `ls -1rtd ./WORCA2OFFPIS_16/{$mach}/* | tail -1l ` 
    364     set dorv = $dorv:t 
    365     set f1o = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    366     set f1s = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat 
    367     set f2o = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    368     set f2s = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat 
     362  if ( -d ./WORCA2OFFPIS_32 ) then 
     363    set dorv = `ls -1rtd ./WORCA2OFFPIS_32/{$mach}/* | tail -1l ` 
     364    set dorv = $dorv:t 
     365    set f1o = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     366    set f1s = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_4_8/tracer.stat 
     367    set f2o = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     368    set f2s = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_8_4/tracer.stat 
    369369 
    370370    cmp -s $f1s $f2s 
     
    415415    set dorv = `ls -1rtd ./WORCA2LIM3_16/{$mach}/* | tail -1l ` 
    416416    set dorv = $dorv:t 
    417     set f1o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    418     set f1s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    419     set f2o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    420     set f2s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
     417    set f1o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     418    set f1s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     419    set f2o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     420    set f2s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    421421 
    422422    cmp -s $f1s $f2s 
     
    439439 
    440440 
    441   if ( -d ./WORCA2_LIM_OBS ) then 
    442     set dorv = `ls -1rtd ./WORCA2_LIM_OBS/{$mach}/* | tail -1l ` 
    443     set dorv = $dorv:t 
    444     set f1o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    445     set f1s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    446     set f2o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    447     set f2s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    448  
    449     cmp -s $f1s $f2s 
    450     if ( $status == 0 ) then 
    451       echo "ORCA2_LIM_OBS   reproducibility passed" 
    452     else 
    453       echo "ORCA2_LIM_OBS   reproducibility FAILED" 
     441  if ( -d ./WORCA2_LIM3_OBS ) then 
     442    set dorv = `ls -1rtd ./WORCA2_LIM3_OBS/{$mach}/* | tail -1l ` 
     443    set dorv = $dorv:t 
     444    set f1o = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     445    set f1s = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     446    set f2o = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     447    set f2s = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
     448 
     449    cmp -s $f1s $f2s 
     450    if ( $status == 0 ) then 
     451      echo "ORCA2_LIM3_OBS   reproducibility passed" 
     452    else 
     453      echo "ORCA2_LIM3_OBS   reproducibility FAILED" 
    454454      if ( $pass == 1 ) then 
    455455        echo "<return> to view solver.stat differences" 
  • trunk/NEMOGCM/SETTE/sette_rpt.sh

    r6152 r7646  
    214214# Restartability test 
    215215# 
    216  for restart_test in WGYRE_LONG WISOMIP_LONG WORCA2LIMPIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WORCA2LIM3_LONG WSAS_LONG WORCA2AGUL_LONG 
     216 for restart_test in WGYRE_LONG WORCA2LIM3_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WSAS_LONG WISOMIP_LONG WORCA2AGUL_LONG 
    217217 do 
    218218   resttest $NEMO_VALID $restart_test $pass 
     
    221221# Reproducibility tests 
    222222# 
    223  for repro_test in WGYRE_4 WISOMIP_4 WORCA2LIMPIS_16 WORCA2OFFPIS_16 WAMM12_32 WORCA2LIM3_16 WORCA2_LIM_OBS WSAS_32 WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
     223 for repro_test in WGYRE_32 WORCA2LIM3_32 WORCA2LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
    224224 do 
    225225   reprotest $NEMO_VALID $repro_test $pass 
Note: See TracChangeset for help on using the changeset viewer.