Changeset 14976 for NEMO/trunk/tests/VORTEX/MY_SRC/usrdef_nam.F90

Timestamp:

2021-06-11T11:14:27+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, merge dev_14608_AGRIF_domcfg branch into trunk

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• tests/VORTEX/MY_SRC/usrdef_nam.F90 (modified) (2 diffs)

NEMO/trunk

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/trunk/tests/VORTEX/MY_SRC/usrdef_nam.F90

@@ -60 +60 @@
       !
       INTEGER ::   ios          ! Local integer
+      INTEGER :: ighost_n, ighost_s, ighost_w, ighost_e
       REAL(wp)::   zlx, zly, zh ! Local scalars
       !!
@@ -83 +84 @@
       kk_cfg = nINT( rn_dx )
       !
+#if defined key_agrif 
       IF( Agrif_Root() ) THEN       ! Global Domain size:  VORTEX global domain is  1800 km x 1800 Km x 5000 m
+#endif
          kpi = NINT( 1800.e3  / rn_dx ) + 3  
          kpj = NINT( 1800.e3  / rn_dy ) + 3 
+#if defined key_agrif 
       ELSE                          ! Global Domain size: add nbghostcells + 1 "land" point on each side
-         kpi  = nbcellsx + 2 * ( nbghostcells + 1 )
-         kpj  = nbcellsy + 2 * ( nbghostcells + 1 )
-!!$         kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2
-!!$         kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
+         ! At this stage, child ghosts have not been set
+         ighost_w = nbghostcells
+         ighost_e = nbghostcells
+         ighost_s = nbghostcells
+         ighost_n = nbghostcells
+
+         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 )
+         kpi  = nbcellsx + ighost_w + ighost_e 
+         kpj  = nbcellsy + ighost_s + ighost_n
       ENDIF
+#endif
       kpk = NINT( 5000._wp / rn_dz ) + 1
       !

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL