Changeset 2865 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.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/OBC/obcdyn.F90 (modified) (4 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcdyn.F90

@@ -41 +41 @@
 CONTAINS
 
-   SUBROUTINE obc_dyn( kt )
+   SUBROUTINE obc_dyn( kt, dyn3d_only )
       !!----------------------------------------------------------------------
       !!                  ***  SUBROUTINE obc_dyn  ***
@@ -51 +51 @@
       USE wrk_nemo, ONLY: wrk_2d_7, wrk_2d_8      ! 2D workspace
       !!
-      INTEGER, INTENT( in ) :: kt     ! Main time step counter
+      INTEGER, INTENT( in )           :: kt               ! Main time step counter
+      LOGICAL, INTENT( in ), OPTIONAL :: dyn3d_only       ! T => only update baroclinic velocities
       !!
       INTEGER               :: jk,ii,ij,ib,igrd     ! Loop counter
+      LOGICAL               :: ll_dyn2d, ll_dyn3d  
       !!
 
@@ -60 +62 @@
       END IF
 
+      ll_dyn2d = .true.
+      ll_dyn3d = .true.
+
+      IF( PRESENT(dyn3d_only) ) THEN
+         IF( dyn3d_only ) ll_dyn2d = .false.
+      ENDIF
+
       !-------------------------------------------------------
       ! Set pointers
       !-------------------------------------------------------
 
-      pssh => sshn_b
+      pssh => sshn
       phur => hur
       phvr => hvr
@@ -92 +101 @@
       !-------------------------------------------------------
 
-      CALL obc_dyn2d( kt )
+      IF( ll_dyn2d ) CALL obc_dyn2d( kt )
 
-      CALL obc_dyn3d( kt )
+      IF( ll_dyn3d ) CALL obc_dyn3d( kt )
 
       !-------------------------------------------------------