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

Timestamp:

2006-09-27T10:52:29+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_064 : CT : general trends update including the addition of mean windows analysis possibility in the mixed layer

File:

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

trunk/NEMO/OPA_SRC/opa.F90

@@ -62 +62 @@
    USE cpl             ! coupled ocean/atmos.              (cpl_init routine)
    USE ocfzpt          ! ocean freezing point              (oc_fz_pt routine)
-   USE trdicp          ! momentum/tracers trends       (trd_icp_init routine)
-   USE trdvor          ! vorticity trends              (trd_vor_init routine)
-   USE trdmld          ! tracer mixed layer trends     (trd_mld_init 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)
@@ -280 +278 @@
       CALL zdf_init                             ! Vertical ocean physics
 
-      !                                     ! Ocean trends
-      ! Control parameters 
-      IF( lk_trdtra .OR. lk_trdmld )   l_trdtra = .TRUE.
-      IF( lk_trddyn .OR. lk_trdvor )   l_trddyn = .TRUE.
-
-      IF( lk_trddyn .OR. lk_trdtra )   &
-         &            CALL trd_icp_init         ! active tracers and/or momentum
-
-      IF( lk_trdmld ) CALL trd_mld_init         ! mixed layer
-
-      IF( lk_trdvor ) CALL trd_vor_init         ! vorticity
+      CALL trd_mod_init                         ! Mixed-layer/Vorticity/Integral constraints trends
+
 
 #if defined key_passivetrc