Changeset 6948

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

Location:

branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC

Files:

• BDY/bdyini.F90 (modified) (2 diffs)
• DOM/dommsk.F90 (modified) (4 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 

branches/NERC/dev_r5840_BDY_MSK/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -25 +25 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
+   USE bdy_oce      
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp
+   USE iom
    USE dynspg_oce      ! choice/control of key cpp for surface pressure gradient
    USE wrk_nemo        ! Memory allocation
@@ -115 +117 @@
       INTEGER  ::   iif, iil, ii0, ii1, ii   ! local integers
       INTEGER  ::   ijf, ijl, ij0, ij1       !   -       -
-      INTEGER  ::   ios
+      INTEGER  ::   ios, inum
       INTEGER  ::   isrow                    ! index for ORCA1 starting row
       INTEGER , POINTER, DIMENSION(:,:) ::  imsk
@@ -121 +123 @@
       !!
       NAMELIST/namlbc/ rn_shlat, ln_vorlat
+#if defined key_bdy 
+      NAMELIST/nambdy/ nb_bdy, ln_coords_file, cn_coords_file,                 &
+         &             ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta,     &
+         &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &
+         &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
+         &             cn_ice_lim, nn_ice_lim_dta,                           &
+         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                 &
+         &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
+#endif
       !!---------------------------------------------------------------------
       !
@@ -168 +179 @@
       END DO  
       
+#if defined key_bdy 
+      REWIND( numnam_ref )              ! Namelist nambdy in reference namelist :Unstructured open boundaries  
+      READ  ( numnam_ref, nambdy, IOSTAT = ios, ERR = 901)
+903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist :Unstructured open boundaries
+      READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 )
+904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwp )
+      IF(lwm) WRITE ( numond, nambdy )
+
+     IF( ln_mask_file ) THEN ! correct for bdy mask
+         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.e0
+         bdyvmask(:,:) = 0.e0
+         DO jj=1, jpjm1
+            DO ji=1, jpim1
+               bdyumask(ji,jj)=bdytmask(ji,jj)*bdytmask(ji+1, jj )
+               bdyvmask(ji,jj)=bdytmask(ji,jj)*bdytmask(ji  ,jj+1)
+            END DO
+         END DO
+         CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
+
+
+         ! Mask corrections
+         ! ----------------
+         DO jk = 1, jpkm1
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  tmask(ji,jj,jk) = tmask(ji,jj,jk) * bdytmask(ji,jj)
+               END DO
+            END DO
+         END DO
+      ENDIF
+#endif
       ! (ISF) define barotropic mask and mask the ice shelf point
       ssmask(:,:)=tmask(:,:,1) ! at this stage ice shelf is not masked