Changeset 3062 for branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.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/dynspg_ts.F90 (modified) (3 diffs)

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

@@ -25 +25 @@
    USE domvvl          ! variable volume
    USE zdfbfr          ! bottom friction
-   USE obcdta          ! open boundary condition data     
-   USE obcfla          ! Flather open boundary condition  
    USE dynvor          ! vorticity term
    USE obc_oce         ! Lateral open boundary condition
    USE obc_par         ! open boundary condition parameters
-   USE bdy_oce         ! unstructured open boundaries
-   USE bdy_par         ! unstructured open boundaries
-   USE bdydta          ! unstructured open boundaries
-   USE bdydyn          ! unstructured open boundaries
-   USE bdytides        ! tidal forcing at unstructured open boundaries.
+   USE obcdta          ! open boundary condition data     
+   USE obcfla          ! Flather open boundary condition  
+   USE bdy_par         ! for lk_bdy
+   USE bdy_oce         ! Lateral open boundary condition
+   USE bdydta          ! open boundary condition data     
+   USE bdydyn2d        ! open boundary conditions on barotropic variables
    USE lib_mpp         ! distributed memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -367 +366 @@
          IF( jn == 1 )   z2dt_e = rdt / nn_baro
 
-         !                                                !* Update the forcing (OBC, BDY and tides)
+         !                                                !* Update the forcing (BDY and tides)
          !                                                !  ------------------
          IF( lk_obc )   CALL obc_dta_bt ( kt, jn   )
-         IF( lk_bdy )   CALL bdy_dta_fla( kt, jn+1, icycle )
+         IF( lk_bdy )   CALL bdy_dta ( kt, jit=jn, time_offset=+1 )
 
          !                                                !* after ssh_e
@@ -489 +488 @@
          !                                                !* domain lateral boundary
          !                                                !  -----------------------
-         !                                                      ! Flather's boundary condition for the barotropic loop :
-         !                                                      !         - Update sea surface height on each open boundary
-         !                                                      !         - Correct the velocity
-
+
+                                                               ! OBC open boundaries
          IF( lk_obc               )   CALL obc_fla_ts ( ua_e, va_e, sshn_e, ssha_e )
-         IF( lk_bdy .OR. ln_tides )   CALL bdy_dyn_fla( sshn_e ) 
+
+                                                               ! BDY open boundaries
+#if defined key_bdy
+         pssh => sshn_e
+         phur => hur_e
+         phvr => hvr_e
+         pu2d => ua_e
+         pv2d => va_e
+
+         IF( lk_bdy )   CALL bdy_dyn2d( kt ) 
+#endif
+
          !
          CALL lbc_lnk( ua_e  , 'U', -1. )                      ! local domain boundaries