Converter: update newZone tests

benoit128 · benoit128 · commit 93b2e0001371 · 2026-04-07T15:38:15.000+02:00
diff --git a/Cassiopee/Apps/Apps/Coda/Post_IBM_CODA.py b/Cassiopee/Apps/Apps/Coda/Post_IBM_CODA.py
@@ -170,8 +170,8 @@ def createPyTreeForIBMWallFieldsExtraction(donorPoints_numpy,wallPoints_numpy,au
 
     zsize = numpy.empty((1,3), numpy.int32, order='F')
     zsize[0,0] = nb_node; zsize[0,1] = 0; zsize[0,2] = 0
-    z = Internal.newZone(name='IBMWall',zsize=zsize,ztype='Unstructured')
-    pytree = C.newPyTree(["DonorPointsPyTree",z])
+    z = Internal.newZone(name='IBMWall', zsize=zsize, ztype='Unstructured')
+    pytree = C.newPyTree(["DonorPointsPyTree", z])
 
     coordx = numpy.ravel(donorPoints_numpy[:,0])
     coordy = numpy.ravel(donorPoints_numpy[:,1])
diff --git a/Cassiopee/Apps/Apps/Coda/ToolboxIBM_CODA.py b/Cassiopee/Apps/Apps/Coda/ToolboxIBM_CODA.py
@@ -1334,7 +1334,7 @@ def extractIBMWallFields(XCP, YCP, ZCP, arrayOfFields, tb, variables):
     # 1. Creation of a CGNS zone O-D of cloud points
     zsize = numpy.empty((1,3), numpy.int32, order='F')
     zsize[0,0] = XCP.shape[0]; zsize[0,1] = 0; zsize[0,2] = 0
-    z = Internal.newZone(name='IBW_Wall',zsize=zsize,ztype='Unstructured')
+    z = Internal.newZone(name='IBW_Wall', zsize=zsize, ztype='Unstructured')
     gc = Internal.newGridCoordinates(parent=z)
     coordx = ['CoordinateX',XCP,[],'DataArray_t']
     coordy = ['CoordinateY',YCP,[],'DataArray_t']
diff --git a/Cassiopee/Connector/Connector/IBM.py b/Cassiopee/Connector/Connector/IBM.py
@@ -2649,7 +2649,7 @@ def createWallAdapt(tc):
         # Creation d une seule zone
         zsize = numpy.empty((1,3), Internal.E_NpyInt, order='F')
         zsize[0,0] = xcNP.shape[0]; zsize[0,1] = 0; zsize[0,2] = 0
-        z = Internal.newZone(name=zname,zsize=zsize,ztype='Unstructured')
+        z = Internal.newZone(name=zname, zsize=zsize, ztype='Unstructured')
         gc = Internal.newGridCoordinates(parent=z)
         coordx = ['CoordinateX',xcNP,[],'DataArray_t']
         coordy = ['CoordinateY',ycNP,[],'DataArray_t']
diff --git a/Cassiopee/Connector/test/computeFrictionVelocityPT.py b/Cassiopee/Connector/test/computeFrictionVelocityPT.py
@@ -8,7 +8,7 @@
 
 zsize = numpy.empty((1,3), numpy.int32, order='F')
 zsize[0,0] = nb_node; zsize[0,1] = 0; zsize[0,2] = 0
-z = Internal.newZone(name='IBW_Wall',zsize=zsize,ztype='Unstructured')
+z = Internal.newZone(name='IBW_Wall', zsize=zsize, ztype='Unstructured')
 coord_node = Internal.newGridCoordinates(parent=z)
 # Image Points : PI
 coord_node[2].append(['CoordinateX',numpy.array([0.1,0.2,0.3]),[],'DataArray_t'])
diff --git a/Cassiopee/Connector/test/computeFrictionVelocityPT_t1.py b/Cassiopee/Connector/test/computeFrictionVelocityPT_t1.py
@@ -9,7 +9,7 @@
 
 zsize = numpy.empty((1,3), Internal.E_NpyInt, order='F')
 zsize[0,0] = nb_node; zsize[0,1] = 0; zsize[0,2] = 0
-z = Internal.newZone(name='IBW_Wall',zsize=zsize,ztype='Unstructured')
+z = Internal.newZone(name='IBW_Wall', zsize=zsize, ztype='Unstructured')
 coord_node = Internal.newGridCoordinates(parent=z)
 # Image Points : PI
 coord_node[2].append(['CoordinateX',numpy.array([0.1,0.2,0.3]),[],'DataArray_t'])
diff --git a/Cassiopee/Converter/test/getChildFromNamePT.py b/Cassiopee/Converter/test/getChildFromNamePT.py
@@ -1,6 +1,6 @@
 # - getChildFromName (pyTree) -
 import Converter.Internal as Internal
 
-z = Internal.newZone('Zone', zsize=[[10, 2, 0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10, 9, 0]], ztype='Structured')
 print(Internal.getChildFromName(z, 'ZoneType'))
 #>> ['ZoneType', array([b'S', b't', b'r', b'u', b'c', b't', b'u', b'r', ...]
diff --git a/Cassiopee/Converter/test/getChildFromTypePT.py b/Cassiopee/Converter/test/getChildFromTypePT.py
@@ -1,6 +1,6 @@
 # - getChildFromType (pyTree) -
 import Converter.Internal as Internal
 
-z = Internal.newZone('Zone', zsize=[[10, 2, 0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10, 9, 0]], ztype='Structured')
 print(Internal.getChildFromType(z, 'ZoneType_t'))
 #>> ['ZoneType', array([b'S', b't', b'r', b'u', b'c', b't', b'u', b'r', ...]
diff --git a/Cassiopee/Converter/test/getChildrenFromTypePT.py b/Cassiopee/Converter/test/getChildrenFromTypePT.py
@@ -1,6 +1,6 @@
 # - getChildrenFromType (pyTree) -
 import Converter.Internal as Internal
 
-z = Internal.newZone('Zone', zsize=[[10, 2, 0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10, 9, 0]], ztype='Structured')
 print(Internal.getChildrenFromType(z, 'ZoneType_t'))
 #>> [['ZoneType', array([b'S', b't', b'r', b'u', b'c', b't', b'u', b'r', b'e', b'd']...']]
diff --git a/Cassiopee/Converter/test/getValPT.py b/Cassiopee/Converter/test/getValPT.py
@@ -2,9 +2,9 @@
 import Converter.Internal as Internal
 
 # getVal returns always numpys
-z = Internal.newZone('Zone', zsize=[[10, 2, 0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10, 9, 0]], ztype='Structured')
 print(Internal.getVal(z))
-# >> [[10  2  0]]
+# >> [[10  9  0]]
 n = Internal.getNodeFromName(z, 'ZoneType')
 print(Internal.getVal(n))
 #>> [b'S' b't' b'r' b'u' b'c' b't' b'u' b'r' b'e' b'd']
diff --git a/Cassiopee/Converter/test/newArbitraryGridMotionPT.py b/Cassiopee/Converter/test/newArbitraryGridMotionPT.py
@@ -7,5 +7,5 @@
 #>>    |_['ArbitraryGridMotion',array('DeformingGrid',dtype='|S1'),[0 son],'ArbitraryGridMotionType_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newArbitraryGridMotion(name='Motion', value='NonDeformingGrid', parent=z)
diff --git a/Cassiopee/Converter/test/newDiscreteDataPT.py b/Cassiopee/Converter/test/newDiscreteDataPT.py
@@ -6,5 +6,5 @@
 #>> ['DiscreteData',None,[0 son],'DiscreteData_t']
 
 # Attach it to zone
-z = Internal.newZone('Zone', [[10],[2],[0]], 'Structured')
+z = Internal.newZone('Zone', [[10,9,0]], 'Unstructured')
 Internal.newDiscreteData('DiscreteData', parent=z)
diff --git a/Cassiopee/Converter/test/newElementsPT.py b/Cassiopee/Converter/test/newElementsPT.py
@@ -8,5 +8,5 @@
 #>>   |_['ElementRange',None,[0 son],'IndexRange_t']
 
 # Attach it to zone
-z = Internal.newZone('Zone', [[10],[2],[0]], 'Unstructured')
+z = Internal.newZone('Zone', [[10,9,0]], 'Unstructured')
 Internal.newElements(name='Elements', etype='UserDefined', econnectivity=None, eboundary=0, parent=z)
diff --git a/Cassiopee/Converter/test/newFlowSolutionPT.py b/Cassiopee/Converter/test/newFlowSolutionPT.py
@@ -7,5 +7,5 @@
 #>>    |_['GridLocation',array('Vertex',dtype='|S1'),[0 son],'GridLocation_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newFlowSolution(name='FlowSolution', gridLocation='Vertex', parent=z)
diff --git a/Cassiopee/Converter/test/newGridCoordinatesPT.py b/Cassiopee/Converter/test/newGridCoordinatesPT.py
@@ -6,8 +6,8 @@
 #>> ['GridCoordinates', None, [], 'GridCoordinates_t']
 
 # Create a zone node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Unstructured')
 n = Internal.newGridCoordinates(parent=z); Internal.printTree(z)
-#>> ['Zone',array(shape=(3, 1),dtype='int32',order='F'),[2 sons],'Zone_t']
+#>> ['Zone',array(shape=(1, 3),dtype='int32',order='F'),[2 sons],'Zone_t']
 #>>   |_['ZoneType',array('Structured',dtype='|S1'),[0 son],'ZoneType_t']
 #>>   |_['GridCoordinates',None,[0 son],'GridCoordinates_t']
diff --git a/Cassiopee/Converter/test/newOrdinalPT.py b/Cassiopee/Converter/test/newOrdinalPT.py
@@ -6,5 +6,5 @@
 #>> ['Ordinal',array([1],dtype='int32'),[0 son],'Ordinal_t']
 
 # Attach it to zone
-z = Internal.newZone('Zone', [[10],[2],[0]], 'Structured')
+z = Internal.newZone('Zone', [[10,9,0]], 'Structured')
 Internal.newOrdinal(value=1, parent=z)
diff --git a/Cassiopee/Converter/test/newRigidGridMotionPT.py b/Cassiopee/Converter/test/newRigidGridMotionPT.py
@@ -8,5 +8,5 @@
 #>>    |_['RigidGridMotionType',array('ConstantRate',dtype='|S1'),[0 son],'RigidGridMotionType_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newRigidGridMotion(name='Motion', origin=[0.,0.,0.], mtype='ConstantRate', parent=z)
diff --git a/Cassiopee/Converter/test/newZoneBCPT.py b/Cassiopee/Converter/test/newZoneBCPT.py
@@ -6,5 +6,5 @@
 #>> ['ZoneBC',None,[0 son],'ZoneBC_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newZoneBC(parent=z)
diff --git a/Cassiopee/Converter/test/newZoneGridConnectivityPT.py b/Cassiopee/Converter/test/newZoneGridConnectivityPT.py
@@ -6,5 +6,5 @@
 #>> ['ZoneGridConnectivity',None,[0 son],'ZoneGridConnectivity_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newZoneGridConnectivity('ZoneGridConnectivity', parent=z)
diff --git a/Cassiopee/Converter/test/newZoneIterativeDataPT.py b/Cassiopee/Converter/test/newZoneIterativeDataPT.py
@@ -6,5 +6,5 @@
 #>> ['ZoneIterativeData',None,[0 son],'ZoneIterativeData_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10],[2],[0]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newZoneIterativeData(name='ZoneIterativeData', parent=z)
diff --git a/Cassiopee/Converter/test/newZonePT.py b/Cassiopee/Converter/test/newZonePT.py
@@ -9,4 +9,4 @@
 # Create a zone node and attach it to tree
 t = Internal.newCGNSTree()
 b = Internal.newCGNSBase('Base', 3, 3, parent=t)
-z = Internal.newZone('Zone', [[10],[2],[0]], 'Structured', parent=b)
+z = Internal.newZone('Zone', [[10,9,0]], 'Structured', parent=b)
diff --git a/Cassiopee/Converter/test/newZoneSubRegionPT.py b/Cassiopee/Converter/test/newZoneSubRegionPT.py
@@ -20,5 +20,5 @@
 #>>    |_['GridLocation',array('FaceCenter',dtype='|S1'),[0 son],'GridLocation_t']
 
 # Attach it to a parent node
-z = Internal.newZone('Zone', zsize=[[10, 2, 2]], ztype='Structured')
+z = Internal.newZone('Zone', zsize=[[10,9,0]], ztype='Structured')
 Internal.newZoneSubRegion(name='SubRegion', pointRange=[1,10,2,2,1,1], gridLocation='FaceCenter', parent=z)
diff --git a/Cassiopee/Generator/setup.scons b/Cassiopee/Generator/setup.scons
@@ -78,7 +78,7 @@ if Cppcompiler.find('gcc') == 0 or Cppcompiler.find('g++') == 0 or Cppcompiler =
     flags = ''
     for i in cppOpts: 
         if i[0:2] != '-O': flags += i+' '
-    for v, i in enumerate(srcs.cpp_srcs2):
+    for i, v in enumerate(srcs.cpp_srcs2):
         if v in files:
             #print('altering', v,flags)
             srcs.cpp_srcs2[i] = env.Object(v, CXXFLAGS=flags+'-O0')
diff --git a/tools/tree_grep.py b/tools/tree_grep.py
@@ -12,7 +12,7 @@ def subfunction(args, dir, file):
   regexp = args[0]
   exts = args[1]
   if exts is None:
-    exts = [".C",".h",".hpp",".hxx",".F",".for",".f90",".html",".htm",".c",".cpp",".cxx",".py",".scons",".pyx",".pxi",".pxd",".rst"]
+    exts = [".C",".h",".hpp",".hxx",".F",".for",".f90",".html",".htm",".c",".cpp",".cxx",".py",".scons",".pyx",".pxi",".pxd",".rst",".rs"]
   for f in file:
     (root,ext) = OP.splitext(f)
     tot = '%s/%s'%(dir,f)
diff --git a/tools/tree_replace.py b/tools/tree_replace.py
@@ -12,7 +12,7 @@ def subfunction(args, dir, file):
     (root,ext) = OP.splitext(f)
     tot = '%s/%s'%(dir,f)
     t = OP.islink(tot)
-    if (ext in [".C",".h",".hxx",".hpp",".for",".f90",".html",".htm",".c",".cpp",".cxx",".py",".scons",".pyx",".pxi",".pxd",".rst"] and not t):
+    if (ext in [".C",".h",".hxx",".hpp",".for",".f90",".html",".htm",".c",".cpp",".cxx",".py",".scons",".pyx",".pxi",".pxd",".rst",".rs"] and not t):
 
       f1 = open("%s/%s"%(dir,f), 'rb')
       l1 = f1.readlines()
