Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -24 +24 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
+   USE bdy_oce         ! ocean open boundary conditions
 
    IMPLICIT NONE
@@ -78 +79 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) :: zhke
       REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdu, ztrdv 
+      INTEGER  ::   jb                 ! dummy loop indices
+      INTEGER  ::   ii, ij, igrd, ib_bdy   ! local integers
+      INTEGER  ::   fu, fv
       !!----------------------------------------------------------------------
       !
@@ -98 +102 @@
       zhke(:,:,jpk) = 0._wp
       
+      IF (ln_bdy) THEN
+         ! 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 +165 @@
          !
       END SELECT
+
+      IF (ln_bdy) THEN
+         ! 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  ==!