Changeset 6948 for branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2016-09-23T14:56:46+02:00 (8 years ago)

Author:

jamesharle

Message:

updated masking code in bdyini.F90 and dommsk.F90 to properly account for bdy_msk

File:

• branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (2 diffs)

branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -1116 +1116 @@
       !          = 0  elsewhere   
  
+      bdytmask(:,:) = ssmask(:,:)
+
       IF( ln_mask_file ) THEN
          CALL iom_open( cn_mask_file, inum )
@@ -1132 +1134 @@
          CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
 
-
-         ! Mask corrections
-         ! ----------------
-         DO ik = 1, jpkm1
-            DO ij = 1, jpj
-               DO ii = 1, jpi
-                  tmask(ii,ij,ik) = tmask(ii,ij,ik) * bdytmask(ii,ij)
-                  umask(ii,ij,ik) = umask(ii,ij,ik) * bdyumask(ii,ij)
-                  vmask(ii,ij,ik) = vmask(ii,ij,ik) * bdyvmask(ii,ij)
-                  bmask(ii,ij)    = bmask(ii,ij)    * bdytmask(ii,ij)
-               END DO      
-            END DO
-         END DO
-
-         DO ik = 1, jpkm1
-            DO ij = 2, jpjm1
-               DO ii = 2, jpim1
-                  fmask(ii,ij,ik) = fmask(ii,ij,ik) * bdytmask(ii,ij  ) * bdytmask(ii+1,ij  )   &
-                     &                              * bdytmask(ii,ij+1) * bdytmask(ii+1,ij+1)
-               END DO      
-            END DO
-         END DO
-
-         tmask_i (:,:) = ssmask(:,:) * tmask_i(:,:)
-
       ENDIF ! ln_mask_file=.TRUE.
       
-      bdytmask(:,:) = ssmask(:,:)
       IF( .not. ln_mask_file ) THEN
          ! If .not. ln_mask_file then we need to derive mask on U and V grid