Changeset 1502 for trunk/NEMO/OPA_SRC/BDY/bdydyn.F90

Timestamp:

2009-07-20T17:20:23+02:00 (15 years ago)

Author:

rblod

Message:

Update dynnxt and dynspg_ts for variable volume, see ticket #474

File:

• trunk/NEMO/OPA_SRC/BDY/bdydyn.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/BDY/bdydyn.F90

@@ -7 +7 @@
    !!             -   !  2007-07  (D. Storkey) Move Flather implementation to separate routine.
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.2  !  2008-04  (R. Benshila) consider velocity instead of transport 
    !!----------------------------------------------------------------------
 #if defined key_bdy 
@@ -86 +87 @@
          END DO 
          !
-         CALL lbc_lnk( ua, 'U', 1. )   ! Boundary points should be updated
-         CALL lbc_lnk( va, 'V', 1. )   !
+         CALL lbc_lnk( ua, 'U', -1. )   ! Boundary points should be updated
+         CALL lbc_lnk( va, 'V', -1. )   !
          !
       ENDIF ! ln_bdy_dyn_frs
@@ -96 +97 @@
 #if defined key_dynspg_exp || defined key_dynspg_ts
 !! Option to use Flather with dynspg_flt not coded yet...
-   SUBROUTINE bdy_dyn_fla
+   SUBROUTINE bdy_dyn_fla( pssh )
       !!----------------------------------------------------------------------
       !!                 ***  SUBROUTINE bdy_dyn_fla  ***
@@ -116 +117 @@
       !!              continental shelf. Mem. Soc. R. Sci. Liege, Ser. 6,10, 141-164.     
       !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(jpi,jpj), INTENT(in) ::   pssh
+
       INTEGER  ::   ib, igrd                         ! dummy loop indices
       INTEGER  ::   ii, ij, iim1, iip1, ijm1, ijp1   ! 2D addresses
       REAL(wp) ::   zcorr                            ! Flather correction
+      REAL(wp) ::   zforc                            ! temporary scalar
       !!----------------------------------------------------------------------
 
@@ -127 +131 @@
       IF(ln_bdy_dyn_fla .OR. ln_bdy_tides) THEN ! If these are both false, then this routine does nothing. 
 
-      ! Fill temporary array with ssh data (here spgu):
-      igrd = 1
-      spgu(:,:) = 0.0
-      DO ib = 1, nblenrim(igrd)
-         ii = nbi(ib,igrd)
-         ij = nbj(ib,igrd)
-         IF( ln_bdy_dyn_fla ) spgu(ii, ij) = sshbdy(ib)
-         IF( ln_bdy_tides )   spgu(ii, ij) = spgu(ii, ij) + sshtide(ib)
-      END DO
+         ! Fill temporary array with ssh data (here spgu):
+         igrd = 1
+         spgu(:,:) = 0.0
+         DO ib = 1, nblenrim(igrd)
+            ii = nbi(ib,igrd)
+            ij = nbj(ib,igrd)
+            IF( ln_bdy_dyn_fla ) spgu(ii, ij) = sshbdy(ib)
+            IF( ln_bdy_tides )   spgu(ii, ij) = spgu(ii, ij) + sshtide(ib)
+         END DO
+         !
+         igrd = 2      ! Flather bc on u-velocity; 
+         !             ! remember that flagu=-1 if normal velocity direction is outward
+         !             ! I think we should rather use after ssh ?
+         DO ib = 1, nblenrim(igrd)
+            ii  = nbi(ib,igrd)
+            ij  = nbj(ib,igrd) 
+            iim1 = ii + MAX( 0, INT( flagu(ib) ) )   ! T pts i-indice inside the boundary
+            iip1 = ii - MIN( 0, INT( flagu(ib) ) )   ! T pts i-indice outside the boundary 
+            !
+            zcorr = - flagu(ib) * SQRT( grav * hur_e(ii, ij) ) * ( pssh(iim1, ij) - spgu(iip1,ij) )
+            zforc = ubtbdy(ib) + utide(ib)
+            ua_e(ii,ij) = zforc + zcorr * umask(ii,ij,1) 
+         END DO
+         !
+         igrd = 3      ! Flather bc on v-velocity
+         !             ! remember that flagv=-1 if normal velocity direction is outward
+         DO ib = 1, nblenrim(igrd)
+            ii  = nbi(ib,igrd)
+            ij  = nbj(ib,igrd) 
+            ijm1 = ij + MAX( 0, INT( flagv(ib) ) )   ! T pts j-indice inside the boundary
+            ijp1 = ij - MIN( 0, INT( flagv(ib) ) )   ! T pts j-indice outside the boundary 
+            !
+            zcorr = - flagv(ib) * SQRT( grav * hvr_e(ii, ij) ) * ( pssh(ii, ijm1) - spgu(ii,ijp1) )
+            zforc = vbtbdy(ib) + vtide(ib)
+            va_e(ii,ij) = zforc + zcorr * vmask(ii,ij,1)
+         END DO
+         CALL lbc_lnk( ua_e, 'U', 1. )   ! Boundary points should be updated
+         CALL lbc_lnk( va_e, 'V', 1. )   !
+         !
+      ENDIF ! ln_bdy_dyn_fla .or. ln_bdy_tides
       !
-      igrd = 2      ! Flather bc on u-velocity; 
-      !             ! remember that flagu=-1 if normal velocity direction is outward
-      !             ! I think we should rather use after ssh ?
-      DO ib = 1, nblenrim(igrd)
-         ii  = nbi(ib,igrd)
-         ij  = nbj(ib,igrd) 
-         iim1 = ii + MAX( 0, INT( flagu(ib) ) )   ! T pts i-indice inside the boundary
-         iip1 = ii - MIN( 0, INT( flagu(ib) ) )   ! T pts i-indice outside the boundary 
-         !
-         zcorr = - flagu(ib) * SQRT( grav / (hu_e(ii, ij) + 1.e-20) ) * ( sshn_e(iim1, ij) - spgu(iip1,ij) )
-         ua_e(ii, ij) = ( ubtbdy(ib) + utide(ib) ) * hu_e(ii,ij)
-         ua_e(ii,ij) = ua_e(ii,ij) + zcorr * umask(ii,ij,1) * hu_e(ii,ij)
-      END DO
-      !
-      igrd = 3      ! Flather bc on v-velocity
-      !             ! remember that flagv=-1 if normal velocity direction is outward
-      DO ib = 1, nblenrim(igrd)
-         ii  = nbi(ib,igrd)
-         ij  = nbj(ib,igrd) 
-         ijm1 = ij + MAX( 0, INT( flagv(ib) ) )   ! T pts j-indice inside the boundary
-         ijp1 = ij - MIN( 0, INT( flagv(ib) ) )   ! T pts j-indice outside the boundary 
-         !
-         zcorr = - flagv(ib) * SQRT( grav / (hv_e(ii, ij) + 1.e-20) ) * ( sshn_e(ii, ijm1) - spgu(ii,ijp1) )
-         va_e(ii, ij) = ( vbtbdy(ib) + vtide(ib) ) * hv_e(ii,ij)
-         va_e(ii,ij) = va_e(ii,ij) + zcorr * vmask(ii,ij,1) * hv_e(ii,ij)
-      END DO
-      !
-      CALL lbc_lnk( ua_e, 'U', 1. ) ! Boundary points should be updated
-      CALL lbc_lnk( va_e, 'V', 1. ) !
-      !
-      ENDIF ! ln_bdy_dyn_fla .or. ln_bdy_tides
-
    END SUBROUTINE bdy_dyn_fla
 #endif