Changeset 3062 for branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2011-11-09T11:47:32+01:00 (12 years ago)

Author:

rfurner

Message:

ticket #885. added in changes from branches/2011/UKMO_MERCATOR_obc_bdy_merge@2888

File:

• branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (2 diffs)

branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -46 +46 @@
    USE domain          ! domain initialization             (dom_init routine)
    USE obcini          ! open boundary cond. initialization (obc_ini routine)
-   USE bdyini          ! unstructured open boundary cond. initialization (bdy_init routine)
+   USE bdyini          ! open boundary cond. initialization (bdy_init routine)
+   USE bdydta          ! open boundary cond. initialization (bdy_dta_init routine)
+   USE bdytides        ! open boundary cond. initialization (tide_init routine)
    USE istate          ! initial state setting          (istate_init routine)
    USE ldfdyn          ! lateral viscosity setting      (ldfdyn_init routine)
@@ -295 +297 @@
 
       IF( lk_obc        )   CALL     obc_init   ! Open boundaries 
-      IF( lk_bdy        )   CALL     bdy_init   ! Unstructured open boundaries
+      IF( lk_bdy        )   CALL     bdy_init       ! Open boundaries initialisation
+      IF( lk_bdy        )   CALL     bdy_dta_init   ! Open boundaries initialisation of external data arrays
+      IF( lk_bdy        )   CALL     tide_init      ! Open boundaries initialisation of tidal harmonic forcing
 
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)