Changeset 888 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

2008-04-11T19:05:03+02:00 (16 years ago)

Author:

ctlod

Message:

merge dev_001_SBC branche with the trunk to include the New Surface Module package, see ticket: #113

File:

• trunk/NEMO/OPA_SRC/opa.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/opa.F90

@@ -36 +36 @@
    !!----------------------------------------------------------------------
    !! * Modules used
+   USE oce             ! dynamics and tracers variables
    USE cpl_oce         ! ocean-atmosphere-sea ice coupled exchanges
    USE dom_oce         ! ocean space domain variables
-   USE oce             ! dynamics and tracers variables
+   USE sbc_oce         ! surface boundary condition: ocean
    USE trdmod_oce      ! ocean variables trends
    USE daymod          ! calendar
@@ -59 +60 @@
 
    USE phycst          ! physical constant                  (par_cst routine)
-#if defined key_lim3
-   USE iceini          ! initialization of sea-ice         (ice_init routine)
-#endif
-#if defined key_lim2
-   USE iceini_2        ! initialization of sea-ice         (ice_init_2 routine)
-#endif
-   USE cpl             ! coupled ocean/atmos.              (cpl_init routine)
    USE ocfzpt          ! ocean freezing point              (oc_fz_pt routine)
    USE trdmod          ! momentum/tracers trends       (trd_mod_init routine)
-   USE flxfwb          ! freshwater budget correction  (flx_fwb_init routine)
-   USE flxmod          ! thermohaline forcing of the ocean (flx_init routine)
 
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
@@ -99 +91 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/opa.F90,v 1.38 2007/06/05 10:32:02 opalod Exp $ 
+   !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -281 +273 @@
       IF( lk_obc    )   CALL obc_init       ! Open boundaries 
 
-      CALL day( nit000 )                    ! Calendar
-
       CALL istate_init                      ! ocean initial state (Dynamics and tracers)
 
       CALL oc_fz_pt                         ! Surface freezing point
-
-#if defined key_lim3
-      CALL ice_init                         ! Sea ice model LIM3
-#endif
-
-#if defined key_lim2
-      CALL ice_init_2                       ! Sea ice model LIM2
-#endif
 
       !                                     ! Ocean physics
@@ -319 +301 @@
       CALL cpl_prism_define
 #endif
-
-      CALL flx_init                         ! Thermohaline forcing initialization
-
-      CALL flx_fwb_init                     ! FreshWater Budget correction
 
       CALL dia_ptr_init                     ! Poleward TRansports initialization
@@ -475 +453 @@
       USE dtatem        ! temperature data
       USE dtasal        ! salinity data
-      USE dtasst        ! sea surface temperature data
       !!----------------------------------------------------------------------