Changeset 14674

Timestamp:

2021-04-06T14:36:08+02:00 (3 years ago)

Author:

ldebreu

Message:

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

Location:

utils/tools/DOMAINcfg

Files:

• AGRIF_FixedGrids.in_cmems (modified) (1 diff)
• make_namelist.py (modified) (2 diffs)
• src/agrif_user.F90 (modified) (2 diffs)
• src/mppini.F90 (modified) (2 diffs)

utils/tools/DOMAINcfg/AGRIF_FixedGrids.in_cmems

@@ -2 +2 @@
 -10 15 57 75 3 3 3
 30 70 126 170 3 3 3
-1 179 1 35 3 3 3
+1 181 1 35 3 3 3
 0
 0

utils/tools/DOMAINcfg/make_namelist.py

@@ -64 +64 @@
     if int(grid[cnt-1][2]) == 1:
         nbghostcells_y_s = 0
-    if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) :
+    if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) + 2 :
         nbghostcells_x = 0
-
-    Ni0glo = (int(grid[cnt-1][1])-int(grid[cnt-1][0]))*int(grid[cnt-1][4]) + 2 + 2*nbghostcells_x
-    Nj0glo = (int(grid[cnt-1][3])-int(grid[cnt-1][2]))*int(grid[cnt-1][5]) + 2 + nbghostcells_y_n  + nbghostcells_y_s
+    Ni0glo = (int(grid[cnt-1][1])-int(grid[cnt-1][0]))*int(grid[cnt-1][4]) + 2*nbghostcells_x
+    Nj0glo = (int(grid[cnt-1][3])-int(grid[cnt-1][2]))*int(grid[cnt-1][5]) + nbghostcells_y_n  + nbghostcells_y_s
     #print( "Grid "+str(cnt)+" : jpiglo = "+cnt(jpiglo)+ "  jpjglo = "+str(jpjglo) ) 
     print('Grid {:1d} : Ni0glo = {:3d} , Nj0glo = {:3d}'.format(cnt, Ni0glo, Nj0glo))
@@ -79 +78 @@
            line = fp.readline()
            if line.strip().startswith('jperio'):
-               if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) :
+               if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) + 2:
                    line = "   jperio = 1\n"
                else:

utils/tools/DOMAINcfg/src/agrif_user.F90

@@ -215 +215 @@
       !---------------------------------------------------------------------
 
-      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
 
       nbghostcellsfine_tot_x=nbghostcells_x+1
@@ -1115 +1115 @@
       IF (.not.agrif_root()) THEN
       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)
          IF (.NOT.lk_south) THEN
             nbghostcells_y_s = 0

utils/tools/DOMAINcfg/src/mppini.F90

@@ -109 +109 @@
          print *,'nbcellsx = ',nbcellsx,nbghostcells_x
          print *,'nbcellsy = ',nbcellsy,nbghostcells_y_s,nbghostcells_y_n
-         IF( Ni0glo /= nbcellsx + 2 + 2*nbghostcells_x ) THEN
+         IF( Ni0glo /= nbcellsx + 2*nbghostcells_x ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'Ni0glo should be: ', nbcellsx + 2 + 2*nbghostcells_x
+               WRITE(numout,*) 'Ni0glo should be: ', nbcellsx + 2*nbghostcells_x
             ENDIF        
-            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires Ni0glo == nbcellsx + 2 + 2*nbghostcells_x' )
+            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires Ni0glo == nbcellsx + 2*nbghostcells_x' )
          ENDIF   
-         IF( Nj0glo /= nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n ) THEN
+         IF( Nj0glo /= nbcellsy + nbghostcells_y_s + nbghostcells_y_n ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'Nj0glo shoud be: ', nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n
+               WRITE(numout,*) 'Nj0glo shoud be: ', nbcellsy + nbghostcells_y_s + nbghostcells_y_n
             ENDIF        
             CALL ctl_stop( 'STOP', &
-                'mpp_init: Agrif children requires Nj0glo == nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n' )
+                'mpp_init: Agrif children requires Nj0glo == nbcellsy + nbghostcells_y_s + nbghostcells_y_n' )
          ENDIF   
          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' )
@@ -361 +361 @@
       CALL agrif_nemo_init()
       IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
-         IF( Ni0glo /= nbcellsx + 2 + 2*nbghostcells_x ) THEN
+         IF( Ni0glo /= nbcellsx + 2*nbghostcells_x ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'Ni0glo should be: ', nbcellsx + 2 + 2*nbghostcells_x
+               WRITE(numout,*) 'Ni0glo should be: ', nbcellsx + 2*nbghostcells_x
             ENDIF        
-            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires Ni0glo == nbcellsx + 2 + 2*nbghostcells_x' )
+            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires Ni0glo == nbcellsx + 2*nbghostcells_x' )
          ENDIF   
-         IF( Nj0glo /= nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n ) THEN
+         IF( Nj0glo /= nbcellsy  + nbghostcells_y_s + nbghostcells_y_n ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'Nj0glo shoud be: ', nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n
+               WRITE(numout,*) 'Nj0glo shoud be: ', nbcellsy  + nbghostcells_y_s + nbghostcells_y_n
             ENDIF        
             CALL ctl_stop( 'STOP', &
-               'mpp_init: Agrif children requires Nj0glo == nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n' )
+               'mpp_init: Agrif children requires Nj0glo == nbcellsy  + nbghostcells_y_s + nbghostcells_y_n' )
          ENDIF   
          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' )