Changeset 9600 for NEMO/trunk

Timestamp:

2018-05-16T09:39:44+02:00 (6 years ago)

Author:

jamesharle

Message:

Correction for missing code handling bdytmask (see ticket #2084)

Location:

NEMO/trunk/src/OCE

Files:

• BDY/bdyini.F90 (modified) (1 diff)
• DOM/dommsk.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/BDY/bdyini.F90

@@ -1123 +1123 @@
       bdytmask(:,:) = ssmask(:,:)
 
-      IF( ln_mask_file ) THEN
-         CALL iom_open( cn_mask_file, inum )
-         CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) )
-         CALL iom_close( inum )
-
-         ! Derive mask on U and V grid from mask on T grid
-         bdyumask(:,:) = 0._wp
-         bdyvmask(:,:) = 0._wp
-         DO ij=1, jpjm1
-            DO ii=1, jpim1
-               bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij )
-               bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)  
-            END DO
+      ! Derive mask on U and V grid from mask on T grid
+
+      bdyumask(:,:) = 0._wp
+      bdyvmask(:,:) = 0._wp
+      DO ij = 1, jpjm1
+         DO ii = 1, jpim1
+            bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij )
+            bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)  
          END DO
-         CALL lbc_lnk_multi( bdyumask, 'U', 1., bdyvmask, 'V', 1. )      ! Lateral boundary cond.
-      ENDIF ! ln_mask_file=.TRUE.
-      
-      IF( .NOT.ln_mask_file ) THEN
-         ! If .not. ln_mask_file then we need to derive mask on U and V grid from mask on T grid here.
-         bdyumask(:,:) = 0._wp
-         bdyvmask(:,:) = 0._wp
-         DO ij = 1, jpjm1
-            DO ii = 1, jpim1
-               bdyumask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii+1, ij )
-               bdyvmask(ii,ij) = bdytmask(ii,ij) * bdytmask(ii  ,ij+1)  
-            END DO
-         END DO
-         CALL lbc_lnk_multi( bdyumask, 'U', 1. , bdyvmask, 'V', 1. )   ! Lateral boundary cond. 
-      ENDIF
+      END DO
+      CALL lbc_lnk_multi( bdyumask, 'U', 1. , bdyvmask, 'V', 1. )   ! Lateral boundary cond. 
 
       ! bdy masks are now set to zero on boundary points:

NEMO/trunk/src/OCE/DOM/dommsk.F90

@@ -29 +29 @@
    !
    USE in_out_manager ! I/O manager
+   USE iom            ! IOM library
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp        ! Massively Parallel Processing library
@@ -155 +156 @@
       ! ------------------------
       IF ( ln_bdy .AND. ln_mask_file ) THEN
+         CALL iom_open( cn_mask_file, inum )
+         CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) )
+         CALL iom_close( inum )
          DO jk = 1, jpkm1
             DO jj = 1, jpj