Changeset 3318 for branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_oce.F90

Timestamp:

2012-02-25T16:50:01+01:00 (12 years ago)

Author:

gm

Message:

Ediag branche: #927 split TRA/DYN trd computation

File:

• branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_oce.F90 (modified) (6 diffs)

branches/2012/dev_r3309_LOCEAN12_Ediag/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld_oce.F90

@@ -5 +5 @@
    !!======================================================================
    !! History :  1.0  ! 2004-08  (C. Talandier)  New trends organization
+   !!            3.5  ! 2012-02  (G. Madec) suppress the trend keys
    !!----------------------------------------------------------------------
    USE par_oce        ! ocean parameters
@@ -13 +14 @@
    PUBLIC   trdmld_oce_alloc    ! Called in trdmld.F90
 
-#if defined key_trdmld
-   LOGICAL, PUBLIC, PARAMETER ::   lk_trdmld = .TRUE.    !: ML trend flag
-#else
-   LOGICAL, PUBLIC, PARAMETER ::   lk_trdmld = .FALSE.   !: ML trend flag
-#endif
-   !!* mixed layer trends indices
-   INTEGER, PARAMETER, PUBLIC ::   jpltrd = 11      !: number of mixed-layer trends arrays
+   !                                                !* mixed layer trend indices
+   INTEGER, PUBLIC, PARAMETER ::   jpltrd = 11      !: number of mixed-layer trends arrays
    INTEGER, PUBLIC            ::   jpktrd           !: max level for mixed-layer trends diag.
    !
@@ -35 +31 @@
    INTEGER, PUBLIC, PARAMETER ::   jpmld_atf = 11   !:  asselin trend (**MUST BE THE LAST ONE**)
 
-#if   defined  key_trdmld   ||   defined key_esopa
-   !!----------------------------------------------------------------------
-   !!   'key_trdmld'                         mixed layer trends diagnostics
-   !!----------------------------------------------------------------------
 
    !! Arrays used for diagnosing mixed-layer trends 
@@ -79 +71 @@
       smltrd_csum_ln,               & !:    ( idem for salinity )
       smltrd_csum_ub                  !: 
-#endif
+
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011)
@@ -101 +93 @@
      ierr(:) = 0
 
-#if   defined  key_trdmld   ||   defined key_esopa
      ALLOCATE( nmld(jpi,jpj), nbol(jpi,jpj),       &
         &      wkx(jpi,jpj,jpk), rmld(jpi,jpj),    & 
@@ -125 +116 @@
         &      tmltrd_csum_ub(jpi,jpj,jpltrd), smltrd_sum(jpi,jpj,jpltrd),     &
         &      smltrd_csum_ln(jpi,jpj,jpltrd), smltrd_csum_ub(jpi,jpj,jpltrd), STAT=ierr(5) )
-#endif
       !
       trdmld_oce_alloc = MAXVAL( ierr )