Changeset 3994

Timestamp:

2013-07-30T15:20:03+02:00 (11 years ago)

Author:

davestorkey

Message:

Bug fixes: add masking in bdy_orlanski routines and avoid division by
zero error. Also need TARGET attributes in dom_oce.F90.

Location:

branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC

Files:

• BDY/bdydyn2d.F90 (modified) (1 diff)
• BDY/bdydyn3d.F90 (modified) (1 diff)
• BDY/bdylib.F90 (modified) (8 diffs)
• BDY/bdytra.F90 (modified) (1 diff)
• DOM/dom_oce.F90 (modified) (1 diff)

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

@@ -220 +220 @@
       igrd = 2      ! Orlanski bc on u-velocity; 
       !            
-      CALL bdy_orlanski_2d( idx, igrd, pub2d, pua2d, dta%u2d, ll_npo )
+      CALL bdy_orlanski_2d( idx, igrd, pub2d, pua2d, dta%u2d, umask(:,:,1), ll_npo )
 
       igrd = 3      ! Orlanski bc on v-velocity
       !  
-      CALL bdy_orlanski_2d( idx, igrd, pvb2d, pva2d, dta%v2d, ll_npo )
+      CALL bdy_orlanski_2d( idx, igrd, pvb2d, pva2d, dta%v2d, vmask(:,:,1), ll_npo )
       !
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dyn2d_orlanski')

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

@@ -239 +239 @@
       igrd = 2      ! Orlanski bc on u-velocity; 
       !            
-      CALL bdy_orlanski_3d( idx, igrd, ub, ua, dta%u3d, ll_npo )
+      CALL bdy_orlanski_3d( idx, igrd, ub, ua, dta%u3d, umask, ll_npo )
 
       igrd = 3      ! Orlanski bc on v-velocity
       !  
-      CALL bdy_orlanski_3d( idx, igrd, vb, va, dta%v3d, ll_npo )
+      CALL bdy_orlanski_3d( idx, igrd, vb, va, dta%v3d, vmask, ll_npo )
       !
       CALL lbc_bdy_lnk( ua, 'U', -1., ib_bdy )    ! Boundary points should be updated

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

@@ -34 +34 @@
 CONTAINS
 
-   SUBROUTINE bdy_orlanski_2d( idx, igrd, phib, phia, phi_ext, ll_npo )
+   SUBROUTINE bdy_orlanski_2d( idx, igrd, phib, phia, phi_ext, mask, ll_npo )
       !!----------------------------------------------------------------------
       !!                 ***  SUBROUTINE bdy_orlanski_2d  ***
@@ -50 +50 @@
       REAL(wp), DIMENSION(:,:),   INTENT(inout)  ::   phia     ! model after 2D field (to be updated)
       REAL(wp), DIMENSION(:),     INTENT(in)     ::   phi_ext  ! external forcing data
+      REAL(wp), DIMENSION(:,:),   INTENT(in)     ::   mask     ! land/sea mask
       LOGICAL,                    INTENT(in)     ::   ll_npo   ! switch for NPO version
 
@@ -95 +96 @@
        &        + (1. - zsign_ups) * ( phib(iibm1jp1,ijbm1jp1) - phib(iibm1   ,ijbm1   ) )
          znor2 = zdx * zdx + zdy * zdy
+         znor2 = max(znor2,rsmall)
          zcx = zdt * zdx / znor2
          zcy = zdt * zdy / znor2
@@ -115 +117 @@
          end if
          phia(ii,ij) = phia(ii,ij) + zwgt * ( phi_ext(jb) - phia(ii,ij) ) 
+         phia(ii,ij) = phia(ii,ij) * mask(ii,ij)
       END DO
       !
@@ -122 +125 @@
 
 
-   SUBROUTINE bdy_orlanski_3d( idx, igrd, phib, phia, phi_ext, ll_npo )
+   SUBROUTINE bdy_orlanski_3d( idx, igrd, phib, phia, phi_ext, mask, ll_npo )
       !!----------------------------------------------------------------------
       !!                 ***  SUBROUTINE bdy_orlanski_3d  ***
@@ -138 +141 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(inout)  ::   phia     ! model after 3D field (to be updated)
       REAL(wp), DIMENSION(:,:),   INTENT(in)     ::   phi_ext  ! external forcing data
+      REAL(wp), DIMENSION(:,:,:), INTENT(in)     ::   mask     ! land/sea mask
       LOGICAL,                    INTENT(in)     ::   ll_npo   ! switch for NPO version
 
@@ -184 +188 @@
            &    + (1. - zsign_ups) * ( phib(iibm1jp1,ijbm1jp1,jk) - phib(iibm1   ,ijbm1   ,jk) )
             znor2 = zdx * zdx + zdy * zdy
+            znor2 = max(znor2,rsmall)
             zcx = zdt * zdx / znor2
             zcy = zdt * zdy / znor2
@@ -204 +209 @@
             end if
             phia(ii,ij,jk) = phia(ii,ij,jk) + zwgt * ( phi_ext(jb,jk) - phia(ii,ij,jk) ) 
+            phia(ii,ij,jk) = phia(ii,ij,jk) * mask(ii,ij,jk)
          END DO
          !

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

@@ -224 +224 @@
       igrd = 1      ! Orlanski bc on temperature; 
       !            
-      CALL bdy_orlanski_3d( idx, igrd, tsb(:,:,:,jp_tem), tsa(:,:,:,jp_tem), dta%tem, ll_npo )
+      CALL bdy_orlanski_3d( idx, igrd, tsb(:,:,:,jp_tem), tsa(:,:,:,jp_tem), dta%tem, tmask, ll_npo )
 
       igrd = 1      ! Orlanski bc on salinity;
       !  
-      CALL bdy_orlanski_3d( idx, igrd, tsb(:,:,:,jp_sal), tsa(:,:,:,jp_sal), dta%sal, ll_npo )
+      CALL bdy_orlanski_3d( idx, igrd, tsb(:,:,:,jp_sal), tsa(:,:,:,jp_sal), dta%sal, tmask, ll_npo )
       !
       IF( nn_timing == 1 ) CALL timing_stop('bdy_tra_orlanski')

branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -193 +193 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   bmask        !: land/ocean mask of barotropic stream function
 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: tmask, umask, vmask, fmask   !: land/ocean mask at T-, U-, V- and F-pts
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:), TARGET :: tmask, umask, vmask, fmask   !: land/ocean mask at T-, U-, V- and F-pts
 
    REAL(wp), PUBLIC, DIMENSION(jpiglo) ::   tpol, fpol          !: north fold mask (jperio= 3 or 4)