Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/par_oce.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -81 +81 @@
    !!---------------------------------------------------------------------
 #             include "par_POMME_R025.h90"
+#elif defined key_amm_12km
+   !!---------------------------------------------------------------------
+   !!   'key_amm_12km':                    Atlantic Margin Model : AMM12km 
+   !!---------------------------------------------------------------------
+#             include "par_AMM_12km.h90"
 #else
    !!---------------------------------------------------------------------
@@ -96 +101 @@
    INTEGER, PUBLIC, PARAMETER ::   jpiglo  = jpidta   !: 1st dimension of global domain --> i
    INTEGER, PUBLIC, PARAMETER ::   jpjglo  = jpjdta   !: 2nd    -                  -    --> j
-   INTEGER, PUBLIC            ::   jpk     = jpkdta   !: number of vertical levels
+
    ! zoom starting position 
    INTEGER, PUBLIC, PARAMETER ::   jpizoom =   1      !: left bottom (i,j) indices of the zoom
@@ -171 +176 @@
    INTEGER, PUBLIC  ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
    INTEGER, PUBLIC  ::   jpj   ! = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
-   INTEGER, PUBLIC  ::   jpk   ! = jpkdta                                             !: third dimension
+   INTEGER, PUBLIC  ::   jpk   ! = jpkdta
    INTEGER, PUBLIC  ::   jpim1 ! = jpi-1                                            !: inner domain indices
    INTEGER, PUBLIC  ::   jpjm1 ! = jpj-1                                            !:   -     -      -