Changeset 3584 for branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90

Timestamp:

2012-11-16T17:21:47+01:00 (11 years ago)

Author:

cetlod

Message:

Add in branch 2012/dev_LOCEAN_2012 changes from dev_r3438_LOCEAN15_PISLOB & dev_r3387_LOCEAN6_AGRIF_LIM, see ticket 1000

File:

• branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90 (modified) (2 diffs)

branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/TOP_SRC/CFC/par_cfc.F90

@@ -10 +10 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-   USE par_lobster, ONLY : jp_lobster      !: number of tracers in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_2d   !: number of 2D diag in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_3d   !: number of 3D diag in LOBSTER
-   USE par_lobster, ONLY : jp_lobster_trd  !: number of biological diag in LOBSTER
-
    USE par_pisces , ONLY : jp_pisces       !: number of tracers in PISCES
    USE par_pisces , ONLY : jp_pisces_2d    !: number of 2D diag in PISCES
@@ -22 +17 @@
    IMPLICIT NONE
 
-   INTEGER, PARAMETER ::   jp_lc      = jp_lobster     + jp_pisces     !: cumulative number of passive tracers
-   INTEGER, PARAMETER ::   jp_lc_2d   = jp_lobster_2d  + jp_pisces_2d  !:
-   INTEGER, PARAMETER ::   jp_lc_3d   = jp_lobster_3d  + jp_pisces_3d  !:
-   INTEGER, PARAMETER ::   jp_lc_trd  = jp_lobster_trd + jp_pisces_trd !:
+   INTEGER, PARAMETER ::   jp_lc      =  jp_pisces     !: cumulative number of passive tracers
+   INTEGER, PARAMETER ::   jp_lc_2d   =  jp_pisces_2d  !:
+   INTEGER, PARAMETER ::   jp_lc_3d   =  jp_pisces_3d  !:
+   INTEGER, PARAMETER ::   jp_lc_trd  =  jp_pisces_trd !:
    
 #if defined key_cfc