Changeset 11044 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

Timestamp:

2019-05-23T17:13:38+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : missing part of [11024], see #2285

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

@@ -256 +256 @@
       !! ** Purpose : Duplicate sea level across open boundaries
       !!
-      !! ** Method  : - take the average of free ocean neighbours
-      !!
-      !!      ___   !      _|    !   |_____|   !   ___|    !   __|x o   !  ___|  
-      !!   __|x     !   __|x o   !      x      !     x o   !      o     !      x o
-      !!      o     !      o     !      o      !     o     !            !      o 
-      !!                                
-      !!            (special treatments)
-      !!         !   |_   _|     ! |               
-      !!         !     |_|       ! |x o    
-      !!         !    o x o      ! |x_x_ 
-      !!         !      o      
-      !!----------------------------------------------------------------------
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) ::   zssh ! Sea level
-      !!
-      INTEGER  ::   ib_bdy, ib, igrd                        ! local integers
-      INTEGER  ::   ii, ij, zcoef, zcoef1, zcoef2, ip, jp   !   "       "
-      INTEGER  ::   flagu, flagv                            ! short cuts
-      REAL(wp) ::   zr_3
-      !!----------------------------------------------------------------------
-      igrd = 1                       ! Everything is at T-points here
-      zr_3 = 1. / 3.
-      !
+      !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(jpi,jpj,1), INTENT(inout) ::   zssh ! Sea level, need 3 dimensions to be used by bdy_nmn
+      !!
+      INTEGER  ::   ib_bdy          ! bdy index
+      !!----------------------------------------------------------------------
       DO ib_bdy = 1, nb_bdy
-         DO ib = 1, idx_bdy(ib_bdy)%nblenrim(igrd)
-            ii = idx_bdy(ib_bdy)%nbi(ib,igrd)
-            ij = idx_bdy(ib_bdy)%nbj(ib,igrd)
-            SELECT CASE( idx_bdy(ib_bdy)%ntreat(ib,igrd) )
-               CASE( 0 )
-                  flagu = NINT( idx_bdy(ib_bdy)%flagu(ib,igrd) )
-                  flagv = NINT( idx_bdy(ib_bdy)%flagv(ib,igrd) )
-                  IF( flagu == 0 .OR. flagv == 0 )   THEN    ! linear bdy   o
-                     zssh(ii,ij) = zssh(ii+flagu,ij+flagv)   !           ___x___ 
-                  ELSE   !   ___  o
-                         !      | x o
-                     zssh(ii,ij) = ( zssh(ii+flagu,ij) + zssh(ii,ij+flagv) ) * 0.5
-                  END IF
-               !               !              !     _____     !     _____     
-               !  1 |   o      !  2  o   |    !  3 | x        !  4     x |    
-               !    |_x_ _     !    _ _x_|    !    |   o      !      o   | 
-               CASE( 1 )   ;   zssh(ii,ij) = zssh(ii+1,ij+1)
-               CASE( 2 )   ;   zssh(ii,ij) = zssh(ii-1,ij+1)
-               CASE( 3 )   ;   zssh(ii,ij) = zssh(ii+1,ij-1)
-               CASE( 4 )   ;   zssh(ii,ij) = zssh(ii-1,ij-1)
-               !    |_  o      !        o  _|  !     ¨¨|_|¨¨   !       o         
-               !  5  _| x o    !  6   o x |_   !  7   o x o    ! 8   o x o       
-               !    |   o      !        o   |  !        o      !    __|¨|__      
-               CASE( 5 )   ;   zssh(ii,ij) = ( zssh(ii  ,ij+1) + zssh(ii+1,ij  ) + zssh(ii  ,ij-1) ) * zr_3
-               CASE( 6 )   ;   zssh(ii,ij) = ( zssh(ii  ,ij+1) + zssh(ii-1,ij  ) + zssh(ii  ,ij-1) ) * zr_3
-               CASE( 7 )   ;   zssh(ii,ij) = ( zssh(ii-1,ij  ) + zssh(ii  ,ij-1) + zssh(ii+1,ij  ) ) * zr_3
-               CASE( 8 )   ;   zssh(ii,ij) = ( zssh(ii-1,ij  ) + zssh(ii  ,ij+1) + zssh(ii+1,ij  ) ) * zr_3
-            END SELECT
-         END DO
-
-         ! Boundary points should be updated
-         CALL lbc_bdy_lnk( 'bdydyn2d', zssh(:,:), 'T', 1., ib_bdy )
-      END DO
-
+         CALL bdy_nmn( idx_bdy(ib_bdy), 1, zssh )   ! zssh is masked
+         CALL lbc_bdy_lnk( 'bdydyn2d', zssh(:,:,1), 'T', 1., ib_bdy )
+      END DO
+      !
    END SUBROUTINE bdy_ssh