Changeset 14952 for utils/tools/DOMAINcfg/make_namelist.py

Timestamp:

2021-06-04T17:42:50+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, closed domains AGRIF new convention + various add ons

File:

• utils/tools/DOMAINcfg/make_namelist.py (modified) (3 diffs)

utils/tools/DOMAINcfg/make_namelist.py

@@ -43 +43 @@
 print("Found", len(grid), "grids", ":")
 
-f1="namelist_ref"
+f1="namelist_cfg"
 
 
@@ -65 +65 @@
     f2.close()
 
-    if int(grid[cnt-1][2]) == 1:
-        nbghostcells_y_s = 0
-    if int(grid[cnt-1][3]) == int(Nj0glo_parent) + 1:
-        nbghostcells_y_n = 0
-    if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) + 2 :
+    print(int(Ni0glo_parent), int(Nj0glo_parent))
+
+    if (int(grid[cnt-1][2]) == 2 ):
+        nbghostcells_y_s = 1 
+    if int(grid[cnt-1][3]) == int(Nj0glo_parent) :
+        nbghostcells_y_n = 1 
+    if int(grid[cnt-1][1]) - int(grid[cnt-1][0]) == int(Ni0glo_parent) :
         nbghostcells_x = 0
+
     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(int(grid[cnt-1][0]), int(grid[cnt-1][1]), int(grid[cnt-1][2]),int(grid[cnt-1][3]))
+    print(nbghostcells_x, nbghostcells_y_s, nbghostcells_y_n)
     print('Grid {:1d} : Ni0glo = {:3d} , Nj0glo = {:3d}'.format(cnt, Ni0glo, Nj0glo))
 
@@ -83 +88 @@
            line = fp.readline()
            if line.strip().startswith('jperio'):
-               if int(grid[cnt-1][1]) + int(grid[cnt-1][0]) == int(Ni0glo_parent) + 2:
+               if int(grid[cnt-1][1]) - int(grid[cnt-1][0]) == int(Ni0glo_parent):
                    line = "   jperio = 1\n"
                else: