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

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

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/SHARED/namelist_top_ref

    r5836 r6140  
    1111!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    1212!----------------------------------------------------------------------- 
    13 &namtrc_run     !   run information 
     13&namtrc_run      !   run information 
    1414!----------------------------------------------------------------------- 
    1515   nn_dttrc      =  1        !  time step frequency for passive sn_tracers 
    1616   nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs 
    17    ln_top_euler  = .false.    !  use Euler time-stepping for TOP 
     17   ln_top_euler  = .false.   !  use Euler time-stepping for TOP 
    1818   ln_rsttr      = .false.   !  start from a restart file (T) or not (F) 
    1919   nn_rsttr      =   0       !  restart control = 0 initial time step is not compared to the restart file value 
    20                            !                  = 1 do not use the value in the restart file 
    21                            !                  = 2 calendar parameters read in the restart file 
     20                             !                  = 1 do not use the value in the restart file 
     21                             !                  = 2 calendar parameters read in the restart file 
    2222   cn_trcrst_in  = "restart_trc"   !  suffix of pass. sn_tracer restart name (input) 
    2323   cn_trcrst_indir = "."           !  directory from which to read input passive tracer restarts 
    … …  
    2626/ 
    2727!----------------------------------------------------------------------- 
    28 &namtrc     !   tracers definition 
     28&namtrc          !   tracers definition 
    2929!----------------------------------------------------------------------- 
    3030   ln_trcdta     =   .true.  !  Initialisation from data input file (T) or not (F) 
    … …  
    3535&namtrc_dta      !    Initialisation from data input file 
    3636!----------------------------------------------------------------------- 
    37 ! 
    38    cn_dir        =  './'      !  root directory for the location of the data files 
     37   cn_dir        =  './'     !  root directory for the location of the data files 
    3938/ 
    4039!----------------------------------------------------------------------- 
    41 &namtrc_adv    !   advection scheme for passive tracer  
     40&namtrc_adv      !   advection scheme for passive tracer  
    4241!----------------------------------------------------------------------- 
    4342   ln_trcadv_cen =  .false.  !  2nd order centered scheme 
    … …  
    5655/ 
    5756!----------------------------------------------------------------------- 
    58 &namtrc_ldf    !   lateral diffusion scheme for passive tracer  
     57&namtrc_ldf      !   lateral diffusion scheme for passive tracer  
    5958!----------------------------------------------------------------------- 
    60 !                          !  Type of the operator:   
    61    ln_trcldf_lap   =  .true.   !    laplacian operator 
    62    ln_trcldf_blp   =  .false.  !  bilaplacian operator 
    63    !                       !  Direction of action: 
    64    ln_trcldf_lev   =  .false.  !  iso-level 
    65    ln_trcldf_hor   =  .false.  !  horizontal (geopotential) 
    66    ln_trcldf_iso   =  .true.   !  iso-neutral (standard operator) 
    67    ln_trcldf_triad =  .false.  !  iso-neutral (triad    operator) 
    68    !                       !  Coefficient  
    69    rn_ahtrc_0      = 2000.     !  lateral eddy diffusivity   (lap. operator) [m2/s] 
    70    rn_bhtrc_0      = 1.e+12    !  lateral eddy diffusivity (bilap. operator) [m4/s] 
     59!                            !  Type of the operator:   
     60   ln_trcldf_lap   =  .true.     !    laplacian operator 
     61   ln_trcldf_blp   =  .false.    !  bilaplacian operator 
     62   !                         !  Direction of action: 
     63   ln_trcldf_lev   =  .false.    !  iso-level 
     64   ln_trcldf_hor   =  .false.    !  horizontal (geopotential) 
     65   ln_trcldf_iso   =  .true.     !  iso-neutral (standard operator) 
     66   ln_trcldf_triad =  .false.    !  iso-neutral (triad    operator) 
     67   !                         !  Coefficient  
     68   rn_ahtrc_0      = 2000.       !  lateral eddy diffusivity   (lap. operator) [m2/s] 
     69   rn_bhtrc_0      = 1.e+12      !  lateral eddy diffusivity (bilap. operator) [m4/s] 
    7170/ 
    7271!----------------------------------------------------------------------- 
    73 &namtrc_zdf        !   vertical physics 
     72&namtrc_zdf      !   vertical physics 
    7473!----------------------------------------------------------------------- 
    75    ln_trczdf_exp   =  .false.  !  split explicit (T) or implicit (F) time stepping 
    76    nn_trczdf_exp   =   3       !  number of sub-timestep for ln_trczdfexp=T 
     74   ln_trczdf_exp =  .false.  !  split explicit (T) or implicit (F) time stepping 
     75   nn_trczdf_exp =   3       !  number of sub-timestep for ln_trczdfexp=T 
    7776/ 
    7877!----------------------------------------------------------------------- 
    79 &namtrc_rad        !  treatment of negative concentrations  
     78&namtrc_rad      !  treatment of negative concentrations  
    8079!----------------------------------------------------------------------- 
    81    ln_trcrad   =  .true.  !  artificially correct negative concentrations (T) or not (F) 
     80   ln_trcrad     =  .true.   !  artificially correct negative concentrations (T) or not (F) 
    8281/ 
    8382!----------------------------------------------------------------------- 
    84 &namtrc_dmp    !   passive tracer newtonian damping    
     83&namtrc_dmp      !   passive tracer newtonian damping    
    8584!----------------------------------------------------------------------- 
    86    nn_zdmp_tr  =    1      !  vertical   shape =0    damping throughout the water column 
    87                            !                   =1 no damping in the mixing layer (kz  criteria) 
    88                            !                   =2 no damping in the mixed  layer (rho crieria) 
    89    cn_resto_tr  = 'resto_tr.nc'    !  create a damping.coeff NetCDF file (=1) or not (=0) 
     85   nn_zdmp_tr    =    1      !  vertical   shape =0    damping throughout the water column 
     86                             !                   =1 no damping in the mixing layer (kz  criteria) 
     87                             !                   =2 no damping in the mixed  layer (rho crieria) 
     88   cn_resto_tr   = 'resto_tr.nc'    !  create a damping.coeff NetCDF file (=1) or not (=0) 
    9089/ 
    9190!----------------------------------------------------------------------- 
    92 &namtrc_ice       !    Representation of sea ice growth & melt effects 
     91&namtrc_ice      !    Representation of sea ice growth & melt effects 
    9392!----------------------------------------------------------------------- 
    94    nn_ice_tr   =  -1        !  tracer concentration in sea ice  
    95                            !    =-1 (no vvl: identical cc in ice and ocean / vvl: cc_ice = 0) 
    96                            !    = 0 (no vvl: cc_ice = zero / vvl: cc_ice = ) 
    97                            !    = 1 prescribed to a namelist value (implemented in pisces only) 
     93   nn_ice_tr     =  -1       !  tracer concentration in sea ice  
     94                             !    =-1 (no vvl: identical cc in ice and ocean / vvl: cc_ice = 0) 
     95                             !    = 0 (no vvl: cc_ice = zero / vvl: cc_ice = ) 
     96                             !    = 1 prescribed to a namelist value (implemented in pisces only) 
    9897/ 
    9998!----------------------------------------------------------------------- 
    100 &namtrc_trd       !   diagnostics on tracer trends        ('key_trdtrc') 
    101 !                          or mixed-layer trends          ('key_trdmld_trc') 
     99&namtrc_trd      !   diagnostics on tracer trends                       ('key_trdtrc') 
     100!                          or mixed-layer trends                        ('key_trdmld_trc') 
    102101!---------------------------------------------------------------------- 
    103    nn_trd_trc  =  5475      !  time step frequency and tracers trends 
    104    nn_ctls_trc =   0        !  control surface type in mixed-layer trends (0,1 or n<jpk) 
    105    rn_ucf_trc  =   1        !  unit conversion factor (=1 -> /seconds ; =86400. -> /day) 
    106    ln_trdmld_trc_restart = .false.  !  restart for ML diagnostics 
     102   nn_trd_trc    =  5475     !  time step frequency and tracers trends 
     103   nn_ctls_trc   =   0       !  control surface type in mixed-layer trends (0,1 or n<jpk) 
     104   rn_ucf_trc    =   1       !  unit conversion factor (=1 -> /seconds ; =86400. -> /day) 
     105   ln_trdmld_trc_restart = .false. !  restart for ML diagnostics 
    107106   ln_trdmld_trc_instant = .true.  !  flag to diagnose trends of instantantaneous or mean ML T/S 
    108    ln_trdtrc(1)  =  .true. 
    109    ln_trdtrc(2)  =  .true. 
    110    ln_trdtrc(23) =   .true. 
     107   ln_trdtrc( 1) = .true. 
     108   ln_trdtrc( 2) = .true. 
     109   ln_trdtrc(23) = .true. 
    111110/ 
    112111!----------------------------------------------------------------------- 
    113 &namtrc_dia       !   parameters for passive tracer additional diagnostics 
     112&namtrc_dia      !   parameters for passive tracer additional diagnostics 
    114113!---------------------------------------------------------------------- 
    115114   ln_diatrc     =  .true.   !  save additional diag. (T) or not (F) 
    116115   ln_diabio     =  .true.   !  output biological trends 
    117116   nn_writedia   =  5475     !  time step frequency for diagnostics 
    118    nn_writebio   =    10     !: frequency of biological outputs 
     117   nn_writebio   =    10     !  frequency of biological outputs 
    119118/ 
    120119!---------------------------------------------------------------------- 
    121 ! namtrc_bc       !   data for boundary conditions 
     120&namtrc_bc       !   data for boundary conditions 
    122121!----------------------------------------------------------------------- 
    123 &namtrc_bc 
    124 ! 
    125    cn_dir        =  './'      !  root directory for the location of the data files 
     122   cn_dir_sbc    =  './'     !  root directory for the location of SURFACE data files 
     123   cn_dir_cbc    =  './'     !  root directory for the location of COASTAL data files 
     124   cn_dir_obc    =  './'     !  root directory for the location of OPEN data files 
    126125/ 
     126!---------------------------------------------------------------------- 
     127&namtrc_bdy      !   Setup of tracer boundary conditions 
     128!----------------------------------------------------------------------- 
     129   cn_trc_dflt   = 'neumann' !  OBC applied by default to all tracers 
     130   cn_trc        = 'none'    !  Boundary conditions used for tracers with data files (selected in namtrc) 
     131 
     132   nn_trcdmp_bdy = 0         !  Use damping timescales defined in nambdy of namelist 
     133                             !  = 0 NO damping of tracers at open boudaries 
     134                             !  = 1 Only for tracers forced with external data 
     135                             !  = 2 Damping applied to all tracers 
     136/ 
Note: See TracChangeset for help on using the changeset viewer.