Index: trunk/NEMOGCM/NEMO/OPA_SRC/par_TROP12.h90
===================================================================
--- trunk/NEMOGCM/NEMO/OPA_SRC/par_TROP12.h90	(revision 12)
+++ trunk/NEMOGCM/NEMO/OPA_SRC/par_TROP12.h90	(revision 32)
@@ -1,12 +1,26 @@
    !!---------------------------------------------------------------------
-   !!                     ***  par_trop12.h90  ***  
-   !!   Ocean Domain : 0.25 degrees resolution Tropical Channel
-   !!                  (0RCA_R025 configuration)
+   !!                     ***  par_trop12.h90  ***
+   !!   Ocean Domain : 1/12 degrees resolution Tropical Channel
+   !!                  (TROP12 configuration)
    !!---------------------------------------------------------------------
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: par_ORCA_R2.h90 2715 2011-03-30 15:58:35Z rblod $ 
+   !! $Id: par_ORCA_R2.h90 2715 2011-03-30 15:58:35Z rblod $
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
+
+   !!  Values set to pp_not_used indicates that this parameter is not used in THIS config.
+   !!  Values set to pp_to_be_computed  indicates that variables will be computed in domzgr
+   REAL,PARAMETER      ::  pp_not_used = 999999_wp , &
+      &                    pp_to_be_computed = 0._wp
+
+   !!---------------------------------------------------------------------
+   !!   Vertical Domain
+   !!---------------------------------------------------------------------
+# include "par_depth.h90"
+
+   !!---------------------------------------------------------------------
+   !!   Horizontal Domain
+   !!---------------------------------------------------------------------
    CHARACTER (len=16)      &
 #if !defined key_agrif
@@ -23,10 +37,11 @@
       !
       jpidta    = 4322,  &
-      jpjdta    = 1249,  &  
-#if key_trop12==75
-      jpkdta  = 75 ,         &  !: number of levels           > or = to jpk
-#else
-      jpkdta  = 46 ,         &  !: number of levels           > or = to jpk
+      jpjdta    = 1249  
+
+   INTEGER     &
+#if !defined key_agrif
+      , PARAMETER  &
 #endif
+      :: &
       ! total domain matrix size
       jpiglo  = jpidta,      &  !: first  dimension of global domain --> i
@@ -36,10 +51,11 @@
       jpjzoom =   1   ,      &  !: in data indices
       ! Domain characteristics
-      jperio  =   1             !: lateral cond. type (between 0 and 6)
+      jperio  =  1       !: lateral cond. type (between 0 and 6)
+      !                  !  = 0 closed                 ;   = 1 cyclic East-West
+      !                  !  = 2 equatorial symmetric   ;   = 3 North fold T-point pivot
+      !                  !  = 4 cyclic East-West AND North fold T-point pivot
+      !                  !  = 5 North fold F-point pivot
+      !                  !  = 6 cyclic East-West AND North fold F-point pivot
 
-   !!  Values set to pp_not_used indicates that this parameter is not used in THIS config.
-   !!  Values set to pp_to_be_computed  indicates that variables will be computed in domzgr
-   REAL,PARAMETER      ::  pp_not_used = 999999_wp , &
-      &                    pp_to_be_computed = 0._wp
    !!
    !! Coefficients associated with the horizontal coordinate system (jphgr_msh /= 0 )
@@ -69,58 +85,3 @@
       ppe2_m   = pp_not_used       !: meridional grid-spacing (meters )
 
-   !!  Coefficients associated with the vertical coordinate system
-
-#if key_trop12==75
-   REAL(wp), PARAMETER  ::       &
-      &     ppsur =  -3958.951371276829_wp  ,  &  !: ORCA r1 coefficients
-      &     ppa0  =   103.9530096000000_wp  ,  &  !: (75 levels case)
-      &     ppa1  =   2.415951269000000_wp  ,  &  !:
-      &     ppkth =   15.35101370000000_wp  ,  &  !: (non dimensional): gives the approximate
-      !                                           !: layer number above which  stretching will
-      !                                           !: be maximum. Usually of order jpk/2.
-      &     ppacr =       7.00000000000_wp        !: (non dimensional): stretching factor
-      !                                           !: for the grid. The higher zacr, the smaller
-      !                                           !: the stretching.
-   !!
-   !!  If both ppa0 ppa1 and ppsur are specified to pp_to_be_computed, then
-   !!  they are computed from ppdzmin, pphmax , ppkth, ppacr in dom_zgr
-   !!
-   REAL(wp), PARAMETER ::                      &
-      &     ppdzmin = pp_not_used           ,  &  !: (meters) vertical thickness of the top layer
-      &     pphmax  = pp_not_used                 !: (meters) Maximum depth of the ocean gdepw(jpk)
-   !!
-   LOGICAL,  PARAMETER ::                      &
-      &     ldbletanh = .TRUE.                    !: Use/do not use double tanf function for vertical coordinates
-   REAL(wp), PARAMETER ::                      &
-      &     ppa2  =   100.7609285000000_wp  ,  &  !: Double tanh function parameters
-      &     ppkth2=   48.02989372000000_wp  ,  &  !:
-      &     ppacr2=    13.00000000000_wp          !:
-      !
-#else
-   REAL(wp), PARAMETER  ::       &
-      &     ppsur = pp_to_be_computed ,        &  !: Computed in domzgr, set ppdzmin and pphmax below
-      &     ppa0  = pp_to_be_computed ,        &  !:    "           "
-      &     ppa1  = pp_to_be_computed ,        &  !:    "           "
-      !
-      &     ppkth =  23.563_wp        ,        &  !: (non dimensional): gives the approximate
-      !                                           !: layer number above which  stretching will
-      !                                           !: be maximum. Usually of order jpk/2.
-      &     ppacr =   9.00000000000_wp            !: (non dimensional): stretching factor
-      !                                           !: for the grid. The highest zacr, the smallest
-      !                                           !: the stretching.
-   !!
-   !!  If both ppa0 ppa1 and ppsur are specified to pp_to_be_computed, then
-   !!  they are computed from ppdzmin, pphmax , ppkth, ppacr in dom_zgr
-   !!
-   REAL(wp), PARAMETER ::                      &
-      &     ppdzmin = 6._wp           ,        &  !: (meters) vertical thickness of the top layer
-      &     pphmax  = 5750._wp                    !: (meters) Maximum depth of the ocean gdepw(jpk)
-   !!
-   LOGICAL,  PARAMETER ::                      &
-      &     ldbletanh = .FALSE.                   !: Use/do not use double tanf function for vertical coordinates
-   REAL(wp), PARAMETER ::                      &
-      &     ppa2    = pp_not_used           ,  &  !: Double tanh function parameters
-      &     ppkth2  = pp_not_used           ,  &  !:
-      &     ppacr2  = pp_not_used                 !:
-#endif
    !!---------------------------------------------------------------------
