Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -24 +24 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
-#if defined key_bdy 
-   USE bdy_oce         ! ocean open boundary conditions 
-#endif 
 
    IMPLICIT NONE
@@ -81 +78 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zhke
       REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdu, ztrdv 
-#if defined key_bdy 
-      INTEGER  ::   jb                 ! dummy loop indices 
-      INTEGER  ::   ii, ij, igrd, ib_bdy   ! local integers 
-      INTEGER  ::   fu, fv 
-#endif 
       !!----------------------------------------------------------------------
       !
@@ -105 +97 @@
       
       zhke(:,:,jpk) = 0._wp
-
-#if defined key_bdy 
-      ! Maria Luneva & Fred Wobus: July-2016 
-      ! compensate for lack of turbulent kinetic energy on liquid bdy points 
-      DO ib_bdy = 1, nb_bdy 
-         IF( cn_dyn3d(ib_bdy) /= 'none' ) THEN 
-            igrd = 2           ! Copying normal velocity into points outside bdy 
-            DO jb = 1, idx_bdy(ib_bdy)%nblenrim(igrd) 
-               DO jk = 1, jpkm1 
-                  ii   = idx_bdy(ib_bdy)%nbi(jb,igrd) 
-                  ij   = idx_bdy(ib_bdy)%nbj(jb,igrd) 
-                  fu   = NINT( idx_bdy(ib_bdy)%flagu(jb,igrd) ) 
-                  un(ii-fu,ij,jk) = un(ii,ij,jk) * umask(ii,ij,jk) 
-               END DO 
-            END DO 
-            ! 
-            igrd = 3           ! Copying normal velocity into points outside bdy 
-            DO jb = 1, idx_bdy(ib_bdy)%nblenrim(igrd) 
-               DO jk = 1, jpkm1 
-                  ii   = idx_bdy(ib_bdy)%nbi(jb,igrd) 
-                  ij   = idx_bdy(ib_bdy)%nbj(jb,igrd) 
-                  fv   = NINT( idx_bdy(ib_bdy)%flagv(jb,igrd) ) 
-                  vn(ii,ij-fv,jk) = vn(ii,ij,jk) * vmask(ii,ij,jk) 
-               END DO 
-            END DO 
-         ENDIF 
-      ENDDO  
-#endif       
-
+      
       SELECT CASE ( kscheme )             !== Horizontal kinetic energy at T-point  ==!
       !
@@ -148 +112 @@
             END DO
          END DO
-         !
-         CALL lbc_lnk( zhke, 'T', 1. )
          !
       CASE ( nkeg_HW )                          !--  Hollingsworth scheme  --!
@@ -172 +134 @@
       END SELECT
       !
-
-#if defined key_bdy 
-      ! restore velocity masks at points outside boundary 
-      un(:,:,:) = un(:,:,:) * umask(:,:,:) 
-      vn(:,:,:) = vn(:,:,:) * vmask(:,:,:) 
-#endif  
-
       DO jk = 1, jpkm1                    !==  grad( KE ) added to the general momentum trends  ==!
          DO jj = 2, jpjm1