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

Timestamp:

2011-09-27T14:33:01+02:00 (13 years ago)

Author:

davestorkey

Message:

1. Updates for dynspg_exp option.
2. Implement time_offset functionality in obc_dta.
3. Add option to specify boundaries in the namelist.
4. Re-activate obc_vol option.
5. Update to namelist control of tidal harmonics.

File:

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

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

@@ -31 +31 @@
    USE obc_oce         ! ocean open boundary conditions
    USE obcdta          ! ocean open boundary conditions
-   USE obcdyn3d        ! ocean open boundary conditions
+   USE obcdyn          ! ocean open boundary conditions
    USE obcvol          ! ocean open boundary condition (obc_vol routines)
    USE in_out_manager  ! I/O manager
@@ -153 +153 @@
 # if defined key_obc
       !                                !* OBC open boundaries
-      IF( .NOT. lk_dynspg_flt ) THEN
-
-         CALL obc_dyn3d( kt )
+      IF( lk_dynspg_exp ) CALL obc_dyn( kt )
+      IF( lk_dynspg_ts )  CALL obc_dyn( kt, dyn3d_only=.true. )
 
 !!$!!gm ERROR - potential BUG: sshn should not be modified at this stage !!   ssh_nxt not alrady called
@@ -163 +162 @@
 !!$         !
 !!$         IF(ln_ctl)   CALL prt_ctl( tab2d_1=sshn, clinfo1=' ssh      : ', mask1=tmask )
-
-      ENDIF
       !
 # endif