Changeset 3062 for branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

Timestamp:

2011-11-09T11:47:32+01:00 (12 years ago)

Author:

rfurner

Message:

ticket #885. added in changes from branches/2011/UKMO_MERCATOR_obc_bdy_merge@2888

File:

• branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (3 diffs)

branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -33 +33 @@
    USE obcdyn_bt       ! 2D open boundary condition for momentum (obc_dyn_bt routine)
    USE obcvol          ! ocean open boundary condition (obc_vol routines)
-   USE bdy_oce         ! unstructured open boundary conditions
-   USE bdydta          ! unstructured open boundary conditions
-   USE bdydyn          ! unstructured open boundary conditions
+   USE bdy_oce         ! ocean open boundary conditions
+   USE bdydta          ! ocean open boundary conditions
+   USE bdydyn          ! ocean open boundary conditions
+   USE bdyvol          ! ocean open boundary condition (bdy_vol routines)
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! lateral boundary condition (or mpp link)
@@ -77 +78 @@
       !!              * Apply lateral boundary conditions on after velocity 
       !!             at the local domain boundaries through lbc_lnk call,
-      !!             at the radiative open boundaries (lk_obc=T),
-      !!             at the relaxed   open boundaries (lk_bdy=T), and
+      !!             at the one-way open boundaries (lk_obc=T),
       !!             at the AGRIF zoom     boundaries (lk_agrif=T)
       !!
@@ -174 +174 @@
       ENDIF
       !
-# elif defined key_bdy 
+# elif defined key_bdy
       !                                !* BDY open boundaries
-      IF( .NOT. lk_dynspg_flt ) THEN
-         CALL bdy_dyn_frs( kt )
-#  if ! defined key_vvl
-         ua_e(:,:) = 0.e0
-         va_e(:,:) = 0.e0
-         ! Set these variables for use in bdy_dyn_fla
-         hur_e(:,:) = hur(:,:)
-         hvr_e(:,:) = hvr(:,:)
-         DO jk = 1, jpkm1   !! Vertically integrated momentum trends
-            ua_e(:,:) = ua_e(:,:) + fse3u(:,:,jk) * umask(:,:,jk) * ua(:,:,jk)
-            va_e(:,:) = va_e(:,:) + fse3v(:,:,jk) * vmask(:,:,jk) * va(:,:,jk)
-         END DO
-         ua_e(:,:) = ua_e(:,:) * hur(:,:)
-         va_e(:,:) = va_e(:,:) * hvr(:,:)
-         DO jk = 1 , jpkm1
-            ua(:,:,jk) = ua(:,:,jk) - ua_e(:,:)
-            va(:,:,jk) = va(:,:,jk) - va_e(:,:)
-         END DO
-         CALL bdy_dta_fla( kt+1, 0,2*nn_baro)
-         CALL bdy_dyn_fla( sshn_b )
-         CALL lbc_lnk( ua_e, 'U', -1. )   ! Boundary points should be updated
-         CALL lbc_lnk( va_e, 'V', -1. )   !
-         DO jk = 1 , jpkm1
-            ua(:,:,jk) = ( ua(:,:,jk) + ua_e(:,:) ) * umask(:,:,jk)
-            va(:,:,jk) = ( va(:,:,jk) + va_e(:,:) ) * vmask(:,:,jk)
-         END DO
-#  endif
-      ENDIF
+      IF( lk_dynspg_exp ) CALL bdy_dyn( kt )
+      IF( lk_dynspg_ts )  CALL bdy_dyn( kt, dyn3d_only=.true. )
+
+!!$   Do we need a call to bdy_vol here??
+      !
 # endif
       !