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

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

@@ -94 +94 @@
       REWIND(numnam)
       DO ib_obc = 1, nb_obc
-         IF( nn_tides(ib_obc) .gt. 0 ) THEN
+         IF( nn_dyn2d_dta(ib_obc) .ge. 2 ) THEN
 
             td => tides(ib_obc)
@@ -260 +260 @@
             ENDIF ! date correction
             !
-         ENDIF ! nn_tides .gt. 0
+         ENDIF ! nn_dyn2d_dta(ib_obc) .ge. 2
          !
       END DO ! loop on ib_obc
@@ -267 +267 @@
 
 
-   SUBROUTINE tide_update ( kt, jit, idx, dta, td )
+   SUBROUTINE tide_update ( kt, idx, dta, td, jit, time_offset )
       !!----------------------------------------------------------------------
       !!                 ***  SUBROUTINE tide_update  ***
@@ -276 +276 @@
       INTEGER, INTENT( in )          ::   kt      ! Main timestep counter
 !!gm doctor jit ==> kit
-      INTEGER, INTENT( in )          ::   jit     ! Barotropic timestep counter (for timesplitting option)
       TYPE(OBC_INDEX), INTENT( in )  ::   idx     ! OBC indices
       TYPE(OBC_DATA),  INTENT(inout) ::   dta     ! OBC external data
       TYPE(TIDES_DATA),INTENT( in )  ::   td      ! tidal harmonics data
+      INTEGER,INTENT(in),OPTIONAL    ::   jit     ! Barotropic timestep counter (for timesplitting option)
+      INTEGER,INTENT( in ), OPTIONAL ::   time_offset  ! time offset in units of timesteps. NB. if jit
+                                                       ! is present then units = subcycle timesteps.
+                                                       ! time_offset = 0 => get data at "now" time level
+                                                       ! time_offset = -1 => get data at "before" time level
+                                                       ! time_offset = +1 => get data at "after" time level
+                                                       ! etc.
       !!
       INTEGER                          :: itide, igrd, ib      ! dummy loop indices
+      INTEGER                          :: time_add             ! time offset in units of timesteps
       REAL(wp)                         :: z_arg, z_sarg      
       REAL(wp), DIMENSION(jptides_max) :: z_sist, z_cost
       !!----------------------------------------------------------------------
 
+      time_add = 0
+      IF( PRESENT(time_offset) ) THEN
+         time_add = time_offset
+      ENDIF
+         
       ! Note tide phase speeds are in deg/hour, so we need to convert the
       ! elapsed time in seconds to hours by dividing by 3600.0
-      IF( jit == 0 ) THEN  
-         z_arg = kt * rdt * rad / 3600.0
-      ELSE                              ! we are in a barotropic subcycle (for timesplitting option)
-!         z_arg = ( (kt-1) * rdt + jit * rdt / REAL(nn_baro,lwp) ) * rad / 3600.0
-         z_arg = ( (kt-1) * rdt + jit * rdt / REAL(nn_baro,wp) ) * rad / 3600.0
+      IF( PRESENT(jit) ) THEN  
+         z_arg = ( (kt-1) * rdt + (jit+time_add) * rdt / REAL(nn_baro,wp) ) * rad / 3600.0
+      ELSE                              
+         z_arg = (kt+time_add) * rdt * rad / 3600.0
       ENDIF
 
@@ -301 +312 @@
       END DO
 
-      !
       DO itide = 1, td%ncpt
          igrd=1                              ! SSH on tracer grid.