New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3651 for branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 – NEMO

Ignore:
Timestamp:
2012-11-26T11:46:39+01:00 (11 years ago)
Author:
cbricaud
Message:

merge dev_MERCATOR_2012_rev3555 into dev_NOC_MERCATOR_2012 ; see ticket 1020

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r3625 r3651  
    4949   USE ice_domain_size, only: nx_global, ny_global 
    5050#endif 
     51   USE tideini         ! tidal components initialization   (tide_ini routine) 
    5152   USE obcini          ! open boundary cond. initialization (obc_ini routine) 
    5253   USE bdyini          ! open boundary cond. initialization (bdy_init routine) 
    5354   USE bdydta          ! open boundary cond. initialization (bdy_dta_init routine) 
    54    USE bdytides        ! open boundary cond. initialization (tide_init routine) 
     55   USE bdytides        ! open boundary cond. initialization (bdytide_init routine) 
    5556   USE istate          ! initial state setting          (istate_init routine) 
    5657   USE ldfdyn          ! lateral viscosity setting      (ldfdyn_init routine) 
     
    8081   USE mod_ioclient 
    8182#endif 
     83   USE sbctide, ONLY: lk_tide 
     84 
    8285 
    8386   IMPLICIT NONE 
     
    322325 
    323326      IF( lk_obc        )   CALL     obc_init   ! Open boundaries  
     327 
     328                            CALL  istate_init   ! ocean initial state (Dynamics and tracers) 
     329 
     330      IF( lk_tide       )   CALL tide_init( nit000 )    ! Initialisation of the tidal harmonics 
     331 
    324332      IF( lk_bdy        )   CALL     bdy_init       ! Open boundaries initialisation 
    325333      IF( lk_bdy        )   CALL     bdy_dta_init   ! Open boundaries initialisation of external data arrays 
    326       IF( lk_bdy        )   CALL     tide_init      ! Open boundaries initialisation of tidal harmonic forcing 
     334      IF( lk_bdy        )   CALL     bdytide_init   ! Open boundaries initialisation of tidal harmonic forcing 
    327335 
    328336                            CALL dyn_nept_init  ! simplified form of Neptune effect 
    329  
    330                             CALL  istate_init   ! ocean initial state (Dynamics and tracers) 
    331337 
    332338      !                                     ! Ocean physics 
Note: See TracChangeset for help on using the changeset viewer.