Changeset 2973

Timestamp:

2011-10-21T16:09:52+02:00 (13 years ago)

Author:

vichi

Message:

Modifcation of fmask for momentum advection

The modification is activated by namelist variable ln_vor_con. When an f
point is surrounded by three sea and one land T points, it ensures the
consistency of vorticity, energy and mixed momentum advection schemes with
continous equations.

Location:

branches/2011/dev_r2855_CMCC4_con

Files:

• DOC/TexFiles/Chapters/Chap_DYN.tex (modified) (1 diff)
• DOC/TexFiles/Namelist/namdyn_vor (modified) (1 diff)
• NEMOGCM/CONFIG/GYRE/EXP00/namelist (modified) (1 diff)
• NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist (modified) (1 diff)
• NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist (modified) (1 diff)
• NEMOGCM/CONFIG/POMME/EXP00/namelist (modified) (1 diff)
• NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (2 diffs)
• NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (4 diffs)

branches/2011/dev_r2855_CMCC4_con/DOC/TexFiles/Chapters/Chap_DYN.tex

@@ -189 +189 @@
 the relative vorticity term and horizontal kinetic energy for the planetary vorticity 
 term (MIX scheme) ; or conserving both the potential enstrophy of horizontally non-divergent 
-flow and horizontal kinetic energy (ENE scheme) (see  Appendix~\ref{Apdx_C_vor_zad}). 
+flow and horizontal kinetic energy (EEN scheme) (see  Appendix~\ref{Apdx_C_vor_zad}). In the 
+case of ENS, ENE or MIX schemes the land sea mask may be slightly modified to ensure the 
+consistency of vorticity term with analytical equations (\textit{ln\_dynvor\_con}=true).
 The vorticity terms are all computed in dedicated routines that can be found in 
 the \mdl{dynvor} module.

branches/2011/dev_r2855_CMCC4_con/DOC/TexFiles/Namelist/namdyn_vor

@@ -6 +6 @@
    ln_dynvor_mix = .false. !  mixed scheme               
    ln_dynvor_een = .true.  !  energy & enstrophy scheme  
+   ln_dynvor_con = .false. !  consistency of BC with analytical eqs.
 /

branches/2011/dev_r2855_CMCC4_con/NEMOGCM/CONFIG/GYRE/EXP00/namelist

@@ -521 +521 @@
    ln_dynvor_mix = .false. !  mixed scheme               
    ln_dynvor_een = .false. !  energy & enstrophy scheme  
+   ln_dynvor_con = .false. !  consistency of BC with analytical eqs.
 /
 !-----------------------------------------------------------------------

branches/2011/dev_r2855_CMCC4_con/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

@@ -521 +521 @@
    ln_dynvor_mix = .false. !  mixed scheme               
    ln_dynvor_een = .true.  !  energy & enstrophy scheme  
+   ln_dynvor_con = .false. !  consistency of BC with analytical eqs.
 /
 !-----------------------------------------------------------------------

branches/2011/dev_r2855_CMCC4_con/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

@@ -522 +522 @@
    ln_dynvor_mix = .false. !  mixed scheme               
    ln_dynvor_een = .true.  !  energy & enstrophy scheme  
+   ln_dynvor_con = .false. !  consistency of BC with analytical eqs.
 /
 !-----------------------------------------------------------------------

branches/2011/dev_r2855_CMCC4_con/NEMOGCM/CONFIG/POMME/EXP00/namelist

@@ -521 +521 @@
    ln_dynvor_mix = .false. !  mixed scheme               
    ln_dynvor_een = .true.  !  energy & enstrophy scheme  
+   ln_dynvor_con = .false. !  consistency of BC with analytical eqs.
 /
 !-----------------------------------------------------------------------

branches/2011/dev_r2855_CMCC4_con/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -26 +26 @@
    USE dom_oce         ! ocean space and time domain
    USE obc_oce         ! ocean open boundary conditions
+   USE dynvor          ! vorticity term
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -390 +391 @@
       CALL lbc_lnk( fmask, 'F', 1._wp )      ! Lateral boundary conditions on fmask
 
+
+      ! If energy, enstrophy or mixed advection of momentum in vector form change the value for masks
+      ! at angles with three ocean points and one land point
+       IF( ln_dynvor_con .OR. ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) THEN
+        DO jj = 2, jpjm1
+          DO ji = 2, jpim1
+          IF( tmask(ji,jj,jk)+tmask(ji+1,jj,jk)+tmask(ji,jj+1,jk)+tmask(ji+1,jj+1,jk) == 3._wp ) THEN
+                  fmask(ji,jj,jk) = 1._wp
+           ENDIF
+          END DO
+        END DO
+       ENDIF
+
             
       IF( nprint == 1 .AND. lwp ) THEN      ! Control print

branches/2011/dev_r2855_CMCC4_con/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