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/Namelists – NEMO

source: trunk/DOC/Namelists/nam_tide @ 7646

Last change on this file since 7646 was 7646, checked in by timgraham, 7 years ago

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