Changeset 2814 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2011-07-27T14:41:28+02:00 (13 years ago)

Author:

davestorkey

Message:

1. Implement tidal harmonics forcing (UKMO version) in new structure.
2. Other bug fixes and updates.

File:

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

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

@@ -26 +26 @@
    USE zdfbfr          ! bottom friction
    USE dynvor          ! vorticity term
+   USE obc_par         ! for lk_obc
    USE obc_oce         ! Lateral open boundary condition
    USE obcdta          ! open boundary condition data     
@@ -528 +529 @@
       !                                                    ! ==================== !
 
-#if defined key_obc
-      IF( lp_obc_east  )   sshfoe_b(:,:) = zcoef * sshfoe_b(:,:)     !!gm totally useless ?????
-      IF( lp_obc_west  )   sshfow_b(:,:) = zcoef * sshfow_b(:,:)
-      IF( lp_obc_north )   sshfon_b(:,:) = zcoef * sshfon_b(:,:)
-      IF( lp_obc_south )   sshfos_b(:,:) = zcoef * sshfos_b(:,:)
-#endif
-
       ! -----------------------------------------------------------------------------
       ! Phase 3. update the general trend with the barotropic trend