Changeset 9615

Timestamp:

2018-05-22T10:41:34+02:00 (6 years ago)

Author:

frrh

Message:

Correct U mask footprint and remove N-fold specific masking on
T points in out new 3d T mask.

File:

• branches/UKMO/dev_r5518_GO6_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_diag_bitcomp/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -252 +252 @@
             DO ji = iif+1, iil-1
                tmask_i(ji,nlej-1) = tmask_i(ji,nlej-1) * tpol(mig(ji))
-               tmask_i_3d(ji,nlej-1,:) = tmask_i_3d(ji,nlej-1,:) * tpol(mig(ji))
+               ! It would seem logical that the following SHOULD be applied, 
+               ! but the existing code in iom.F90 which we are trying to 
+               ! replicate, and where we aim to use this array simply uses 
+               ! tmask which does NOT account for masking in the N-fold.  
+               ! tmask_i_3d(ji,nlej-1,:) = tmask_i_3d(ji,nlej-1,:) * tpol(mig(ji))
             END DO
          ENDIF
@@ -275 +279 @@
                   &            * tmask(ji,jj+1,jk) * tmask(ji+1,jj+1,jk)
             END DO
-         END DO
+         END DO 
       END DO
       ! (ISF) MIN(1,SUM(umask)) is here to check if you have effectively at least 1 wet u point
@@ -296 +300 @@
 
       ! Set up interior 3d U mask
-      umask_i_3d(:,:,:) = umask(:,:,:) 
+      umask_i_3d(2:jpim1,:,:) = tmask(2:jpim1,:,:) + tmask(3:jpi,:,:)
+      CALL lbc_lnk( umask_i_3d, 'U', 1. )
       ! Now mask out any wrap columns
       umask_i_3d( 1 :iif,:,:) = 0._wp       ! first columns
@@ -305 +310 @@
 
       ! Set up interior 3d V mask
-      vmask_i_3d(:,:,:) = vmask(:,:,:) 
+      vmask_i_3d(:,2:jpjm1,:) = tmask(:,2:jpjm1,:) + tmask(:,3:jpj,:)
+      CALL lbc_lnk( vmask_i_3d, 'V', 1. )
       ! Now mask out any wrap columns
       vmask_i_3d( 1 :iif,:,:) = 0._wp       ! first columns