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.
nam_tide in trunk/DOC/TexFiles/Namelist – NEMO

source: trunk/DOC/TexFiles/Namelist/nam_tide @ 6140

Last change on this file since 6140 was 6140, checked in by timgraham, 8 years ago

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 size: 454 bytes
Line 
1!-----------------------------------------------------------------------
2&nam_tide      !   tide parameters                                      ("key_tide")
3!-----------------------------------------------------------------------
4   ln_tide_pot   = .true.   !  use tidal potential forcing
5   ln_tide_ramp  = .false.  !
6   rdttideramp   =    0.    !
7   clname(1)     = 'DUMMY'  !  name of constituent - all tidal components must be set in namelist_cfg
8/
Note: See TracBrowser for help on using the repository browser.