Changeset 6060 for branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_vor

Timestamp:

2015-12-16T10:25:22+01:00 (8 years ago)

Author:

timgraham

Message:

Merged dev_r5836_noc2_VVL_BY_DEFAULT into branch

File:

• branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_vor (modified) (1 diff)

branches/2015/dev_merge_2015/DOC/TexFiles/Namelist/namdyn_vor

@@ -1 +1 @@
 !-----------------------------------------------------------------------
-&namdyn_vor    !   option of physics/algorithm (not control by CPP keys)
+&namdyn_vor    !   option of physics/algorithm                          (default: NO)
 !-----------------------------------------------------------------------
    ln_dynvor_ene = .false. !  enstrophy conserving scheme
    ln_dynvor_ens = .false. !  energy conserving scheme
    ln_dynvor_mix = .false. !  mixed scheme
-   ln_dynvor_een = .true.  !  energy & enstrophy scheme
+   ln_dynvor_een = .false. !  energy & enstrophy scheme
+      nn_een_e3f = 1          ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)
+   ln_dynvor_msk = .false. !  vorticity multiplied by fmask (=T) or not (=F) (all vorticity schemes)  ! PLEASE DO NOT USE
 /