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

source: trunk/DOC/TexFiles/Namelist/namdyn_vor @ 6280

Last change on this file since 6280 was 6140, checked in by timgraham, 9 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: 675 bytes
Line 
1!-----------------------------------------------------------------------
2&namdyn_vor    !   option of physics/algorithm                          (default: NO)
3!-----------------------------------------------------------------------
4   ln_dynvor_ene = .false. !  enstrophy conserving scheme
5   ln_dynvor_ens = .false. !  energy conserving scheme
6   ln_dynvor_mix = .false. !  mixed scheme
7   ln_dynvor_een = .false. !  energy & enstrophy scheme
8      nn_een_e3f = 1          ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)
9   ln_dynvor_msk = .false. !  vorticity multiplied by fmask (=T) or not (=F) (all vorticity schemes)  ! PLEASE DO NOT USE
10/
Note: See TracBrowser for help on using the repository browser.