Changeset 7715


Ignore:
Timestamp:
2017-02-22T15:20:01+01:00 (3 years ago)
Author:
flavoni
Message:

#1850 commit new list of REFERENCE CONFIGURATIONS, and SETTE tests

Location:
trunk/NEMOGCM
Files:
25 added
9 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/ARCH/arch-X64_ADA.fcm

    r5656 r7715  
    3333%NCDF_HOME           /smplocal/pub/NetCDF/4.1.3/mpi 
    3434%HDF5_HOME           /smplocal/pub/HDF5/1.8.9/par 
    35 %XIOS_HOME           $WORKDIR/XIOS 
     35%XIOS_HOME           $WORKDIR/XIOS2 
    3636####%OASIS_HOME          $WORKDIR/oasis3-mct/BLD 
    3737%OASIS_HOME          /not/defined 
  • trunk/NEMOGCM/ARCH/arch-X64_ADA_DEBUG.fcm

    r7646 r7715  
    3333%NCDF_HOME           /smplocal/pub/NetCDF/4.1.3/mpi 
    3434%HDF5_HOME           /smplocal/pub/HDF5/1.8.9/par 
    35 %XIOS_HOME           $WORKDIR/XIOS 
     35%XIOS_HOME           $WORKDIR/XIOS2 
    3636%OASIS_HOME          /not/yet/defined 
    3737 
  • trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg

    r7646 r7715  
    22!! NEMO/OPA  : GYRE_PISCES Configuration namelist to overwrite reference dynamical namelist 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    4  
     4!----------------------------------------------------------------------- 
     5&namusr_def    !   GYRE user defined namelist   
     6!----------------------------------------------------------------------- 
     7   nn_GYRE     =     1     !  GYRE resolution [1/degrees] 
     8   ln_bench    = .false.   !  ! =T benchmark with gyre: the gridsize is kept constant 
     9   jpkglo      =    31     !  number of model levels 
     10/ 
    511!!====================================================================== 
    612!!                   ***  Run management namelists  *** 
     
    2531      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    2632   ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     33! 
    2734/ 
    2835!----------------------------------------------------------------------- 
  • trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

    r7646 r7715  
    22!! NEMO/OPA  : GYRE_PISCES Configuration namelist to overwrite reference dynamical namelist 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     4!----------------------------------------------------------------------- 
     5&namusr_def    !   GYRE user defined namelist   
     6!----------------------------------------------------------------------- 
     7   nn_GYRE     =     1     !  GYRE resolution [1/degrees] 
     8   ln_bench    = .false.   !  ! =T benchmark with gyre: the gridsize is kept constant 
     9   jpkglo      =    31     !  number of model levels 
     10/ 
     11!!====================================================================== 
     12!!                   ***  Run management namelists  *** 
     13!!====================================================================== 
     14!!   namrun        parameters of the run 
     15!!====================================================================== 
     16! 
    417!----------------------------------------------------------------------- 
    518&namrun        !   parameters of the run 
     
    1831      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules 
    1932   ln_write_cfg= .false.   !  (=T) create the domain configuration file 
     33   ! 
    2034/ 
    2135!----------------------------------------------------------------------- 
     
    3044!----------------------------------------------------------------------- 
    3145&namcrs        !   Grid coarsening for dynamics output and/or 
    32                !   passive tracer coarsened online simulations 
     46!              !   passive tracer coarsened online simulations 
    3347!----------------------------------------------------------------------- 
    3448/ 
     
    3650&namtsd    !   data : Temperature  & Salinity 
    3751!----------------------------------------------------------------------- 
     52!          ! file name ! frequency (hours)    ! variable ! time interp. ! clim  !'yearly' or ! weights  ! rotation ! 
     53!          !           !  (if <0  months)     !   name   !  (logical)   ! (T/F) ! 'monthly'  ! filename ! pairing 
    3854   cn_dir        = './'      !  root directory for the location of the runoff files 
    3955   ln_tsd_init   = .false.   !  Initialisation of ocean T & S with T &S input data (T) or not (F) 
     
    4460!----------------------------------------------------------------------- 
    4561   nn_fsbc     = 1         !  frequency of surface boundary condition computation 
    46                            !     (also = the frequency of sea-ice model call) 
     62   !                       !     (also = the frequency of sea-ice model call) 
    4763   ln_usr      = .true.    !  user defined formulation                  (T => check usrdef_sbc) 
    4864   ln_blk      = .false.   !  Bulk formulation                          (T => fill namsbc_blk ) 
     
    6076/ 
    6177!----------------------------------------------------------------------- 
     78&namsbc_rnf    !   runoffs namelist surface boundary condition 
     79!----------------------------------------------------------------------- 
     80   ln_rnf_mouth = .false.   !  specific treatment at rivers mouths 
     81/ 
     82!----------------------------------------------------------------------- 
     83&namsbc_apr    !   Atmospheric pressure used as ocean forcing or in bulk 
     84!----------------------------------------------------------------------- 
     85/ 
     86!----------------------------------------------------------------------- 
     87&namsbc_ssr    !   surface boundary condition : sea surface restoring 
     88!----------------------------------------------------------------------- 
     89/ 
     90!----------------------------------------------------------------------- 
     91&namsbc_alb    !   albedo parameters 
     92!----------------------------------------------------------------------- 
     93/ 
     94!----------------------------------------------------------------------- 
     95&namberg       !   iceberg parameters 
     96!----------------------------------------------------------------------- 
     97/ 
     98!----------------------------------------------------------------------- 
    6299&namlbc        !   lateral momentum boundary condition 
    63100!----------------------------------------------------------------------- 
     
    65102/ 
    66103!----------------------------------------------------------------------- 
     104&namagrif      !  AGRIF zoom                                            ("key_agrif") 
     105!----------------------------------------------------------------------- 
     106/ 
     107!----------------------------------------------------------------------- 
     108&nam_tide      !    tide parameters 
     109!----------------------------------------------------------------------- 
     110/ 
     111!----------------------------------------------------------------------- 
     112&nambdy        !  unstructured open boundaries                           
     113!----------------------------------------------------------------------- 
     114/ 
     115!----------------------------------------------------------------------- 
     116&nambdy_dta      !  open boundaries - external data            
     117!----------------------------------------------------------------------- 
     118/ 
     119!----------------------------------------------------------------------- 
     120&nambdy_tide     ! tidal forcing at open boundaries 
     121!----------------------------------------------------------------------- 
     122/ 
     123!----------------------------------------------------------------------- 
    67124&nambfr        !   bottom friction 
    68125!----------------------------------------------------------------------- 
     
    74131/ 
    75132!----------------------------------------------------------------------- 
     133&nambbl        !   bottom boundary layer scheme 
     134!----------------------------------------------------------------------- 
     135/ 
     136!----------------------------------------------------------------------- 
    76137&nameos        !   ocean physical parameters 
    77138!----------------------------------------------------------------------- 
    78139   ln_eos80    = .true.         !  = Use EOS80 equation of state 
    79    !                             ! 
    80    !                      ! S-EOS coefficients : 
    81    !                             !  rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS 
    82    rn_a0       =  1.6550e-1      !  thermal expension coefficient (nn_eos= 1) 
    83    rn_b0       =  7.6554e-1      !  saline  expension coefficient (nn_eos= 1) 
    84    rn_lambda1  =  5.9520e-2      !  cabbeling coeff in T^2  (=0 for linear eos) 
    85    rn_lambda2  =  7.4914e-4      !  cabbeling coeff in S^2  (=0 for linear eos) 
    86    rn_mu1      =  1.4970e-4      !  thermobaric coeff. in T (=0 for linear eos) 
    87    rn_mu2      =  1.1090e-5      !  thermobaric coeff. in S (=0 for linear eos) 
    88    rn_nu       =  2.4341e-3      !  cabbeling coeff in T*S  (=0 for linear eos) 
    89 !!org GYRE   rn_alpha    =   2.0e-4  !  thermal expension coefficient (nn_eos= 1 or 2) 
    90 !!org GYRE   rn_beta     =   7.7e-4  !  saline  expension coefficient (nn_eos= 2) 
    91 !!org  caution  now a0 = alpha / rau0   with rau0 = 1026 
    92140/ 
    93141!----------------------------------------------------------------------- 
     
    99147      nn_fct_zts =  0               !  >=1,  2nd order FCT scheme with vertical sub-timestepping 
    100148      !                             !        (number of sub-timestep = nn_fct_zts) 
     149/ 
     150!----------------------------------------------------------------------- 
     151&namtra_adv_mle !  mixed layer eddy parametrisation (Fox-Kemper param) 
     152!----------------------------------------------------------------------- 
    101153/ 
    102154!---------------------------------------------------------------------------------- 
     
    170222   !                       !  Type of the operator : 
    171223   !                           !  no diffusion: set ln_dynldf_lap=..._blp=F  
    172    ln_dynldf_lap =  .true.    !    laplacian operator 
     224   ln_dynldf_lap =  .true.     !    laplacian operator 
    173225   ln_dynldf_blp =  .false.    !  bilaplacian operator 
    174226   !                       !  Direction of action  : 
    175    ln_dynldf_lev =  .true.    !  iso-level 
     227   ln_dynldf_lev =  .true.     !  iso-level 
    176228   ln_dynldf_hor =  .false.    !  horizontal (geopotential) 
    177229   ln_dynldf_iso =  .false.    !  iso-neutral 
     
    187239   rn_ahm_0      = 100000.     !  horizontal laplacian eddy viscosity   [m2/s] 
    188240   rn_ahm_b      =      0.     !  background eddy viscosity for ldf_iso [m2/s] 
    189    rn_bhm_0      =      0.      !  horizontal bilaplacian eddy viscosity [m4/s] 
     241   rn_bhm_0      =      0.     !  horizontal bilaplacian eddy viscosity [m4/s] 
    190242   ! 
    191243   ! Caution in 20 and 30 cases the coefficient have to be given for a 1 degree grid (~111km) 
     
    199251/ 
    200252!----------------------------------------------------------------------- 
     253&namzdf_ric    !   richardson number dependent vertical diffusion       ("key_zdfric" ) 
     254!----------------------------------------------------------------------- 
     255/ 
     256!----------------------------------------------------------------------- 
    201257&namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  ("key_zdftke") 
    202258!----------------------------------------------------------------------- 
     
    204260/ 
    205261!----------------------------------------------------------------------- 
     262&namzdf_gls                !   GLS vertical diffusion                   ("key_zdfgls") 
     263!----------------------------------------------------------------------- 
     264/ 
     265!----------------------------------------------------------------------- 
     266&namzdf_ddm    !   double diffusive mixing parameterization             ("key_zdfddm") 
     267!----------------------------------------------------------------------- 
     268/ 
     269!----------------------------------------------------------------------- 
     270&namzdf_tmx    !   tidal mixing parameterization                        ("key_zdftmx") 
     271!----------------------------------------------------------------------- 
     272   ln_tmx_itf  = .false.   !  ITF specific parameterisation 
     273/ 
     274!----------------------------------------------------------------------- 
    206275&nammpp        !   Massively Parallel Processing                        ("key_mpp_mpi) 
    207276!----------------------------------------------------------------------- 
     
    212281/ 
    213282!----------------------------------------------------------------------- 
     283&namnc4        !   netcdf4 chunking and compression settings            ("key_netcdf4") 
     284!----------------------------------------------------------------------- 
     285/ 
     286!----------------------------------------------------------------------- 
     287&namtrd        !   diagnostics on dynamics and/or tracer trends         ("key_trddyn" and/or "key_trdtra") 
     288!              !       or mixed-layer trends or barotropic vorticity    ("key_trdmld" or     "key_trdvor") 
     289!----------------------------------------------------------------------- 
     290/ 
     291!----------------------------------------------------------------------- 
     292&namflo       !   float parameters                                      ("key_float") 
     293!----------------------------------------------------------------------- 
     294/ 
     295!----------------------------------------------------------------------- 
    214296&namptr       !   Poleward Transport Diagnostic 
    215297!----------------------------------------------------------------------- 
     
    219301!----------------------------------------------------------------------- 
    220302/ 
     303!----------------------------------------------------------------------- 
     304&namdct        ! transports through sections 
     305!----------------------------------------------------------------------- 
     306    nn_dct      = 60       !  time step frequency for transports computing 
     307    nn_dctwri   = 60       !  time step frequency for transports writing 
     308    nn_secdebug = 0        !      0 : no section to debug 
     309/ 
     310!----------------------------------------------------------------------- 
     311&namobs       !  observation usage switch                               ('key_diaobs') 
     312!----------------------------------------------------------------------- 
     313/ 
     314!----------------------------------------------------------------------- 
     315&nam_asminc   !   assimilation increments                               ('key_asminc') 
     316!----------------------------------------------------------------------- 
     317/ 
     318!----------------------------------------------------------------------- 
     319&namsbc_wave   ! External fields from wave model 
     320!----------------------------------------------------------------------- 
     321/ 
  • trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_top_cfg

    r7646 r7715  
    2929/ 
    3030!----------------------------------------------------------------------- 
    31 &namtrc_dta      !    Initialisation from data input file 
     31&namtrc_adv    !   advection scheme for passive tracer 
    3232!----------------------------------------------------------------------- 
    33 / 
    3433   ln_trcadv_fct =  .true.   !  FCT scheme 
    3534      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg

    r7283 r7715  
    4545&namsbc        !   Surface Boundary Condition (surface module) 
    4646!----------------------------------------------------------------------- 
    47    ln_blk_core = .true.    !  CORE bulk formulation                     (T => fill namsbc_core) 
     47   ln_blk      = .true.    !  CORE bulk formulation                     (T => fill namsbc_core) 
    4848   nn_ice      = 0         !  =0 no ice boundary condition   , 
    4949                           !  =1 use observed ice-cover      , 
     
    107107&nameos        !   ocean physical parameters 
    108108!----------------------------------------------------------------------- 
     109  ln_teos10   = .true.         !  = Use TEOS-10 equation of state 
    109110/ 
    110111!----------------------------------------------------------------------- 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_cfg

    r7283 r7715  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/LIM2 : Configuration namelist used to overwrite 1_namelist_ice_ref 
     2!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     3!! NEMO/LIM3 configuration namelist: Overwrites 1_namelist_ice_ref 
     4!!              1 - Generic parameters                 (namicerun) 
     5!!              2 - Diagnostics                        (namicediag) 
     6!!              3 - Ice initialization                 (namiceini) 
     7!!              4 - Ice discretization                 (namiceitd) 
     8!!              5 - Ice dynamics and transport         (namicedyn) 
     9!!              6 - Ice diffusion                      (namicehdf) 
     10!!              7 - Ice thermodynamics                 (namicethd) 
     11!!              8 - Ice salinity                       (namicesal) 
     12!!              9 - Ice mechanical redistribution      (namiceitdme) 
    313!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    4 ! 
    5 !----------------------------------------------------------------------- 
    6 &namicerun     !   Share parameters for dynamics/advection/thermo 
    7 !----------------------------------------------------------------------- 
     14!------------------------------------------------------------------------------ 
     15&namicerun     !   Generic parameters 
     16!------------------------------------------------------------------------------ 
    817/ 
    9 !----------------------------------------------------------------------- 
    10 &namiceini     !   ice initialisation 
    11 !----------------------------------------------------------------------- 
     18!------------------------------------------------------------------------------ 
     19&namicediag    !   Diagnostics 
     20!------------------------------------------------------------------------------ 
    1221/ 
    13 !----------------------------------------------------------------------- 
    14 &namicedyn     !   ice dynamic 
    15 !----------------------------------------------------------------------- 
    16    creepl      =   2.0e-08 !  creep limit 
    17    nevp        =   360     !  number of EVP subcycling iterations 
    18    telast      =   3600    !  timescale for EVP elastic waves 
     22!------------------------------------------------------------------------------ 
     23&namiceini     !   Ice initialization 
     24!------------------------------------------------------------------------------ 
    1925/ 
    20 !----------------------------------------------------------------------- 
    21 &namicetrp     !   ice transport 
    22 !----------------------------------------------------------------------- 
     26!------------------------------------------------------------------------------ 
     27&namiceitd     !   Ice discretization 
     28!------------------------------------------------------------------------------ 
    2329/ 
    24 !----------------------------------------------------------------------- 
    25 &namicethd     !   ice thermodynamic 
    26 !----------------------------------------------------------------------- 
     30!------------------------------------------------------------------------------ 
     31&namicedyn     !   Ice dynamics and transport 
     32!------------------------------------------------------------------------------ 
    2733/ 
    28 !----------------------------------------------------------------------- 
    29 &namicedia     !   ice diagnostics 
    30 !----------------------------------------------------------------------- 
     34!------------------------------------------------------------------------------ 
     35&namicehdf     !   Ice horizontal diffusion 
     36!------------------------------------------------------------------------------ 
    3137/ 
    32 !''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 
    33 &namiceout     !   parameters for outputs 
    34 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 
    35 /       
     38!------------------------------------------------------------------------------ 
     39&namicethd     !   Ice thermodynamics 
     40!------------------------------------------------------------------------------ 
     41/ 
     42!------------------------------------------------------------------------------ 
     43&namicesal     !   Ice salinity 
     44!------------------------------------------------------------------------------ 
     45/ 
     46!------------------------------------------------------------------------------ 
     47&namiceitdme   !   Ice mechanical redistribution (ridging and rafting) 
     48!------------------------------------------------------------------------------ 
     49/ 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg

    r7323 r7715  
    6969&namberg       !   iceberg parameters 
    7070!----------------------------------------------------------------------- 
    71       ln_icebergs              = .false.               ! iceberg floats or not 
     71      ln_icebergs              = .true.               ! iceberg floats or not 
    7272      ln_bergdia               = .true.               ! Calculate budgets 
    7373      nn_verbose_level         = 1                    ! Turn on more verbose output if level > 0 
  • trunk/NEMOGCM/CONFIG/TEST_CASES/README

    r7640 r7715  
    1 ## List of available test  vases is in CONFIG/TEST_CASES/cfg.txt 
     1## List of available test cases is in CONFIG/TEST_CASES/cfg.txt 
    22 
    33## HOW TO COMPILE TEST CASES : 
  • trunk/NEMOGCM/CONFIG/TEST_CASES/cfg.txt

    r7638 r7715  
    33LOCK_EXCHANGE OPA_SRC 
    44SAS_BIPER OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC 
     5ISOMIP OPA_SRC 
  • trunk/NEMOGCM/CONFIG/cfg.txt

    r7646 r7715  
     1AMM12 OPA_SRC 
     2C1D_PAPA OPA_SRC 
    13GYRE_PISCES OPA_SRC TOP_SRC 
    2 GYRE_XIOS OPA_SRC 
    3 GYRE OPA_SRC 
    4 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC 
    5 C1D_PAPA OPA_SRC 
    64GYRE_BFM OPA_SRC TOP_SRC 
    7 AMM12 OPA_SRC 
    8 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 
     5ORCA2_SAS_LIM3 OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC 
    96ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
    10 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
    117ORCA2_OFF_TRC OPA_SRC OFF_SRC TOP_SRC 
    12 ISOMIP OPA_SRC 
    138ORCA2_LIM3_PISCES OPA_SRC LIM_SRC_3 TOP_SRC NST_SRC 
    14 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
    15 ORCA2_SAS_LIM3 OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC 
  • trunk/NEMOGCM/CONFIG/makenemo

    r7646 r7715  
    250250REF_CONF=${x_r} 
    251251USP_CONF=${x_u} 
    252 NEMO_TDIR=${x_t:-$NEMO_TDIR} 
     252NEMO_TDIR=${x_t} 
    253253export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR} 
    254254export NEMO_DIR=${MAIN_DIR}/${x_s} 
  • trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_hgr.F90

    r7698 r7715  
    77   !! User defined :   mesh and Coriolis parameter of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO ! 2016-03  (S. Flavoni)  
     9   !! History  :  4.0 ! 2016-03  (S. Flavoni)  
    1010   !!---------------------------------------------------------------------- 
    1111 
  • trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_istate.F90

    r7698 r7715  
    77   !! User defined : set the initial state of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO ! 2016-03  (S. Flavoni) Original code 
     9   !! History :  4.0 ! 2016-03  (S. Flavoni) Original code 
    1010   !!---------------------------------------------------------------------- 
    1111 
  • trunk/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_nam.F90

    r7200 r7715  
    77   !! User defined : set the domain characteristics of a user configuration 
    88   !!====================================================================== 
    9    !! History :  NEMO ! 2016-03  (S. Flavoni, G. Madec)  Original code 
     9   !! History :  4.0 ! 2016-03  (S. Flavoni, G. Madec)  Original code 
    1010   !!---------------------------------------------------------------------- 
    1111 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA

    r4990 r7715  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 0:30:00 
     13# @ wall_clock_limit = 1:30:00 
    1414# @ queue 
    1515 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_DEBUG

    r7646 r7715  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 0:30:00 
     13# @ wall_clock_limit = 1:30:00 
    1414# @ queue 
    1515 
  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0

    r4990 r7715  
    1111# @ total_tasks = NPROCS 
    1212# time 
    13 # @ wall_clock_limit = 0:30:00 
     13# @ wall_clock_limit = 1:30:00 
    1414# @ queue 
    1515 
  • trunk/NEMOGCM/SETTE/all_functions.sh

    r7646 r7715  
    6666# 
    6767#  $ ./set_namelist namelist          nn_itend        75 
    68 #  $ ./set_namelist namelist_ice_lim2 cn_icerst_in  \"00101231_restart_ice\" 
     68#  $ ./set_namelist namelist_ice      cn_icerst_in  \"00101231_restart_ice\" 
    6969#  $ post_test_tidyup  
    7070# 
  • trunk/NEMOGCM/SETTE/iodef_sette.xml

    r7646 r7715  
    1212============================================================================================================ 
    1313    --> 
    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"/> 
     14    <field_definition src="DEF_SHARED/field_def_nemo-opa.xml"/> 
     15    <field_definition src="DEF_SHARED/field_def_nemo-lim.xml"/> 
     16    <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 
    1717    <!--  
    1818============================================================================================================ 
     
    165165============================================================================================================ 
    166166    --> 
    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"/> 
     167    <field_definition src="DEF_SHARED/field_def_nemo-opa.xml"/> 
     168    <field_definition src="DEF_SHARED/field_def_nemo-lim.xml"/> 
     169    <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 
    170170    <!--  
    171171============================================================================================================ 
  • trunk/NEMOGCM/SETTE/prepare_exe_dir.sh

    r7646 r7715  
    7171 
    7272cp -RL ${CONFIG_DIR}/${NEW_CONF}/EXP00/* ${EXE_DIR}/. 
    73 cp -R ${SETTE_DIR}/iodef_sette.xml ${EXE_DIR}/iodef.xml 
     73cat ${SETTE_DIR}/iodef_sette.xml | sed -e"s;DEF_SHARED;${CONFIG_DIR0}/SHARED;" > ${EXE_DIR}/iodef.xml 
    7474cd ${EXE_DIR} 
  • trunk/NEMOGCM/SETTE/prepare_job.sh

    r7698 r7715  
    105105echo "" >> ${SETTE_DIR}/output.sette 
    106106echo "list of cpp_keys: " >> ${SETTE_DIR}/output.sette 
    107 echo "`more ${SETTE_DIR}/../CONFIG/${NEW_CONF}/cpp_${NEW_CONF}.fcm`" >> ${SETTE_DIR}/output.sette 
     107echo "`more ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm`" >> ${SETTE_DIR}/output.sette  
    108108echo "" >> ${SETTE_DIR}/output.sette 
    109109echo "compiling with: ${CMP_NAM}" >> ${SETTE_DIR}/output.sette 
  • trunk/NEMOGCM/SETTE/sette.sh

    r7698 r7715  
    9595   COMPILER=ifort_athena_xios_omp 
    9696 else 
    97    COMPILER=ifort_athena_xios 
     97   COMPILER=X64_ADA 
    9898 fi 
    9999export BATCH_COMMAND_PAR="llsubmit" 
     
    139139SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    140140MAIN_DIR=$(dirname $SETTE_DIR) 
    141 CONFIG_DIR=${MAIN_DIR}/CONFIG 
     141CONFIG_DIR0=${MAIN_DIR}/CONFIG 
    142142TOOLS_DIR=${MAIN_DIR}/TOOLS 
    143143COMPIL_DIR=${TOOLS_DIR}/COMPILE 
     
    148148cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 
    149149# Description of configuration tested: 
    150 # GYRE              :  1 &  2 
    151 # ORCA2_LIM3        :  3 &  4 
    152 # ORCA2_LIM3_PISCES :  5 &  6 
    153 # ORCA2_OFF_PISCES  :  7 &  8 
    154 # AMM12             :  9 & 10  
    155 # SAS               : 11     fos SAS there is no solver so is useless to test REPRO 
    156 # ISOMIP            : 12 & 13 
    157 # ORCA2_LIM3_OBS    : 14 
    158 # ORCA2_AGRIF_LIM   : 15 & 16  
    159 #                     17 & 18  
    160  
    161 for config in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 
     150# GYRE_PISCES       :  1 &  2 
     151# ORCA2_LIM3_PISCES :  3 &  4 
     152# ORCA2_OFF_PISCES  :  5 &  6 
     153# AMM12             :  7 &  8  
     154# SAS               :  9     fos SAS there is no solver so is useless to test REPRO 
     155# ISOMIP            : 10 & 11 
     156# ORCA2_LIM3_OBS    : 12 
     157# ORCA2_AGRIF_LIM3  : 13 & 14  
     158#                     15 & 16  
     159 
     160for config in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
    162161 
    163162do 
    164163 
    165 # TESTS FOR GYRE CONFIGURATION 
     164# TESTS FOR GYRE_PISCES CONFIGURATION 
    166165if [ ${config} -eq 1 ] ;  then 
    167     ## Restartability tests for GYRE 
     166    ## Restartability tests for GYRE_PISCES 
    168167    export TEST_NAME="LONG" 
    169     cd ${CONFIG_DIR} 
    170     . ./makenemo -m ${CMP_NAM} -n GYRE_LONG -r GYRE -j 8 del_key ${DEL_KEYS} 
     168    cd ${CONFIG_DIR0} 
     169    . ./makenemo -m ${CMP_NAM} -n GYREPIS_LONG -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
    171170    cd ${SETTE_DIR} 
    172171    . ./param.cfg 
     
    177176    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    178177    cd ${EXE_DIR}   
    179     set_namelist namelist_cfg cn_exp \"GYRE_LONG\" 
     178    set_namelist namelist_cfg cn_exp \"GYREPIS_LONG\" 
    180179    set_namelist namelist_cfg nn_it000 1 
    181180    set_namelist namelist_cfg nn_itend 120 
     
    200199    . ./prepare_exe_dir.sh 
    201200    cd ${EXE_DIR} 
    202     set_namelist namelist_cfg cn_exp \"GYRE_SHORT\" 
     201    set_namelist namelist_cfg cn_exp \"GYREPIS_SHORT\" 
    203202    set_namelist namelist_cfg nn_it000 61 
    204203    set_namelist namelist_cfg nn_itend 120 
     
    213212    set_namelist namelist_cfg jpnj 8 
    214213    set_namelist namelist_cfg jpnij 32 
    215     set_namelist namelist_cfg cn_ocerst_in \"GYRE_LONG_00000060_restart\" 
     214    set_namelist namelist_cfg cn_ocerst_in \"GYREPIS_LONG_00000060_restart\" 
    216215    if [ ${USING_MPMD} == "yes" ] ; then 
    217216       set_xio_using_server iodef.xml true 
     
    222221        L_NPROC=$(( $i - 1 )) 
    223222        L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    224         ln -sf ../LONG/GYRE_LONG_00000060_restart_${L_NPROC}.nc . 
     223        ln -sf ../LONG/GYREPIS_LONG_00000060_restart_${L_NPROC}.nc . 
    225224    done 
    226225    if [ ${USING_MPMD} == "yes" ] ; then 
     
    236235 
    237236if [ ${config} -eq 2 ] ;  then 
    238     ## Reproducibility tests for GYRE 
     237    ## Reproducibility tests for GYRE_PISCES 
    239238    export TEST_NAME="REPRO_4_8" 
    240     cd ${CONFIG_DIR} 
    241     . ./makenemo -m ${CMP_NAM} -n GYRE_32 -r GYRE -j 8 del_key ${DEL_KEYS} 
    242     cd ${SETTE_DIR} 
    243     . ./param.cfg 
    244     . ./all_functions.sh 
    245     . ./prepare_exe_dir.sh 
    246     JOB_FILE=${EXE_DIR}/run_job.sh 
    247     NPROC=32 
    248     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    249     cd ${EXE_DIR} 
    250     set_namelist namelist_cfg cn_exp \"GYRE_48\" 
     239    cd ${CONFIG_DIR0} 
     240    . ./makenemo -m ${CMP_NAM} -n GYREPIS_32 -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
     241    cd ${SETTE_DIR} 
     242    . ./param.cfg 
     243    . ./all_functions.sh 
     244    . ./prepare_exe_dir.sh 
     245    JOB_FILE=${EXE_DIR}/run_job.sh 
     246    NPROC=32 
     247    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     248    cd ${EXE_DIR} 
     249    set_namelist namelist_cfg cn_exp \"GYREPIS_48\" 
    251250    set_namelist namelist_cfg nn_it000 1 
    252251    set_namelist namelist_cfg nn_itend 60 
     
    276275    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    277276    cd ${EXE_DIR} 
    278     set_namelist namelist_cfg cn_exp \"GYRE_84\" 
     277    set_namelist namelist_cfg cn_exp \"GYREPIS_84\" 
    279278    set_namelist namelist_cfg nn_it000 1 
    280279    set_namelist namelist_cfg nn_itend 60 
     
    299298fi 
    300299 
    301 # TESTS FOR ORCA2_LIM3 CONFIGURATION 
     300# TESTS FOR ORCA2_LIM3_PISCES CONFIGURATION 
    302301if [ ${config} -eq 3 ] ;  then 
    303     ## Restartability tests for ORCA2_LIM3 
    304     export TEST_NAME="LONG" 
    305     cd ${CONFIG_DIR} 
    306     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_LONG -r ORCA2_LIM3 -j 8 del_key ${DEL_KEYS} 
    307     cd ${SETTE_DIR} 
    308     . ./param.cfg 
    309     . ./all_functions.sh 
    310     . ./prepare_exe_dir.sh 
    311     JOB_FILE=${EXE_DIR}/run_job.sh 
    312     NPROC=4 
    313     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    314     cd ${EXE_DIR} 
    315     set_namelist namelist_cfg cn_exp \"O2L3_LONG\" 
    316     set_namelist namelist_cfg nn_it000 1 
    317     set_namelist namelist_cfg nn_itend 150 
    318     set_namelist namelist_cfg nn_stock 75 
    319     set_namelist namelist_cfg ln_clobber .true. 
    320     set_namelist namelist_cfg ln_read_cfg .true. 
    321     set_namelist namelist_cfg ln_linssh .false. 
    322     set_namelist namelist_cfg ln_icebergs .true. 
    323     set_namelist namelist_cfg nn_fwb 0 
    324     set_namelist namelist_cfg jpni 2 
    325     set_namelist namelist_cfg jpnj 2 
    326     set_namelist namelist_cfg jpnij 4 
    327     if [ ${USING_MPMD} == "yes" ] ; then 
    328        set_xio_using_server iodef.xml true 
    329     else 
    330        set_xio_using_server iodef.xml false 
    331     fi 
    332     cd ${SETTE_DIR} 
    333     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    334  
    335     cd ${SETTE_DIR} 
    336     export TEST_NAME="SHORT" 
    337     . ./prepare_exe_dir.sh 
    338     cd ${EXE_DIR} 
    339     set_namelist namelist_cfg cn_exp \"O2L3_SHORT\" 
    340     set_namelist namelist_cfg nn_it000 76 
    341     set_namelist namelist_cfg nn_itend 150 
    342     set_namelist namelist_cfg nn_stock 75 
    343     set_namelist namelist_cfg ln_rstart .true. 
    344     set_namelist namelist_cfg nn_rstctl 2 
    345     set_namelist namelist_cfg ln_clobber .true. 
    346     set_namelist namelist_cfg ln_read_cfg .true. 
    347     set_namelist namelist_cfg ln_linssh .false. 
    348     set_namelist namelist_cfg ln_icebergs .true. 
    349     set_namelist namelist_cfg nn_fwb 0 
    350     set_namelist namelist_cfg jpni 2 
    351     set_namelist namelist_cfg jpnj 2 
    352     set_namelist namelist_cfg jpnij 4 
    353     set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 
    354     set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" 
    355     for (( i=1; i<=$NPROC; i++)) ; do 
    356         L_NPROC=$(( $i - 1 )) 
    357         L_NPROC=`printf "%04d\n" ${L_NPROC}` 
    358         ln -sf ../LONG/O2L3_LONG_00000075_restart_${L_NPROC}.nc . 
    359         ln -sf ../LONG/O2L3_LONG_00000075_restart_ice_${L_NPROC}.nc . 
    360         ln -sf ../LONG/O2L3_LONG_icebergs_00000075_restart_${L_NPROC}.nc O2L3_LONG_00000075_restart_icebergs_${L_NPROC}.nc 
    361     done 
    362     if [ ${USING_MPMD} == "yes" ] ; then 
    363        set_xio_using_server iodef.xml true 
    364     else 
    365        set_xio_using_server iodef.xml false 
    366     fi 
    367     cd ${SETTE_DIR} 
    368     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    369     cd ${SETTE_DIR} 
    370     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    371 fi 
    372  
    373 if [ ${config} -eq 4 ] ;  then 
    374     ## Reproducibility tests for ORCA2_LIM3 
    375     export TEST_NAME="REPRO_8_4" 
    376     cd ${CONFIG_DIR} 
    377     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3_32 -r ORCA2_LIM3 -j 8 del_key ${DEL_KEYS} 
    378     cd ${SETTE_DIR} 
    379     . ./param.cfg 
    380     . ./all_functions.sh 
    381     . ./prepare_exe_dir.sh 
    382     JOB_FILE=${EXE_DIR}/run_job.sh 
    383     NPROC=32 
    384     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    385     cd ${EXE_DIR} 
    386     set_namelist namelist_cfg nn_it000 1 
    387     set_namelist namelist_cfg nn_itend 75 
    388     set_namelist namelist_cfg nn_fwb 0 
    389     set_namelist namelist_cfg ln_ctl .false. 
    390     set_namelist namelist_cfg ln_clobber .true. 
    391     set_namelist namelist_cfg ln_read_cfg .true. 
    392     set_namelist namelist_cfg ln_linssh .false. 
    393     set_namelist namelist_cfg ln_icebergs .true. 
    394     set_namelist namelist_cfg jpni 8 
    395     set_namelist namelist_cfg jpnj 4 
    396     set_namelist namelist_cfg jpnij 32 
    397     if [ ${USING_MPMD} == "yes" ] ; then 
    398        set_xio_using_server iodef.xml true 
    399     else 
    400        set_xio_using_server iodef.xml false 
    401     fi 
    402     cd ${SETTE_DIR} 
    403     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    404     cd ${SETTE_DIR} 
    405     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    406  
    407  
    408     cd ${SETTE_DIR} 
    409     export TEST_NAME="REPRO_4_8" 
    410     . ./prepare_exe_dir.sh 
    411     JOB_FILE=${EXE_DIR}/run_job.sh 
    412     NPROC=32 
    413     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    414     cd ${EXE_DIR} 
    415     set_namelist namelist_cfg nn_it000 1 
    416     set_namelist namelist_cfg nn_itend 75 
    417     set_namelist namelist_cfg ln_clobber .true. 
    418     set_namelist namelist_cfg ln_read_cfg .true. 
    419     set_namelist namelist_cfg ln_linssh .false. 
    420     set_namelist namelist_cfg ln_icebergs .true. 
    421     set_namelist namelist_cfg nn_fwb 0 
    422     set_namelist namelist_cfg jpni 4 
    423     set_namelist namelist_cfg jpnj 8 
    424     set_namelist namelist_cfg jpnij 32 
    425     if [ ${USING_MPMD} == "yes" ] ; then 
    426        set_xio_using_server iodef.xml true 
    427     else 
    428        set_xio_using_server iodef.xml false 
    429     fi 
    430  
    431     cd ${SETTE_DIR} 
    432     . ./prepare_job.sh input_ORCA2_LIM3.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    433     cd ${SETTE_DIR} 
    434     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    435 fi 
    436  
    437 # TESTS FOR ORCA2_LIM3_PISCES CONFIGURATION 
    438 if [ ${config} -eq 5 ] ;  then 
    439302    ## Restartability tests for ORCA2_LIM3_PISCES 
    440303    export TEST_NAME="LONG" 
    441     cd ${CONFIG_DIR} 
     304    cd ${CONFIG_DIR0} 
    442305    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_LONG -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
    443306    cd ${SETTE_DIR} 
     
    493356    set_namelist namelist_cfg ln_read_cfg .true. 
    494357    set_namelist namelist_cfg ln_linssh .false. 
     358    set_namelist namelist_cfg ln_icebergs .true. 
    495359    set_namelist namelist_cfg nn_fwb 0 
    496360    set_namelist namelist_cfg jpni 4 
     
    521385        ln -sf ../LONG/O2L3P_LONG_00000075_restart_trc_${L_NPROC}.nc . 
    522386        ln -sf ../LONG/O2L3P_LONG_00000075_restart_ice_${L_NPROC}.nc . 
     387        ln -sf ../LONG/O2L3P_LONG_icebergs_00000075_restart_${L_NPROC}.nc O2L3P_LONG_00000075_restart_icebergs_${L_NPROC}.nc 
    523388    done 
    524389    if [ ${USING_MPMD} == "yes" ] ; then 
     
    533398fi 
    534399 
    535 if [ ${config} -eq 6 ] ;  then 
     400if [ ${config} -eq 4 ] ;  then 
    536401    ## Reproducibility tests for ORCA2_LIM3_PISCES 
    537402    export TEST_NAME="REPRO_4_8" 
    538     cd ${CONFIG_DIR} 
     403    cd ${CONFIG_DIR0} 
    539404    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_32 -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
    540405    cd ${SETTE_DIR} 
     
    553418    set_namelist namelist_cfg ln_read_cfg .true. 
    554419    set_namelist namelist_cfg ln_linssh .false. 
     420    set_namelist namelist_cfg ln_icebergs .true. 
    555421    set_namelist namelist_cfg jpni 4 
    556422    set_namelist namelist_cfg jpnj 8 
     
    591457    set_namelist namelist_cfg ln_clobber .true. 
    592458    set_namelist namelist_cfg ln_read_cfg .true. 
    593     set_namelist namelist_cfg ln_linssh .false. 
     459    set_namelist namelist_cfg ln_linssh .false. 
     460    set_namelist namelist_cfg ln_icebergs .true. 
    594461    set_namelist namelist_cfg nn_fwb 0 
    595462    set_namelist namelist_cfg jpni 8 
     
    622489 
    623490# TESTS FOR ORCA2_OFF_PISCES CONFIGURATION 
    624 if [ ${config} -eq 7 ] ;  then 
     491if [ ${config} -eq 5 ] ;  then 
    625492    ## Restartability tests for ORCA2_OFF_PISCES 
    626493    export TEST_NAME="LONG" 
    627     cd ${CONFIG_DIR} 
     494    cd ${CONFIG_DIR0} 
    628495    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
    629496    cd ${SETTE_DIR} 
     
    713580fi 
    714581 
    715 if [ ${config} -eq 8 ] ;  then 
     582if [ ${config} -eq 6 ] ;  then 
    716583    ## Reproducibility tests for ORCA2_OFF_PISCES 
    717584    export TEST_NAME="REPRO_4_8" 
    718     cd ${CONFIG_DIR} 
     585    cd ${CONFIG_DIR0} 
    719586    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_32 -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
    720587    cd ${SETTE_DIR} 
     
    801668 
    802669# TESTS FOR AMM12 CONFIGURATION 
    803 if [ ${config} -eq 9 ] ;  then 
     670if [ ${config} -eq 7 ] ;  then 
    804671    ## Restartability tests for AMM12 
    805672    export TEST_NAME="LONG" 
    806     cd ${CONFIG_DIR} 
     673    cd ${CONFIG_DIR0} 
    807674    . ./makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 add_key "key_tide" del_key ${DEL_KEYS} 
    808675    cd ${SETTE_DIR} 
     
    867734fi 
    868735 
    869 if [ ${config} -eq 10 ] ;  then 
     736if [ ${config} -eq 8 ] ;  then 
    870737## Reproducibility tests for AMM12 
    871738    export TEST_NAME="REPRO_8_4" 
    872     cd ${CONFIG_DIR} 
     739    cd ${CONFIG_DIR0} 
    873740    . ./makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 del_key ${DEL_KEYS} 
    874741    cd ${SETTE_DIR} 
     
    929796 
    930797# TESTS FOR ORCA2_SAS_LIM3 CONFIGURATION 
    931 if [ ${config} -eq 11 ] ;  then 
     798if [ ${config} -eq 9 ] ;  then 
    932799    ## Restartability tests for SAS 
    933800    export TEST_NAME="LONG" 
    934     cd ${CONFIG_DIR} 
     801    cd ${CONFIG_DIR0} 
    935802    . ./makenemo -m ${CMP_NAM} -n SAS_LONG -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
    936803    cd ${SETTE_DIR} 
     
    997864 
    998865# TESTS FOR ISOMIP CONFIGURATION 
    999 if [ ${config} -eq 12 ] ;  then 
     866if [ ${config} -eq 10 ] ;  then 
    1000867    ## Restartability tests for ISOMIP 
    1001868    export TEST_NAME="LONG" 
    1002     cd ${CONFIG_DIR} 
    1003     . ./makenemo -m ${CMP_NAM} -n ISOMIP_LONG -r ISOMIP -j 8 del_key ${DEL_KEYS} 
     869    cd ${CONFIG_DIR0} 
     870    . ./makenemo -m ${CMP_NAM} -n ISOMIP_LONG -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
    1004871    cd ${SETTE_DIR} 
    1005872    . ./param.cfg 
     
    1015882    set_namelist namelist_cfg nn_stock 48 
    1016883    set_namelist namelist_cfg ln_clobber .true. 
    1017     set_namelist namelist_cfg ln_read_cfg .true. 
    1018     set_namelist namelist_cfg ln_linssh .true. 
    1019     set_namelist namelist_cfg nn_fwb 0 
     884    set_namelist namelist_cfg ln_read_cfg .false. 
    1020885    set_namelist namelist_cfg jpni 4 
    1021886    set_namelist namelist_cfg jpnj 8 
     
    1040905    set_namelist namelist_cfg nn_rstctl 2 
    1041906    set_namelist namelist_cfg ln_clobber .true. 
    1042     set_namelist namelist_cfg ln_read_cfg .true. 
    1043     set_namelist namelist_cfg ln_linssh .true. 
    1044     set_namelist namelist_cfg nn_fwb 0 
     907    set_namelist namelist_cfg ln_read_cfg .false. 
    1045908    set_namelist namelist_cfg jpni 4 
    1046909    set_namelist namelist_cfg jpnj 8 
     
    1067930    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1068931fi 
    1069 if [ ${config} -eq 13 ] ;  then 
     932if [ ${config} -eq 11 ] ;  then 
    1070933    ## Reproducibility tests for ISOMIP 
    1071934    export TEST_NAME="REPRO_4_8" 
    1072     cd ${CONFIG_DIR} 
    1073     . ./makenemo -m ${CMP_NAM} -n ISOMIP_32 -r ISOMIP -j 8 del_key ${DEL_KEYS} 
     935    cd ${CONFIG_DIR0} 
     936    . ./makenemo -m ${CMP_NAM} -n ISOMIP_32 -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
    1074937    cd ${SETTE_DIR} 
    1075938    . ./param.cfg 
     
    1085948    set_namelist namelist_cfg ln_ctl .false. 
    1086949    set_namelist namelist_cfg ln_clobber .true. 
    1087     set_namelist namelist_cfg ln_read_cfg .true. 
    1088     set_namelist namelist_cfg ln_linssh .true. 
    1089     set_namelist namelist_cfg nn_fwb 0 
     950    set_namelist namelist_cfg ln_read_cfg .false. 
    1090951    set_namelist namelist_cfg jpni 4 
    1091952    set_namelist namelist_cfg jpnj 8 
     
    1113974    set_namelist namelist_cfg ln_ctl .false. 
    1114975    set_namelist namelist_cfg ln_clobber .true. 
    1115     set_namelist namelist_cfg ln_read_cfg .true. 
    1116     set_namelist namelist_cfg ln_linssh .true. 
    1117     set_namelist namelist_cfg nn_fwb 0 
     976    set_namelist namelist_cfg ln_read_cfg .false. 
    1118977    set_namelist namelist_cfg jpni 8 
    1119978    set_namelist namelist_cfg jpnj 4 
     
    1133992## Test assimilation interface code, OBS and ASM for reproducibility 
    1134993## Restartability not tested (ASM code not restartable while increments are being applied) 
    1135 if [ ${config} -eq 14 ] ; then 
    1136    ## Reproducibility tests for ORCA2_LIM_OBS 
     994if [ ${config} -eq 12 ] ; then 
     995   ## Reproducibility tests for ORCA2_LIM3_OBS 
    1137996    export TEST_NAME="REPRO_4_8" 
    1138     cd ${CONFIG_DIR} 
    1139     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3 -j 8 add_key "key_asminc" del_key ${DEL_KEYS} 
     997    cd ${CONFIG_DIR0} 
     998    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS -r ORCA2_LIM3_PISCES -j 8 add_key "key_asminc" del_key "key_top" 
    1140999    cd ${SETTE_DIR} 
    11411000    . ./param.cfg 
     
    11681027    set_namelist namelist_cfg ln_sshinc .true. 
    11691028    set_namelist namelist_cfg ln_asmiau .true. 
     1029    rm namelist_top_cfg 
     1030    rm namelist_top_ref 
     1031    rm namelist_pisces_cfg 
     1032    rm namelist_pisces_ref 
    11701033    if [ ${USING_MPMD} == "yes" ] ; then 
    11711034       set_xio_using_server iodef.xml true 
     
    12071070    set_namelist namelist_cfg ln_sshinc .true. 
    12081071    set_namelist namelist_cfg ln_asmiau .true. 
     1072    rm namelist_top_cfg 
     1073    rm namelist_top_ref 
     1074    rm namelist_pisces_cfg 
     1075    rm namelist_pisces_ref 
    12091076    if [ ${USING_MPMD} == "yes" ] ; then 
    12101077       set_xio_using_server iodef.xml true 
     
    12171084    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    12181085fi 
    1219 # TEST FOR ORCA2_LIM_AGRIF : simple test of running AGRIF (no restartability neither reproducibility tests) 
    1220 if [ ${config} -eq 15 ] ;  then 
    1221     ## ORCA2_LIM with Agulhas AGRIF zoom in MPI 
     1086# TEST FOR ORCA2_LIM3_AGRIF : simple test of running AGRIF (no restartability neither reproducibility tests) 
     1087if [ ${config} -eq 13 ] ;  then 
     1088    ## ORCA2_LIM3 with Agulhas AGRIF zoom in MPI 
    12221089    export TEST_NAME="SHORT" 
    1223     cd ${CONFIG_DIR} 
    1224     . ./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} 
     1090    cd ${CONFIG_DIR0} 
     1091    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key "key_top" 
    12251092    cd ${SETTE_DIR} 
    12261093    . ./param.cfg 
     
    12431110    set_namelist namelist_cfg jpnj 2 
    12441111    set_namelist namelist_cfg jpnij 2 
     1112    rm namelist_top_cfg 
     1113    rm namelist_top_ref 
     1114    rm namelist_pisces_cfg 
     1115    rm namelist_pisces_ref 
    12451116    set_namelist 1_namelist_cfg nn_it000 1 
    12461117    set_namelist 1_namelist_cfg nn_itend 150 
     
    12571128    fi 
    12581129    cd ${SETTE_DIR} 
    1259     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1130    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    12601131    cd ${SETTE_DIR} 
    12611132    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    12631134 
    12641135# test code corruption with AGRIF 
    1265 # Compile and run with or without AGRIF ORCA2_LIM 
    1266 if [ ${config} -eq 16 ] ;  then 
     1136# Compile and run with or without AGRIF ORCA2_LIM3 
     1137if [ ${config} -eq 14 ] ;  then 
    12671138    # First run same as 15 but without zoom 
    12681139    export TEST_NAME="SHORT_NOZOOM" 
    1269     cd ${CONFIG_DIR} 
    1270     . ./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} 
     1140    cd ${CONFIG_DIR0} 
     1141    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key "key_top" 
    12711142    cd ${SETTE_DIR} 
    12721143    . ./param.cfg 
     
    12891160    set_namelist namelist_cfg jpnj 2 
    12901161    set_namelist namelist_cfg jpnij 4 
     1162    rm namelist_top_cfg 
     1163    rm namelist_top_ref 
     1164    rm namelist_pisces_cfg 
     1165    rm namelist_pisces_ref 
    12911166#  
    12921167#   Set the number of fine grids to zero:     
     
    12991174    fi 
    13001175    cd ${SETTE_DIR} 
    1301     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1176    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    13021177    cd ${SETTE_DIR} 
    13031178    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    13041179 
    13051180    export TEST_NAME="SHORT_NOAGRIF" 
    1306     cd ${CONFIG_DIR} 
    1307     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM -j 8 del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1181    cd ${CONFIG_DIR0} 
     1182    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_2_2_NAG -r ORCA2_LIM3_PISCES -j 8 del_key "key_zdftmx" del_key "key_top" 
    13081183    cd ${SETTE_DIR} 
    13091184    . ./param.cfg 
     
    13261201    set_namelist namelist_cfg jpnj 2 
    13271202    set_namelist namelist_cfg jpnij 4 
    1328 # 
    1329     if [ ${USING_MPMD} == "yes" ] ; then 
    1330        set_xio_using_server iodef.xml true 
    1331     else 
    1332        set_xio_using_server iodef.xml false 
    1333     fi 
    1334     cd ${SETTE_DIR} 
    1335     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    1336     cd ${SETTE_DIR} 
    1337     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1338  
    1339 fi 
    1340  
    1341 ## Restartability tests for ORCA2_LIM_AGRIF  
    1342 if [ ${config} -eq 17 ] ;  then 
     1203    rm namelist_top_cfg 
     1204    rm namelist_top_ref 
     1205    rm namelist_pisces_cfg 
     1206    rm namelist_pisces_ref 
     1207# 
     1208    if [ ${USING_MPMD} == "yes" ] ; then 
     1209       set_xio_using_server iodef.xml true 
     1210    else 
     1211       set_xio_using_server iodef.xml false 
     1212    fi 
     1213    cd ${SETTE_DIR} 
     1214    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1215    cd ${SETTE_DIR} 
     1216    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1217 
     1218fi 
     1219 
     1220## Restartability tests for ORCA2_LIM3_AGRIF  
     1221if [ ${config} -eq 15 ] ;  then 
    13431222    export TEST_NAME="LONG" 
    1344     cd ${CONFIG_DIR} 
    1345     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1223    cd ${CONFIG_DIR0} 
     1224    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_LONG -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key "key_top" 
    13461225    cd ${SETTE_DIR} 
    13471226    . ./param.cfg 
     
    13751254    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    13761255    set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    1377 # 
    1378     if [ ${USING_MPMD} == "yes" ] ; then 
    1379        set_xio_using_server iodef.xml true 
    1380     else 
    1381        set_xio_using_server iodef.xml false 
    1382     fi 
    1383     cd ${SETTE_DIR} 
    1384     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1256    rm namelist_top_cfg 
     1257    rm namelist_top_ref 
     1258    rm namelist_pisces_cfg 
     1259    rm namelist_pisces_ref 
     1260# 
     1261    if [ ${USING_MPMD} == "yes" ] ; then 
     1262       set_xio_using_server iodef.xml true 
     1263    else 
     1264       set_xio_using_server iodef.xml false 
     1265    fi 
     1266    cd ${SETTE_DIR} 
     1267    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    13851268     
    13861269    cd ${SETTE_DIR} 
     
    14021285    set_namelist namelist_cfg jpni 2 
    14031286    set_namelist namelist_cfg jpnj 2 
    1404  
    14051287    set_namelist namelist_cfg jpnij 4 
    1406 #   set_namelist namelist_cfg nn_solv 2 
     1288    rm namelist_top_cfg 
     1289    rm namelist_top_ref 
     1290    rm namelist_pisces_cfg 
     1291    rm namelist_pisces_ref 
    14071292    set_namelist 1_namelist_cfg cn_exp \"O2LP_SHORT\" 
    14081293    set_namelist 1_namelist_cfg nn_it000 151 
     
    14181303    set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    14191304    set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
    1420  
    14211305    set_namelist 1_namelist_cfg cn_ocerst_in \"O2LP_LONG_00000150_restart\" 
    14221306 
     
    14341318    fi 
    14351319    cd ${SETTE_DIR} 
    1436     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    1437     cd ${SETTE_DIR} 
    1438     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1439 fi 
    1440  
    1441 ## Reproducibility tests for ORCA2_LIM_AGRIF 
    1442 if [ ${config} -eq 18 ] ;  then 
     1320    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1321    cd ${SETTE_DIR} 
     1322    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1323fi 
     1324 
     1325## Reproducibility tests for ORCA2_LIM3_AGRIF 
     1326if [ ${config} -eq 16 ] ;  then 
    14431327    export TEST_NAME="REPRO_4_4" 
    1444     cd ${CONFIG_DIR} 
    1445     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 
     1328    cd ${CONFIG_DIR0} 
     1329    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_16 -r ORCA2_LIM3_PISCES -j 8 add_key "key_agrif" del_key "key_zdftmx" del_key "key_top" 
    14461330    cd ${SETTE_DIR} 
    14471331    . ./param.cfg 
     
    14641348    set_namelist namelist_cfg jpnj 4 
    14651349    set_namelist namelist_cfg jpnij 16 
     1350    rm namelist_top_cfg 
     1351    rm namelist_top_ref 
     1352    rm namelist_pisces_cfg 
     1353    rm namelist_pisces_ref 
    14661354    set_namelist 1_namelist_cfg nn_it000 1 
    14671355    set_namelist 1_namelist_cfg nn_itend 150 
     
    14791367    fi 
    14801368    cd ${SETTE_DIR} 
    1481     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1369    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    14821370    cd ${SETTE_DIR} 
    14831371    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     
    15021390    set_namelist namelist_cfg jpnj 8 
    15031391    set_namelist namelist_cfg jpnij 16 
     1392    rm namelist_top_cfg 
     1393    rm namelist_top_ref 
     1394    rm namelist_pisces_cfg 
     1395    rm namelist_pisces_ref 
    15041396    set_namelist 1_namelist_cfg nn_it000 1 
    15051397    set_namelist 1_namelist_cfg nn_itend 150 
     
    15171409    fi 
    15181410    cd ${SETTE_DIR} 
    1519     . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
     1411    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} ${OMP_NTHR} 
    15201412    cd ${SETTE_DIR} 
    15211413    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
  • trunk/NEMOGCM/SETTE/sette_rpt

    r7646 r7715  
    2626 
    2727foreach pass (0 1 ) 
    28   if ( -d ./WGYRE_LONG ) then 
    29     set dorv = `ls -1rtd ./WGYRE_LONG/{$mach}/* | tail -1l ` 
    30     set dorv = $dorv:t 
    31     set f1o = ./WGYRE_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    32     set f1s = ./WGYRE_LONG/{$mach}/{$dorv}/LONG/solver.stat 
    33     set f2o = ./WGYRE_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    34     set f2s = ./WGYRE_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    35    
    36     set nl = `wc -l $f2s` 
    37     tail -$nl[1] $f1s > f1.tmp$$ 
    38     cmp -s f1.tmp$$ $f2s 
    39     if ( $status == 0 ) then 
    40       echo "GYRE        restartability  passed" 
    41     else 
    42       echo "GYRE        restartability  FAILED" 
     28  if ( -d ./WGYREPIS_LONG ) then 
     29    set dorv = `ls -1rtd ./WGYREPIS_LONG/{$mach}/* | tail -1l ` 
     30    set dorv = $dorv:t 
     31    set f1o = ./WGYREPIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
     32    set f1s = ./WGYREPIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
     33    set f2o = ./WGYREPIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
     34    set f2s = ./WGYREPIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
     35   
     36    set nl = `wc -l $f2s` 
     37    tail -$nl[1] $f1s > f1.tmp$$ 
     38    cmp -s f1.tmp$$ $f2s 
     39    if ( $status == 0 ) then 
     40      echo "GYRE_PISCES        restartability  passed" 
     41    else 
     42      echo "GYRE_PISCES        restartability  FAILED" 
    4343      if ( $pass == 1 ) then 
    4444        echo "<return> to view solver.stat differences" 
     
    182182    else 
    183183      echo "AMM12       restartability  FAILED" 
    184       if ( $pass == 1 ) then 
    185         echo "<return> to view solver.stat differences" 
    186         set y = $< 
    187         sdiff f1.tmp$$ $f2s 
    188         echo "<return> to view ocean.output differences" 
    189         set y = $< 
    190         sdiff $f1o $f2o | grep "|" 
    191         echo "<return> to continue" 
    192         set y = $< 
    193       endif 
    194     endif 
    195     rm f1.tmp$$ 
    196   endif 
    197   if ( -d ./WORCA2LIM3_LONG ) then 
    198     set dorv = `ls -1rtd ./WORCA2LIM3_LONG/{$mach}/* | tail -1l ` 
    199     set dorv = $dorv:t 
    200     set f1o = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    201     set f1s = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/LONG/solver.stat 
    202     set f2o = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    203     set f2s = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    204     set nl = `wc -l $f2s` 
    205     tail -$nl[1] $f1s > f1.tmp$$ 
    206     cmp -s f1.tmp$$ $f2s 
    207     if ( $status == 0 ) then 
    208       echo "ORCA2LIM3   restartability  passed" 
    209     else 
    210       echo "ORCA2LIM3   restartability  FAILED" 
    211184      if ( $pass == 1 ) then 
    212185        echo "<return> to view solver.stat differences" 
     
    260233NEXT1: 
    261234   
    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 
    269    
    270     cmp -s $f1s $f2s 
    271     if ( $status == 0 ) then 
    272       echo "GYRE        reproducibility passed" 
    273     else 
    274       echo "GYRE        reproducibility FAILED" 
     235  if ( -d ./WGYREPIS_32 ) then 
     236    set dorv = `ls -1rtd ./WGYREPIS_32/{$mach}/* | tail -1l ` 
     237    set dorv = $dorv:t 
     238    set f1o = ./WGYREPIS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     239    set f1s = ./WGYREPIS_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     240    set f2o = ./WGYREPIS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     241    set f2s = ./WGYREPIS_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
     242   
     243    cmp -s $f1s $f2s 
     244    if ( $status == 0 ) then 
     245      echo "GYRE_PISCES        reproducibility passed" 
     246    else 
     247      echo "GYRE_PISCES        reproducibility FAILED" 
    275248      if ( $pass == 1 ) then 
    276249        echo "<return> to view solver.stat differences" 
     
    412385  endif 
    413386 
    414   if ( -d ./WORCA2LIM3_16 ) then 
    415     set dorv = `ls -1rtd ./WORCA2LIM3_16/{$mach}/* | tail -1l ` 
    416     set dorv = $dorv:t 
    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 
    421  
    422     cmp -s $f1s $f2s 
    423     if ( $status == 0 ) then 
    424       echo "ORCA2LIM3   reproducibility passed" 
    425     else 
    426       echo "ORCA2LIM3   reproducibility FAILED" 
    427       if ( $pass == 1 ) then 
    428         echo "<return> to view solver.stat differences" 
    429         set y = $< 
    430         sdiff $f1s $f2s 
    431         echo "<return> to view ocean.output differences" 
    432         set y = $< 
    433         sdiff $f1o $f2o | grep "|" 
    434         echo "<return> to continue" 
    435         set y = $< 
    436       endif 
    437     endif 
    438   endif 
    439  
    440  
    441387  if ( -d ./WORCA2_LIM3_OBS ) then 
    442388    set dorv = `ls -1rtd ./WORCA2_LIM3_OBS/{$mach}/* | tail -1l ` 
  • trunk/NEMOGCM/SETTE/sette_rpt.sh

    r7646 r7715  
    214214# Restartability test 
    215215# 
    216  for restart_test in WGYRE_LONG WORCA2LIM3_LONG WORCA2LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WSAS_LONG WISOMIP_LONG WORCA2AGUL_LONG 
     216 for restart_test in WGYREPIS_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_32 WORCA2LIM3_32 WORCA2LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
     223 for repro_test in WGYREPIS_32 WORCA2LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 
    224224 do 
    225225   reprotest $NEMO_VALID $repro_test $pass 
Note: See TracChangeset for help on using the changeset viewer.