Changeset 7029 for branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2016-10-14T11:10:43+02:00 (8 years ago)

Author:

jamesharle

Message:

Adding ORCHESTRA configuration
Merging with branches/2016/dev_r5549_BDY_ZEROGRAD
Merging with branches/2016/dev_r5840_BDY_MSK
Merging with branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP

File:

• branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (4 diffs)

branches/NERC/dev_r6998_ORCHESTRA/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
@@ -78 +81 @@
       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
       !!----------------------------------------------------------------------
       !
@@ -98 +106 @@
       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  ==!
       !
@@ -133 +169 @@
          !
       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  ==!