New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13238 for NEMO/branches/2020 – NEMO

Changeset 13238 for NEMO/branches/2020


Ignore:
Timestamp:
2020-07-03T12:04:50+02:00 (4 years ago)
Author:
smasson
Message:

Extra_Halo: cosmetic modifications, see #2366

Location:
NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/NST/agrif_user.F90

    r13236 r13238  
    635635      USE Agrif_Util 
    636636      USE ice 
    637       USE par_oce, ONLY : nbghostcells, nbghostcells_x, nbghostcells_y_s 
    638637      ! 
    639638      IMPLICIT NONE 
    … …  
    888887      nbghostcells_y_n = nbghostcells 
    889888      ! 
    890       IF (   jperio == 1  ) nbghostcells_x   = 0 
    891       IF ( .NOT. lk_south ) nbghostcells_y_s = 0 
    892 PRINT*, 'seb ', narea, jpiglo, nbcellsx, nn_hls, nbghostcells_x 
     889      IF(   jperio == 1  )   nbghostcells_x   = 0 
     890      IF( .NOT. lk_south )   nbghostcells_y_s = 0 
    893891      ! Some checks 
    894892      IF( jpiglo /= nbcellsx + 2 + 2*nn_hls + nbghostcells_x   + nbghostcells_x   )   CALL ctl_stop( 'STOP',    & 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_nam.F90

    r13229 r13238  
    6969      kk_cfg = nn_GYRE 
    7070      ! 
    71       kpi = 30 * nn_GYRE + 2       ! Global Domain size: add 1 land point on each side 
    72       kpj = 20 * nn_GYRE + 2 
    73 #if defined key_agrif 
    74       IF( .NOT. Agrif_Root() ) THEN 
    75          kpi  = nbcellsx + 2 * ( nbghostcells_x   + 1 )   ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     71      IF( Agrif_Root() ) THEN         ! Global Domain size: add 1 land point on each side 
     72         kpi = 30 * nn_GYRE + 2       !                      
     73         kpj = 20 * nn_GYRE + 2 
     74      ELSE                            ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     75         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2 
    7676         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2 
    7777      ENDIF 
    78 #endif 
    7978      kpk = jpkglo 
    8079      !                             ! Set the lateral boundary condition of the global domain 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/par_oce.F90

    r13229 r13238  
    4747   ! global domain size for AGRIF     !!! * total AGRIF computational domain * 
    4848   INTEGER, PUBLIC            ::   nbug_in_agrif_conv_do_not_remove_or_modify = 1 - 1 
    49    INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 3 !: number of ghost cells: default value 
    50    INTEGER, PUBLIC            ::   nbghostcells_x   !: number of ghost cells in i-direction 
     49   INTEGER, PUBLIC, PARAMETER ::   nbghostcells = 3   !: number of ghost cells: default value 
     50   INTEGER, PUBLIC            ::   nbghostcells_x     !: number of ghost cells in i-direction 
    5151   INTEGER, PUBLIC            ::   nbghostcells_y_s   !: number of ghost cells in j-direction at south 
    52    INTEGER, PUBLIC            ::   nbghostcells_y_n   !: number of ghost cells in j-direction at north                       !: number of ghost cells 
    53    INTEGER, PUBLIC            ::   nbcellsx   ! = jpiglo - 2 - 2*nbghostcells_x   !: number of cells in i-direction 
    54    INTEGER, PUBLIC            ::   nbcellsy   ! = jpjglo - 2 - 2*nbghostcells-y   !: number of cells in j-direction 
     52   INTEGER, PUBLIC            ::   nbghostcells_y_n   !: number of ghost cells in j-direction at north 
     53   INTEGER, PUBLIC            ::   nbcellsx           !: number of cells in i-direction 
     54   INTEGER, PUBLIC            ::   nbcellsy           !: number of cells in j-direction 
    5555 
    5656   ! local domain size                !!! * local computational domain * 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/CANAL/MY_SRC/usrdef_nam.F90

    r12939 r13238  
    106106      kk_cfg = INT( rn_dx ) 
    107107      ! 
    108       ! Global Domain size:  EW_CANAL global domain is  1800 km x 1800 Km x 5000 m 
    109       kpi = NINT( rn_domszx / rn_dx ) + 1 
    110       kpj = NINT( rn_domszy / rn_dy ) + 3 
    111       kpk = NINT( rn_domszz / rn_dz ) + 1 
    112 #if defined key_agrif 
    113       IF( .NOT. Agrif_Root() ) THEN 
    114          kpi  = nbcellsx + 2 + 2*nbghostcells 
    115          kpj  = nbcellsy + 2 + 2*nbghostcells 
     108      IF( Agrif_Root() ) THEN        ! Global Domain size:  EW_CANAL global domain is  1800 km x 1800 Km x 5000 m 
     109         kpi = NINT( rn_domszx / rn_dx ) + 1 
     110         kpj = NINT( rn_domszy / rn_dy ) + 3 
     111      ELSE                           ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     112         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2 
     113         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2 
    116114      ENDIF 
    117 #endif 
     115      kpk = MAX( 2, NINT( rn_domszz / rn_dz ) + 1 ) 
    118116      ! 
    119117      zh  = (kpk-1)*rn_dz 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_ADV2D/MY_SRC/usrdef_nam.F90

    r13065 r13238  
    8282      kk_cfg = NINT( rn_dx ) 
    8383      ! 
    84       IF( Agrif_Root() ) THEN        ! Global Domain size:  ICE_AGRIF domain is  300 km x 300 Km x 10 m 
     84      IF( Agrif_Root() ) THEN        ! Global Domain size: ICE_AGRIF domain is  300 km x 300 Km x 10 m 
    8585         kpi = NINT( 300.e3 / rn_dx ) - 1 
    8686         kpj = NINT( 300.e3 / rn_dy ) - 1 
    87       ELSE 
    88          kpi = nbcellsx + 2 * ( nbghostcells + 1 )   ! Global Domain size: add nbghostcells + 1 "land" point on each side 
    89          kpj = nbcellsy + 2 * ( nbghostcells + 1 ) 
     87      ELSE                           ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     88         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2 
     89         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2 
    9090      ENDIF 
    91       kpk = 1 
     91      kpk = 2 
    9292      ! 
    9393!!      zlx = (kpi-2)*rn_dx*1.e-3 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90

    r13065 r13238  
    8787         kpi = kpi - 2   ! for compatibility with old version (because kerio=7) --> to be removed 
    8888         kpj = kpj - 2   ! for compatibility with old version (because kerio=7) --> to be removed 
    89       ELSE 
    90          kpi  = nbcellsx + 2 * ( nbghostcells + 1 )   ! Global Domain size: add nbghostcells + 1 "land" point on each side 
    91          kpj  = nbcellsy + 2 * ( nbghostcells + 1 ) 
     89      ELSE                           ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     90         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2 
     91         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2 
    9292      ENDIF 
    9393      kpk = 2 

  • NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/tests/VORTEX/MY_SRC/usrdef_nam.F90

    r13065 r13238  
    8484         kpi = NINT( 1800.e3  / rn_dx ) + 3   
    8585         kpj = NINT( 1800.e3  / rn_dy ) + 3  
    86       ELSE 
    87          kpi  = nbcellsx + 2 * ( nbghostcells + 1 )   ! Global Domain size: add nbghostcells + 1 "land" point on each side 
    88          kpj  = nbcellsy + 2 * ( nbghostcells + 1 ) 
     86      ELSE                          ! Global Domain size: add nbghostcells + 1 "land" point on each side 
     87         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2 
     88         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2 
    8989      ENDIF 
    9090      kpk = NINT( 5000._wp / rn_dz ) + 1 
Note: See TracChangeset for help on using the changeset viewer.