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/DOC/TexFiles/Namelist/namdyn_spg – 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/DOC/TexFiles/Namelist/namdyn_spg

    r3294 r6140  
    11!----------------------------------------------------------------------- 
    2 !namdyn_spg    !   surface pressure gradient   (CPP key only) 
     2&namdyn_spg    !   surface pressure gradient                            (default: NO) 
    33!----------------------------------------------------------------------- 
    4 !                          !  explicit free surface                     ("key_dynspg_exp") 
    5 !                          !  filtered free surface                     ("key_dynspg_flt") 
    6 !                          !  split-explicit free surface               ("key_dynspg_ts") 
     4   ln_dynspg_exp  = .false.   ! explicit free surface 
     5   ln_dynspg_ts   = .false.   ! split-explicit free surface 
     6      ln_bt_fw      = .true.     ! Forward integration of barotropic Eqs. 
     7      ln_bt_av      = .true.     ! Time filtering of barotropic variables 
     8         nn_bt_flt     = 1          ! Time filter choice  = 0 None 
     9         !                          !                     = 1 Boxcar over   nn_baro sub-steps 
     10         !                          !                     = 2 Boxcar over 2*nn_baro  "    " 
     11      ln_bt_auto    = .true.     ! Number of sub-step defined from: 
     12         rn_bt_cmax   =  0.8        ! =T : the Maximum Courant Number allowed 
     13         nn_baro      = 30          ! =F : the number of sub-step in rn_rdt seconds 
     14/ 
Note: See TracChangeset for help on using the changeset viewer.