Changeset 14675 for NEMO

Timestamp:

2021-04-06T14:44:31+02:00 (3 years ago)

Author:

ldebreu

Message:

AGFdomcfg: corrections for east-west cyclic grids, #2368

File:

• NEMO/branches/2021/dev_r14608_AGRIF_domcfg/src/NST/agrif_user.F90 (modified) (6 diffs)

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

@@ -79 +79 @@
       !---------------------------------------------------------------------
       ind1 =              nbghostcells 
-      ind2 = nn_hls + 2 + nbghostcells_x
-      ind3 = nn_hls + 2 + nbghostcells_y_s
+      ind2 = nn_hls + 1 + nbghostcells_x
+      ind3 = nn_hls + 1 + nbghostcells_y_s
       imaxrho = MAX(Agrif_irhox(), Agrif_irhoy())
 
@@ -429 +429 @@
       !---------------------------------------------------------------------
       ind1 =              nbghostcells
-      ind2 = nn_hls + 2 + nbghostcells_x
-      ind3 = nn_hls + 2 + nbghostcells_y_s
+      ind2 = nn_hls + 1 + nbghostcells_x
+      ind3 = nn_hls + 1 + nbghostcells_y_s
       imaxrho = MAX(Agrif_irhox(), Agrif_irhoy())
 
@@ -629 +629 @@
       !-------------------------------------------------------------------------------------
       ind1 =              nbghostcells
-      ind2 = nn_hls + 2 + nbghostcells_x
-      ind3 = nn_hls + 2 + nbghostcells_y_s
+      ind2 = nn_hls + 1 + nbghostcells_x
+      ind3 = nn_hls + 1 + nbghostcells_y_s
       ipl = jpl*(9+nlay_s+nlay_i)
       CALL agrif_declare_variable((/2,2,0/),(/ind2,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,ipl/),tra_ice_id)
@@ -769 +769 @@
       !---------------------------------------------------------------------
       ind1 =              nbghostcells
-      ind2 = nn_hls + 2 + nbghostcells_x
-      ind3 = nn_hls + 2 + nbghostcells_y_s
+      ind2 = nn_hls + 1 + nbghostcells_x
+      ind3 = nn_hls + 1 + nbghostcells_y_s
       imaxrho = MAX(Agrif_irhox(), Agrif_irhoy())
 
@@ -857 +857 @@
 
          lk_west  = .NOT. ( Agrif_Ix() == 1 )
-         lk_east  = .NOT. ( Agrif_Ix() + nbcellsx/AGRIF_Irhox() == Agrif_Parent(Ni0glo) -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_north = .NOT. ( Agrif_Iy() + nbcellsy/AGRIF_Irhoy() == Agrif_Parent(Nj0glo) + 1 )
          !
          ! Correct number of ghost cells according to periodicity
@@ -870 +870 @@
          IF( (.NOT.ln_vert_remap).AND.(jpkglo>Agrif_Parent(jpkglo)) )                    CALL ctl_stop( 'STOP',    &
            &   'agrif_nemo_init: Agrif children must have less or equal number of vertical levels without ln_vert_remap defined' ) 
-         IF( jpiglo /= nbcellsx + 2 + 2*nn_hls + nbghostcells_x   + nbghostcells_x   )   CALL ctl_stop( 'STOP',    &
-           &   'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nn_hls + 2*nbghostcells_x' )
-         IF( jpjglo /= nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n )   CALL ctl_stop( 'STOP',    &
-           &   'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nn_hls + nbghostcells_y_s + nbghostcells_y_n' )
+         IF( Ni0glo /= nbcellsx + nbghostcells_x + nbghostcells_x   )   CALL ctl_stop( 'STOP',    &
+           &   'agrif_nemo_init: Agrif children requires jpiglo == nbcellsx + 2*nbghostcells_x' )
+         IF( Nj0glo /= nbcellsy + nbghostcells_y_s + nbghostcells_y_n )   CALL ctl_stop( 'STOP',    &
+           &   'agrif_nemo_init: Agrif children requires jpjglo == nbcellsy + nbghostcells_y_s + nbghostcells_y_n' )
          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'agrif_nemo_init:Agrif children requires ln_use_jattr = .false. ' )
       ELSE