Changeset 2800 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

Timestamp:

2011-07-13T15:31:05+02:00 (13 years ago)

Author:

davestorkey

Message:

1. Application of boundary conditions to barotropic and baroclinic velocities clearly separated.
2. Option to input full velocities in boundary data (default expects barotropic and baroclinic velocities separately).
3. Option to use initial conditions as boundary conditions coded.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (2 diffs)

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

@@ -30 +30 @@
    USE domvvl          ! variable volume
    USE obc_oce         ! ocean open boundary conditions
-   USE obcdyn3d        ! open boundary condition for baroclinic velocities
-   USE obcdyn2d        ! open boundary condition for barotropic variables
+   USE obcdyn          ! open boundary condition for baroclinic velocities
    USE obcvol          ! ocean open boundary condition (obc_vol routines)
    USE in_out_manager  ! I/O manager
@@ -155 +154 @@
       IF( .NOT. lk_dynspg_flt ) THEN
 
-         CALL obc_dyn3d( kt )
-         !
-    !!!! ENDA'S FIX: NEED TO THINK ABOUT THIS !!!!
-         CALL obc_dta( kt+1, jit=0 )
-         CALL obc_dyn2d( kt, sshn_b )
-         !
-!!gm ERROR - potential BUG: sshn should not be modified at this stage !!   ssh_nxt not alrady called
-         CALL lbc_lnk( sshn, 'T', 1. )         ! Boundary conditions on sshn
-         !
-         IF( ln_vol_cst )   CALL obc_vol( kt )
-         !
-         IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask )
+         CALL obc_dyn( kt )
+
+!!$!!gm ERROR - potential BUG: sshn should not be modified at this stage !!   ssh_nxt not alrady called
+!!$         CALL lbc_lnk( sshn, 'T', 1. )         ! Boundary conditions on sshn
+!!$         !
+!!$         IF( ln_vol_cst )   CALL obc_vol( kt )
+!!$         !
+!!$         IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask )
+
       ENDIF
       !