Ignore:
Timestamp:
2020-12-04T08:48:38+01:00 (3 months ago)
Author:
laurent
Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/par_oce.F90

    r13982 r14072  
    2222   ! 
    2323   LOGICAL       ::   ln_use_jattr     !: input file read offset 
    24    !                                   !  Use file global attribute: open_ocean_jstart to determine start j-row  
    25    !                                   !  when reading input from those netcdf files that have the  
    26    !                                   !  attribute defined. This is designed to enable input files associated  
    27    !                                   !  with the extended grids used in the under ice shelf configurations to  
     24   !                                   !  Use file global attribute: open_ocean_jstart to determine start j-row 
     25   !                                   !  when reading input from those netcdf files that have the 
     26   !                                   !  attribute defined. This is designed to enable input files associated 
     27   !                                   !  with the extended grids used in the under ice shelf configurations to 
    2828   !                                   !  be used without redundant rows when the ice shelves are not in use. 
    2929   LOGICAL       ::   ln_closea        !: (=T) special treatment of closed sea 
    30    !  
     30   ! 
    3131 
    3232   !!--------------------------------------------------------------------- 
    33    !! Domain Matrix size  
     33   !! Domain Matrix size 
    3434   !!--------------------------------------------------------------------- 
    3535   ! configuration name & resolution   (required only in ORCA family case) 
    3636   CHARACTER(lc) ::   cn_cfg           !: name of the configuration 
    37    INTEGER       ::   nn_cfg           !: resolution of the configuration  
     37   INTEGER       ::   nn_cfg           !: resolution of the configuration 
    3838 
    3939   ! time dimension 
     
    8484   !!---------------------------------------------------------------------- 
    8585   !! if we dont use massively parallel computer (parameters jpni=jpnj=1) so jpiglo=jpi and jpjglo=jpj 
    86    INTEGER, PUBLIC            ::   jpni         !: number of processors following i  
     86   INTEGER, PUBLIC            ::   jpni         !: number of processors following i 
    8787   INTEGER, PUBLIC            ::   jpnj         !: number of processors following j 
    8888   INTEGER, PUBLIC            ::   jpnij        !: nb of local domain = nb of processors ( <= jpni x jpnj ) 
    89    INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo  
    90    INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo  
     89   INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo 
     90   INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo 
    9191 
    9292   ! halo with and starting/inding DO-loop indices 
     
    101101   !!---------------------------------------------------------------------- 
    102102   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    103    !! $Id$  
     103   !! $Id$ 
    104104   !! Software governed by the CeCILL license (see ./LICENSE) 
    105105   !!====================================================================== 
Note: See TracChangeset for help on using the changeset viewer.