Changeset 4007 for branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2013-08-28T10:10:35+02:00 (11 years ago)

Author:

davestorkey

Message:

1. Bug fixes for flagu/flagv calculation in bdyini.F90.
2. Introduce masking of derivatives in radiation velocity calculation in bdylib.F90
3. Change relaxation term in Orlanski implementation to explicit timestepping in bdylib.F90.
4. Remove bdyfmask (redundant).

File:

• branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (9 diffs)

branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -21 +21 @@
    !!   bdy_init       : Initialization of unstructured open boundaries
    !!----------------------------------------------------------------------
+   USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
    USE oce             ! ocean dynamics and tracers variables
@@ -92 +93 @@
       INTEGER :: com_east_b, com_west_b, com_south_b, com_north_b  ! Flags for boundaries receiving
       INTEGER :: iw_b(4), ie_b(4), is_b(4), in_b(4)                ! Arrays for neighbours coordinates
+      REAL(wp), POINTER, DIMENSION(:,:)       ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat)
 
       !!
@@ -1178 +1180 @@
       ENDDO
 
-      ! bdyfmask required for flagu, flagv calculations below even though F-points 
-      ! not defined for BDY grid. 
+      ! For the flagu/flagv calculation below we require a version of fmask without
+      ! the land boundary condition (shlat) included:
+      CALL wrk_alloc(jpi,jpj,zfmask) 
       DO ij = 2, jpjm1
          DO ii = 2, jpim1
-            bdyfmask(ii,ij) = bdytmask(ii,ij  ) * bdytmask(ii+1,ij  )   &
-           &                * bdytmask(ii,ij+1) * bdytmask(ii+1,ij+1)
+            zfmask(ii,ij) = tmask(ii,ij  ,1) * tmask(ii+1,ij  ,1)   &
+           &              * tmask(ii,ij+1,1) * tmask(ii+1,ij+1,1)
          END DO      
       END DO
 
       ! Lateral boundary conditions
+      CALL lbc_lnk( zfmask       , 'F', 1. )
       CALL lbc_lnk( fmask        , 'F', 1. )   ;   CALL lbc_lnk( bdytmask(:,:), 'T', 1. )
       CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )
@@ -1205 +1209 @@
             SELECT CASE( igrd )
                CASE( 1 )
-                  cgrid = 'T' 
                   pmask => umask(:,:,1)
                   i_offset = 0
                CASE( 2 ) 
-                  cgrid = 'U'
                   pmask => bdytmask
                   i_offset = 1
                CASE( 3 ) 
-                  cgrid = 'V'
-                  pmask => fmask(:,:,1)
+                  pmask => zfmask(:,:)
                   i_offset = 0
             END SELECT 
@@ -1223 +1224 @@
                zefl = pmask(nbi+i_offset-1,nbj)
                zwfl = pmask(nbi+i_offset,nbj)
-               IF( zefl + zwfl == 2 * i_offset ) THEN
+               ! This error check only works if you are using the bdyXmask arrays
+               IF( i_offset == 1 .and. zefl + zwfl == 2 ) THEN
                   icount = icount + 1
                   IF(lwp) WRITE(numout,*) 'Problem with igrd = ',igrd,' at (global) nbi, nbj : ',mig(nbi),mjg(nbj)
                ELSE
-                  idx_bdy(ib_bdy)%flagu(ib,igrd)=-zefl+zwfl
+                  idx_bdy(ib_bdy)%flagu(ib,igrd) = -zefl + zwfl
                ENDIF
             END DO
             IF( icount /= 0 ) THEN
                IF(lwp) WRITE(numout,*)
-               IF(lwp) WRITE(numout,*) ' E R R O R : Some ',cgrid,' grid points,',   &
+               IF(lwp) WRITE(numout,*) ' E R R O R : Some ',cgrid(igrd),' grid points,',   &
                   ' are not boundary points (flagu calculation). Check nbi, nbj, indices for boundary set ',ib_bdy
                IF(lwp) WRITE(numout,*) ' ========== '
@@ -1241 +1243 @@
 
          ! Calculate relationship of V direction to the local orientation of the boundary
-         ! flagv = -1 : u component is normal to the dynamical boundary but its direction is outward
-         ! flagv =  0 : u is tangential
-         ! flagv =  1 : u is normal to the boundary and is direction is inward
+         ! flagv = -1 : v component is normal to the dynamical boundary but its direction is outward
+         ! flagv =  0 : v is tangential
+         ! flagv =  1 : v is normal to the boundary and is direction is inward
 
          DO igrd = 1,jpbgrd 
             SELECT CASE( igrd )
                CASE( 1 )
-                  cgrid = 'T'
                   pmask => vmask(:,:,1)
                   j_offset = 0
                CASE( 2 )
-                  cgrid = 'U'
-                  pmask => fmask(:,:,1)
+                  pmask => zfmask(:,:)
                   j_offset = 0
                CASE( 3 )
-                  cgrid = 'V'
                   pmask => bdytmask
                   j_offset = 1
@@ -1266 +1265 @@
                znfl = pmask(nbi,nbj+j_offset-1  )
                zsfl = pmask(nbi,nbj+j_offset)
-               IF( znfl + zsfl == 2 * j_offset ) THEN
+               ! This error check only works if you are using the bdyXmask arrays
+               IF( j_offset == 1 .and. znfl + zsfl == 2 ) THEN
                   IF(lwp) WRITE(numout,*) 'Problem with igrd = ',igrd,' at (global) nbi, nbj : ',mig(nbi),mjg(nbj)
                   icount = icount + 1
@@ -1275 +1275 @@
             IF( icount /= 0 ) THEN
                IF(lwp) WRITE(numout,*)
-               IF(lwp) WRITE(numout,*) ' E R R O R : Some ',cgrid,' grid points,',   &
+               IF(lwp) WRITE(numout,*) ' E R R O R : Some ',cgrid(igrd),' grid points,',   &
                   ' are not boundary points (flagv calculation). Check nbi, nbj, indices for boundary set ',ib_bdy
                IF(lwp) WRITE(numout,*) ' ========== '
@@ -1324 +1324 @@
          DEALLOCATE(nbidta, nbjdta, nbrdta)
       ENDIF
+
+      CALL wrk_dealloc(jpi,jpj,zfmask) 
 
       IF( nn_timing == 1 ) CALL timing_stop('bdy_init')