Changeset 3033 for branches/2011/dev_CMCC/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2011-10-31T15:51:20+01:00 (13 years ago)

Author:

vichi

Message:

ticket #881. Step 3: Added changes from dev_r2855_CMCC4_con branch

File:

• branches/2011/dev_CMCC/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (4 diffs)

branches/2011/dev_CMCC/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -23 +23 @@
    !!       vor_mix  : mixed enstrophy/energy conserving (ln_dynvor_mix=T)
    !!       vor_een  : energy and enstrophy conserving   (ln_dynvor_een=T)
+   !!       vor_con  : BC consistent with analytical eqs.(ln_dynvor_con=T)
    !!   dyn_vor_init : set and control of the different vorticity option
    !!----------------------------------------------------------------------
@@ -46 +47 @@
    LOGICAL, PUBLIC ::   ln_dynvor_mix = .FALSE.   !: mixed scheme
    LOGICAL, PUBLIC ::   ln_dynvor_een = .FALSE.   !: energy and enstrophy conserving scheme
+   LOGICAL, PUBLIC ::   ln_dynvor_con = .FALSE.   !: consistency with flux form
 
    INTEGER ::   nvor = 0   ! type of vorticity trend used
@@ -685 +687 @@
       INTEGER ::   ioptio          ! local integer
       !!
-      NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een
+      NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een, ln_dynvor_con
       !!----------------------------------------------------------------------
 
@@ -700 +702 @@
          WRITE(numout,*) '           mixed enstrophy/energy conserving scheme   ln_dynvor_mix = ', ln_dynvor_mix
          WRITE(numout,*) '           enstrophy and energy conserving scheme     ln_dynvor_een = ', ln_dynvor_een
+         WRITE(numout,*) '           consistency with flux form                 ln_dynvor_con = ', ln_dynvor_con
       ENDIF