Changeset 3084 for branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO

Timestamp:

2011-11-14T13:07:57+01:00 (13 years ago)

Author:

cetlod

Message:

dev_LOCEAN_CMCC_2011: add in changes CMCC devlopments into the new branch

Location:

branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asminc.F90 (modified) (6 diffs)
• DOM/dommsk.F90 (modified) (2 diffs)
• DYN/dynvor.F90 (modified) (4 diffs)

branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -25 +25 @@
    USE oce              ! Dynamics and active tracers defined in memory
    USE divcur           ! Horizontal divergence and relative vorticity
+   USE ldfdyn_oce       ! ocean dynamics: lateral physics
    USE eosbn2           ! Equation of state - in situ and potential density
    USE zpshde           ! Partial step : Horizontal Derivative
@@ -55 +56 @@
    LOGICAL, PUBLIC :: ln_sshinc = .FALSE. !: No sea surface height assimilation increment
    LOGICAL, PUBLIC :: ln_salfix = .FALSE. !: Apply minimum salinity check
+   INTEGER, PUBLIC ::   ndivdmp = 0       !: Apply divergence damping filter ndivdmp times
 
    REAL(wp), PUBLIC, DIMENSION(:,:,:), ALLOCATABLE ::   t_bkg   , s_bkg      !: Background temperature and salinity
@@ -76 +78 @@
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ssh_bkg, ssh_bkginc   ! Background sea surface height and its increment
 
+   !! * Substitutions
+#  include "domzgr_substitute.h90"
+#  include "ldfdyn_substitute.h90"
+#  include "vectopt_loop_substitute.h90"
+
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
@@ -93 +100 @@
       !! ** Action  : 
       !!----------------------------------------------------------------------
+      !!
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, wrk_2d_1
+      USE wrk_nemo, ONLY: hdiv => wrk_2d_1  ! Horizontal divergence
+      !!
+      INTEGER :: ji,jj,jk
       INTEGER :: jt
       INTEGER :: imid
@@ -116 +128 @@
          &                 ln_asmdin, ln_asmiau,                           &
          &                 nitbkg, nitdin, nitiaustr, nitiaufin, niaufn,   &
-         &                 nittrjfrq, ln_salfix, salfixmin
+         &                 nittrjfrq, ln_salfix, salfixmin,                &
+         &                 ndivdmp
       !!----------------------------------------------------------------------
 
@@ -420 +433 @@
 
       !-----------------------------------------------------------------------
+      ! Apply divergence damping filter
+      !-----------------------------------------------------------------------
+
+
+      IF ( ln_dyninc .AND. ndivdmp.gt.0 ) THEN
+
+       IF( wrk_in_use( 2, 1) ) THEN
+         CALL ctl_stop('asm_inc_init : requested workspace for divergence unavailable.')
+       ENDIF
+
+
+       DO  jt = 1, ndivdmp
+
+           DO jk = 1, jpkm1
+
+                  hdiv(:,:) = 0._wp
+
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  hdiv(ji,jj) =   &
+                     (  e2u(ji  ,jj)*fse3u(ji  ,jj,jk) * u_bkginc(ji  ,jj,jk)       &
+                      - e2u(ji-1,jj)*fse3u(ji-1,jj,jk) * u_bkginc(ji-1,jj,jk)       &
+                      + e1v(ji,jj  )*fse3v(ji,jj  ,jk) * v_bkginc(ji,jj  ,jk)       &
+                      - e1v(ji,jj-1)*fse3v(ji,jj-1,jk) * v_bkginc(ji,jj-1,jk)  )    &
+                      / ( e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) )
+               END DO
+            END DO
+
+            CALL lbc_lnk( hdiv, 'T', 1. )   ! lateral boundary cond. (no sign change)
+
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  u_bkginc(ji,jj,jk) = u_bkginc(ji,jj,jk) + 0.2 * ( e1t(ji+1,jj)*e2t(ji+1,jj) * hdiv(ji+1,jj)   &
+                                                                  - e1t(ji  ,jj)*e2t(ji  ,jj) * hdiv(ji  ,jj) ) &
+                                                                / e1u(ji,jj) * umask(ji,jj,jk) 
+                  v_bkginc(ji,jj,jk) = v_bkginc(ji,jj,jk) + 0.2 * ( e1t(ji,jj+1)*e2t(ji,jj+1) * hdiv(ji,jj+1)   &
+                                                                  - e1t(ji,jj  )*e2t(ji,jj  ) * hdiv(ji,jj  ) ) &
+                                                                / e2v(ji,jj) * vmask(ji,jj,jk) 
+               END DO
+            END DO
+
+           END DO
+
+       END DO
+
+       IF( wrk_not_released( 2, 1) ) THEN
+         CALL ctl_stop('asm_inc_init : failed to release divergence')
+       ENDIF
+
+      ENDIF
+
+
+
+      !-----------------------------------------------------------------------
       ! Allocate and initialize the background state arrays
       !-----------------------------------------------------------------------

branches/2011/dev_LOCEAN_CMCC_2011/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_LOCEAN_CMCC_2011/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
@@ -692 +694 @@
       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
       !!----------------------------------------------------------------------
 
@@ -707 +709 @@
          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