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

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

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

trunk/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    !! if we dont use massively parallel computer (parameters jpni=jpnj=1) so jpiglo=jpi and jpjglo=jpj
-#if ! defined key_mpp_dyndist 
-   INTEGER, PUBLIC, PARAMETER ::    &  !:
-# if ! defined key_nproci
-      jpni   = 1,                   &  !: number of processors following i
-      jpnj   = 1,                   &  !: number of processors following j
-      jpnij  = 1                       !: nb of local domain = nb of processors 
-      !                                !  ( <= jpni x jpnj )
-# else
-      jpni   = key_nproci,          &  !: number of processors following i
-      jpnj   = key_nprocj,          &  !: number of processors following j
-#  if ! defined key_nprocij
-      jpnij  = key_nproci * key_nprocj !: nb of local domain = nb of processors 
-      !                                !  ( <= jpni x jpnj )
-#  else
-      jpnij  = key_nprocij             !: nb of local domain = nb of processors 
-      !                                !  ( <= jpni x jpnj )
-#  endif
-# endif
-#else
    INTEGER, PUBLIC            ::   jpni         !: number of processors following i 
    INTEGER, PUBLIC            ::   jpnj         !: number of processors following j
    INTEGER, PUBLIC            ::   jpnij        !: nb of local domain = nb of processors ( <= jpni x jpnj )
-#endif
    INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo 
    INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo 
@@ -116 +96 @@
    INTEGER, PUBLIC, PARAMETER ::   jpiglo  = jpidta   !: 1st dimension of global domain --> i
    INTEGER, PUBLIC, PARAMETER ::   jpjglo  = jpjdta   !: 2nd    -                  -    --> j
-   INTEGER, PUBLIC, PARAMETER ::   jpk     = jpkdta   !: number of vertical levels
+   INTEGER, PUBLIC            ::   jpk     = jpkdta   !: number of vertical levels
    ! zoom starting position 
    INTEGER, PUBLIC, PARAMETER ::   jpizoom =   1      !: left bottom (i,j) indices of the zoom
@@ -188 +168 @@
    INTEGER, PUBLIC            ::   nbcellsy     = jpjglo - 2 - 2*nbghostcells   !: number of cells in j-direction
    !
-   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            ::   jpim1 = jpi-1                                            !: inner domain indices
-   INTEGER, PUBLIC            ::   jpjm1 = jpj-1                                            !:   -     -      -
-   INTEGER, PUBLIC            ::   jpkm1 = jpk-1                                            !:   -     -      -
-   INTEGER, PUBLIC            ::   jpij  = jpi*jpj                                          !:  jpi x jpj
-#else
-   INTEGER, PUBLIC, PARAMETER ::   jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
-   INTEGER, PUBLIC, PARAMETER ::   jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
-   INTEGER, PUBLIC, PARAMETER ::   jpim1 = jpi-1                                            !: inner domain indices
-   INTEGER, PUBLIC, PARAMETER ::   jpjm1 = jpj-1                                            !:   -     -      -
-   INTEGER, PUBLIC, PARAMETER ::   jpkm1 = jpk-1                                            !:   -     -      -
-   INTEGER, PUBLIC, PARAMETER ::   jpij  = jpi*jpj                                          !:  jpi x jpj
 #endif
+   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  ::   jpim1 ! = jpi-1                                            !: inner domain indices
+   INTEGER, PUBLIC  ::   jpjm1 ! = jpj-1                                            !:   -     -      -
+   INTEGER, PUBLIC  ::   jpkm1 ! = jpk-1                                            !:   -     -      -
+   INTEGER, PUBLIC  ::   jpij  ! = jpi*jpj                                          !:  jpi x jpj
 
    !!---------------------------------------------------------------------