Changeset 14789 for NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/OCE/par_oce.F90

Timestamp:

2021-05-05T13:18:04+02:00 (3 years ago)

Author:

mcastril

Message:

[2021/HPC-11_mcastril_HPDAonline_DiagGPU] Update externals

Location:

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

Files:

• . (modified) (1 prop)
• src/OCE/par_oce.F90 (modified) (3 diffs)

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/OCE/par_oce.F90

@@ -22 +22 @@
    !
    LOGICAL       ::   ln_use_jattr     !: input file read offset
-   !                                   !  Use file global attribute: open_ocean_jstart to determine start j-row 
-   !                                   !  when reading input from those netcdf files that have the 
-   !                                   !  attribute defined. This is designed to enable input files associated 
-   !                                   !  with the extended grids used in the under ice shelf configurations to 
+   !                                   !  Use file global attribute: open_ocean_jstart to determine start j-row
+   !                                   !  when reading input from those netcdf files that have the
+   !                                   !  attribute defined. This is designed to enable input files associated
+   !                                   !  with the extended grids used in the under ice shelf configurations to
    !                                   !  be used without redundant rows when the ice shelves are not in use.
    LOGICAL       ::   ln_closea        !: (=T) special treatment of closed sea
-   ! 
+   !
 
    !!---------------------------------------------------------------------
-   !! Domain Matrix size 
+   !! Domain Matrix size
    !!---------------------------------------------------------------------
    ! configuration name & resolution   (required only in ORCA family case)
    CHARACTER(lc) ::   cn_cfg           !: name of the configuration
-   INTEGER       ::   nn_cfg           !: resolution of the configuration 
+   INTEGER       ::   nn_cfg           !: resolution of the configuration
 
    ! time dimension
@@ -65 +65 @@
    INTEGER, PUBLIC ::   jpjmax! = ( Nj0glo + jpnj-1 ) / jpnj + 2*nn_hls            !: maximum jpj
 
+   ! Domain tiling
+   INTEGER, PUBLIC ::   nijtile    !: number of tiles in total
+   INTEGER, PUBLIC ::   ntile      !: current tile number
+   INTEGER, PUBLIC ::   ntsi       !: start of internal part of tile domain
+   INTEGER, PUBLIC ::   ntsj       !
+   INTEGER, PUBLIC ::   ntei       !: end of internal part of tile domain
+   INTEGER, PUBLIC ::   ntej       !
+
    !!---------------------------------------------------------------------
    !! Active tracer parameters
@@ -76 +84 @@
    !!----------------------------------------------------------------------
    !! if we dont use massively parallel computer (parameters jpni=jpnj=1) so jpiglo=jpi and jpjglo=jpj
-   INTEGER, PUBLIC            ::   jpni         !: number of processors following i 
+   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 )
-   INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo 
-   INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo 
+   INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo
+   INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo
 
    ! halo with and starting/inding DO-loop indices
-   INTEGER, PUBLIC ::   nn_hls   !: halo width (applies to both rows and columns)
-   INTEGER, PUBLIC ::   Nis0, Nis1, Nis1nxt2, Nis2   !: start I-index (_0: without halo, _1 or _2: with 1 or 2 halos)
-   INTEGER, PUBLIC ::   Nie0, Nie1, Nie1nxt2, Nie2   !: end   I-index (_0: without halo, _1 or _2: with 1 or 2 halos)
-   INTEGER, PUBLIC ::   Njs0, Njs1, Njs1nxt2, Njs2   !: start J-index (_0: without halo, _1 or _2: with 1 or 2 halos)
-   INTEGER, PUBLIC ::   Nje0, Nje1, Nje1nxt2, Nje2   !: end   J-index (_0: without halo, _1 or _2: with 1 or 2 halos)
-   INTEGER, PUBLIC ::   Ni_0, Nj_0, Ni_1, Nj_1, Ni_2, Nj_2   !: domain size (_0: without halo, _1 or _2: with 1 or 2 halos)
-   INTEGER, PUBLIC ::   Ni0glo, Nj0glo
+   INTEGER, PUBLIC ::   nn_hls           !: halo width (applies to both rows and columns)
+   INTEGER, PUBLIC ::   Nis0             !: start I-index without halo
+   INTEGER, PUBLIC ::   Nie0             !: end   I-index without halo
+   INTEGER, PUBLIC ::   Njs0             !: start J-index without halo
+   INTEGER, PUBLIC ::   Nje0             !: end   J-index without halo
+   INTEGER, PUBLIC ::   Ni_0, Nj_0       !: local domain size without halo
+   INTEGER, PUBLIC ::   Ni0glo, Nj0glo   !: global domain size without halo
 
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!======================================================================

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette