Changeset 10685 for branches/UKMO/r8395_India_uncoupled/NEMOGCM/NEMO/OPA_SRC/BDY

Timestamp:

2019-02-14T16:55:25+01:00 (5 years ago)

Author:

jcastill

Message:

Changes as Ash's files

File:

• branches/UKMO/r8395_India_uncoupled/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (2 diffs)

branches/UKMO/r8395_India_uncoupled/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -167 +167 @@
       ! Check and write out namelist parameters
       ! -----------------------------------------
-      IF( jperio /= 0 )   CALL ctl_stop( 'bdy_segs: Cyclic or symmetric,',   &
-         &                               ' and general open boundary condition are not compatible' )
+!     IF( jperio /= 0 )   CALL ctl_stop( 'bdy_segs: Cyclic or symmetric,',   &
+!        &                               ' and general open boundary condition are not compatible' )
 
       IF( nb_bdy == 0 ) THEN 
@@ -1161 +1161 @@
       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
+      ! 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
-         CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( 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( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
-      ENDIF
-
+      END DO
+      CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
+     
       ! bdy masks are now set to zero on boundary points:
       !