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/nambdy_tide – 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/nambdy_tide

    r4147 r6140  
    22&nambdy_tide     ! tidal forcing at open boundaries 
    33!----------------------------------------------------------------------- 
    4    filtide          = 'bdydta/amm12_bdytide_'         !  file name root of tidal forcing files 
    5    ln_bdytide_2ddta = .false. 
    6    ln_bdytide_conj  = .false. 
     4   filtide          = 'bdydta/amm12_bdytide_'   !  file name root of tidal forcing files 
     5   ln_bdytide_2ddta = .false.   ! 
     6   ln_bdytide_conj  = .false.   !  
    77/ 
Note: See TracChangeset for help on using the changeset viewer.