Merge pull request #272 from antjost/devGenCartTest

[IBM] Change checkCartesian non-regression test cases. We now compare boolean and instead of a PyTree, thereby making these non-regressoin test cases lighter.
onera · Jan 31, 2025 · 03b57ee · 03b57ee
2 parents 0d3f967 + 93c890c
commit 03b57ee
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 104 deletions.
diff --git a/Cassiopee/Generator/test/checkCartesian_m1.py b/Cassiopee/Generator/test/checkCartesian_m1.py
@@ -23,13 +23,9 @@
 
 ##Test 1 - Cartesian
 cartesian = G_IBM.checkCartesian(t)
-isCartesian = 0
-if cartesian: isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
 if Cmpi.rank == 0:
-    test.testT(t,1)
-    print('Is Cartesian::', cartesian, isCartesian)
+    test.testO(cartesian,1)
+    print('Is Cartesian::', cartesian)
 tsave = Internal.copyTree(t)
 #C.convertPyTree2File(t,'t_test1.cgns')
 
@@ -38,14 +34,9 @@
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateZ')[1]
 for i in range(6): coord[:,:,i] = coord[:,:,i]*i/10+coord[:,:,i]
 cartesian = G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian: isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
 if Cmpi.rank == 0:
-    test.testT(t,2)
-    print('Is Cartesian::',cartesian,isCartesian)
+    test.testO(cartesian,2)
+    print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test2.cgns')
 
 ## Test 3 - Y direction is non homogenous --> non Cartesian mesh
@@ -54,14 +45,9 @@
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateY')[1]
 for i in range(6): coord[:,i,:] = coord[:,i,:]*i/10+coord[:,i,:]
 cartesian = G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
 if Cmpi.rank == 0:
-    test.testT(t,3)
-    print('Is Cartesian::',cartesian,isCartesian)
+    test.testO(cartesian,3)
+    print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test3.cgns')
 
 ## Test 4 - Z direction is non homogenous --> non Cartesian mesh
@@ -70,16 +56,11 @@
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateX')[1]
 for i in range(6): coord[i,:,:] = coord[i,:,:]*i/10+coord[i,:,:]
 cartesian = G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
 if Cmpi.rank == 0:
-    test.testT(t,4)
-    print('Is Cartesian::',cartesian,isCartesian)
+    test.testO(cartesian,4)
+    print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test4.cgns')
 
 del t
 del tsave
-if Cmpi.rank == 0: os.remove(LOCAL+'/t_TMP.cgns')
+if Cmpi.rank == 0: os.remove(LOCAL+'/t_TMP.cgns')
diff --git a/Cassiopee/Generator/test/checkCartesian_t1.py b/Cassiopee/Generator/test/checkCartesian_t1.py
@@ -12,27 +12,18 @@
 
 ##Test 1 - Cartesian
 cartesian=G_IBM.checkCartesian(t)
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,1)
+test.testO(cartesian,1)
 tsave = Internal.copyTree(t)
-print('Is Cartesian::',cartesian,isCartesian)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test1.cgns')
 
 ## Test 2 - Z direction is non homogenous --> non Cartesian mesh
 Internal._rmNode(t, Internal.getNodeFromName(t, 'TMP_Node'))
 coord = Internal.getNodeFromName(t,'CoordinateZ')[1]
 for i in range(6): coord[:,:,i]=coord[:,:,i]*i/10+coord[:,:,i]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,2)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,2)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test2.cgns')
 
 ## Test 3 - Y direction is non homogenous --> non Cartesian mesh
@@ -41,26 +32,16 @@
 coord = Internal.getNodeFromName(t,'CoordinateY')[1]
 for i in range(6): coord[:,i,:]=coord[:,i,:]*i/10+coord[:,i,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,3)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,3)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test3.cgns')
 
-## Test 4 - Z direction is non homogenous --> non Cartesian mesh
+## Test 4 - X direction is non homogenous --> non Cartesian mesh
 t = Internal.copyTree(tsave)
 Internal._rmNode(t, Internal.getNodeFromName(t, 'TMP_Node'))
 coord = Internal.getNodeFromName(t,'CoordinateX')[1]
 for i in range(6): coord[i,:,:]=coord[i,:,:]*i/10+coord[i,:,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,4)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,4)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test4.cgns')
diff --git a/Cassiopee/Generator/test/checkCartesian_t2.py b/Cassiopee/Generator/test/checkCartesian_t2.py
@@ -12,13 +12,9 @@
 
 ##Test 1 - Cartesian
 cartesian=G_IBM.checkCartesian(t)
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,1)
+test.testO(cartesian,1)
 tsave = Internal.copyTree(t)
-print('Is Cartesian::',cartesian,isCartesian)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test1.cgns')
 
 ## Test 2 - Y direction is non homogenous --> non Cartesian mesh
@@ -27,26 +23,16 @@
 coord = Internal.getNodeFromName(t,'CoordinateY')[1]
 for i in range(6): coord[:,i,:]=coord[:,i,:]*i/10+coord[:,i,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,2)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,2)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test2.cgns')
 
-## Test 3 - Z direction is non homogenous --> non Cartesian mesh
+## Test 3 - X direction is non homogenous --> non Cartesian mesh
 t = Internal.copyTree(tsave)
 Internal._rmNode(t, Internal.getNodeFromName(t, 'TMP_Node'))
 coord = Internal.getNodeFromName(t,'CoordinateX')[1]
 for i in range(6): coord[i,:,:]=coord[i,:,:]*i/10+coord[i,:,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,3)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,3)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test3.cgns')
diff --git a/Cassiopee/Generator/test/checkCartesian_t3.py b/Cassiopee/Generator/test/checkCartesian_t3.py
@@ -14,27 +14,18 @@
 
 ##Test 1 - Cartesian
 cartesian=G_IBM.checkCartesian(t)
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,1)
+test.testO(cartesian,1)
 tsave = Internal.copyTree(t)
-print('Is Cartesian::',cartesian,isCartesian)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test1.cgns')
 
 ## Test 2 - Z direction is non homogenous --> non Cartesian mesh
 Internal._rmNode(t, Internal.getNodeFromName(t, 'TMP_Node'))
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateZ')[1]
 for i in range(6): coord[:,:,i]=coord[:,:,i]*i/10+coord[:,:,i]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,2)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,2)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test2.cgns')
 
 ## Test 3 - Y direction is non homogenous --> non Cartesian mesh
@@ -43,13 +34,8 @@
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateY')[1]
 for i in range(6): coord[:,i,:]=coord[:,i,:]*i/10+coord[:,i,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,3)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,3)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test3.cgns')
 
 ## Test 4 - Z direction is non homogenous --> non Cartesian mesh
@@ -58,11 +44,6 @@
 coord = Internal.getNodeFromName(Internal.getZones(t)[0],'CoordinateX')[1]
 for i in range(6): coord[i,:,:]=coord[i,:,:]*i/10+coord[i,:,:]
 cartesian=G_IBM.checkCartesian(t)
-
-isCartesian=0
-if cartesian:isCartesian=1
-Internal._createUniqueChild(t, 'TMP_Node', 'UserDefinedData_t')
-Internal._createUniqueChild(Internal.getNodeFromName1(t, 'TMP_Node'), 'Cartesian', 'DataArray_t', value=isCartesian)
-test.testT(t,4)
-print('Is Cartesian::',cartesian,isCartesian)
+test.testO(cartesian,4)
+print('Is Cartesian::',cartesian)
 #C.convertPyTree2File(t,'t_test4.cgns')