Changeset 4328 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

Timestamp:

2013-12-06T11:25:13+01:00 (10 years ago)

Author:

davestorkey

Message:

Remove OBC module at NEMO 3.6. See ticket #1189.

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90 (modified) (3 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -30 +30 @@
    USE dynadv          ! dynamics: vector invariant versus flux form
    USE domvvl          ! variable volume
-   USE obc_oce         ! ocean open boundary conditions
-   USE obcdyn          ! open boundary condition for momentum (obc_dyn routine)
-   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         ! ocean open boundary conditions
    USE bdydta          ! ocean open boundary conditions
@@ -83 +79 @@
       !!              * Apply lateral boundary conditions on after velocity 
       !!             at the local domain boundaries through lbc_lnk call,
-      !!             at the one-way open boundaries (lk_obc=T),
+      !!             at the one-way open boundaries (lk_bdy=T),
       !!             at the AGRIF zoom     boundaries (lk_agrif=T)
       !!
@@ -204 +200 @@
       CALL lbc_lnk( va, 'V', -1. ) 
       !
-# if defined key_obc
-      !                                !* OBC open boundaries
-      IF( lk_obc ) CALL obc_dyn( kt )
-      !
-      IF( .NOT. lk_dynspg_flt ) THEN
-         ! Flather boundary condition : - Update sea surface height on each open boundary
-         !                                       sshn   (= after ssh   ) for explicit case (lk_dynspg_exp=T)
-         !                                       sshn_b (= after ssha_b) for time-splitting case (lk_dynspg_ts=T)
-         !                              - Correct the barotropic velocities
-         IF( lk_obc ) CALL obc_dyn_bt( 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( lk_obc .AND. ln_vol_cst )   CALL obc_vol( kt )
-         !
-         IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask )
-      ENDIF
-      !
-# elif defined key_bdy
+# if defined key_bdy
       !                                !* BDY open boundaries
       IF( lk_bdy .AND. lk_dynspg_exp ) CALL bdy_dyn( kt )