Changeset 14951

Timestamp:

2021-06-04T17:35:08+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, change grid positioning convention (again) in case of closed boundaries over parent grid. Accounting for 1 extra land cell in that case, child grids have to be shifted by 1 point to the South East.

Location:

NEMO/branches/2021/dev_r14608_AGRIF_domcfg

Files:

• src/NST/agrif_user.F90 (modified) (4 diffs)
• tests/DOME/EXPREF/AGRIF_FixedGrids.in (modified) (1 diff)
• tests/DOME/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
• tests/ICE_AGRIF/EXPREF/AGRIF_FixedGrids.in (modified) (1 diff)
• tests/OVERFLOW/EXPREF/AGRIF/AGRIF_FixedGrids.in (modified) (1 diff)
• tests/VORTEX/EXPREF/AGRIF_FixedGrids.in (modified) (1 diff)
• tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/src/NST/agrif_user.F90

@@ -57 +57 @@
       !
       INTEGER :: ind1, ind2, ind3, imaxrho
+      INTEGER :: nbghostcellsfine_tot_x, nbghostcellsfine_tot_y
       INTEGER :: its
       External :: nemo_mapping
@@ -78 +79 @@
       ! 1. Declaration of the type of variable which have to be interpolated
       !---------------------------------------------------------------------
-      ind1 =              nbghostcells 
+!      ind1 =              nbghostcells 
       ind2 = nn_hls + 1 + nbghostcells_x
       ind3 = nn_hls + 1 + nbghostcells_y_s
+      nbghostcellsfine_tot_x = nbghostcells_x+1
+      nbghostcellsfine_tot_y = MAX(nbghostcells_y_s,nbghostcells_y_n)+1
+      ind1 = MAX(nbghostcellsfine_tot_x, nbghostcellsfine_tot_y)
       imaxrho = MAX(Agrif_irhox(), Agrif_irhoy())
 
@@ -855 +859 @@
          nbghostcells_y_s = nbghostcells
          nbghostcells_y_n = nbghostcells
-
-         lk_west  = .NOT. ( Agrif_Ix() == 1 )
-         lk_east  = .NOT. ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo) + 1 )
-         lk_south = .NOT. ( Agrif_Iy() == 1 )
-         lk_north = .NOT. ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo) + 1 )
+ 
+
+         lk_west  = .TRUE.
+         lk_east  = .TRUE.
+         lk_south = .TRUE.
+         lk_north = .TRUE.
          !
          ! Correct number of ghost cells according to periodicity
          !
-         IF(    l_Iperio    )   nbghostcells_x   = 0
-         IF( .NOT. lk_south )   nbghostcells_y_s = 0
-         IF( .NOT. lk_north )   nbghostcells_y_n = 0
+         IF( l_Iperio         ) THEN ; lk_west  = .FALSE. ; lk_east = .FALSE. ; nbghostcells_x = 0 ; ENDIF
+         IF( Agrif_Iy() == 1  ) THEN ; lk_south = .FALSE. ; nbghostcells_y_s = 1 ; ENDIF
+         IF( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() ==  Agrif_Parent(Nj0glo) - 1 ) THEN ; lk_north = .FALSE. ; nbghostcells_y_n = 1 ; ENDIF
          !
          ! Some checks
@@ -877 +882 @@
       ELSE
          ! Root grid
-         nbghostcells_x   = 0
-         nbghostcells_y_s = 0
-         nbghostcells_y_n = 0
+         nbghostcells_x   = 1 
+         nbghostcells_y_s = 1 
+         nbghostcells_y_n = 1 
+         IF ( l_Iperio.OR.l_NFold ) THEN
+           nbghostcells_x = 0
+         ENDIF
+         IF ( l_NFold ) THEN
+           nbghostcells_y_n = 0 ! for completeness
+         ENDIF
       ENDIF
       !

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/DOME/EXPREF/AGRIF_FixedGrids.in

@@ -1 +1 @@
 1
-282 362 92 170 2 2 2   
+281 361 91 169 2 2 2   
 0

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/DOME/MY_SRC/usrdef_nam.F90

@@ -97 +97 @@
          ighost_n = nbghostcells
 
-         IF  ( Agrif_Ix() == 1 ) ighost_w = 0
-         IF  ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo)+1 ) ighost_e = 0
-         IF  ( Agrif_Iy() == 1 ) ighost_s = 0
-         IF  ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo)+1 ) ighost_n = 0
+         IF  ( Agrif_Ix() == 1 ) ighost_w = 1 
+         IF  ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo)-1 ) ighost_e = 1 
+         IF  ( Agrif_Iy() == 1 ) ighost_s = 1 
+         IF  ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo)-1 ) ighost_n = 1 
          kpi  = nbcellsx + ighost_w + ighost_e
          kpj  = nbcellsy + ighost_s + ighost_n

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/ICE_AGRIF/EXPREF/AGRIF_FixedGrids.in

@@ -1 +1 @@
 1
-35 64 35 64 3 3 3
+34 63 34 63 3 3 3
 0

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/OVERFLOW/EXPREF/AGRIF/AGRIF_FixedGrids.in

@@ -1 +1 @@
 1
-11 42 1 6 1 1 1 
+10 41 1 4 1 1 1 
 0

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/VORTEX/EXPREF/AGRIF_FixedGrids.in

@@ -1 +1 @@
 1
-23 42 23 42 3 3 3 
+22 41 22 41 3 3 3 
 0

NEMO/branches/2021/dev_r14608_AGRIF_domcfg/tests/VORTEX/MY_SRC/usrdef_nam.F90

@@ -97 +97 @@
          ighost_n = nbghostcells
 
-         IF  ( Agrif_Ix() == 1 ) ighost_w = 0 
-         IF  ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo)+1 ) ighost_e = 0 
-         IF  ( Agrif_Iy() == 1 ) ighost_s = 0 
-         IF  ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo)+1 ) ighost_n = 0 
+         IF  ( Agrif_Ix() == 1 ) ighost_w = 1 
+         IF  ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo) - 1 ) ighost_e = 1 
+         IF  ( Agrif_Iy() == 1 ) ighost_s = 1 
+         IF  ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo) - 1 ) ighost_n = 1 
 !         kpi  = nbcellsx + 2 * ( nbghostcells + 1 )
 !         kpj  = nbcellsy + 2 * ( nbghostcells + 1 )