fix polyherdon connectivity (add -1)

diff --git a/src/RENUMBER/testRenumbering.py b/src/RENUMBER/testRenumbering.py
index 3f2ecba5cd628681e1711805027387c10217e691..8d1363ca357ef6fe1f74bea111985508232e92b7 100755 (executable)
--- a/src/RENUMBER/testRenumbering.py
+++ b/src/RENUMBER/testRenumbering.py
@@ -51,7 +51,7 @@ eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
 
 field_ini=[2,3,12,13,14,15,4,5,6,7,8,9,16,17,0,1,10,11]
-s = SUPPORT(m,"Support on all",MED_CELL)
+s = m.getSupportOnAll(MED_CELL)
 f = FIELDDOUBLE(s,2)
 id=f.addDriver(MED_DRIVER,dir_mesh+"/out_"+filename,"Test field")
 f.read(id);
@@ -61,20 +61,14 @@ for i in range(9):
     field=field&(f.getValueIJ(i+1,2)==field_ini[i*2+1])
 f.rmDriver(id)
 
-nbcell2dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dboost=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[2,6,13,11,11,13,14,12,6,5,15,13,12,14,10,4,13,15,16,14,5,1,7,15,14,16,9,10,15,7,8,16,16,8,3,9]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_QUAD4)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_QUAD4)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn2dboost=(len(conn)==len(connectivite))
-if conn2dboost:
-    for i in range(0,len(connectivite)):
-        conn2dboost=conn2dboost&(conn[i]==connectivite[i])
-conn_index2dboost=(len(conn_index)==len(connectivite_index))
-if conn_index2dboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dboost=conn_index2dboost&(conn_index[i]==connectivite_index[i])
-Boost2D=conn2dboost&conn_index2dboost&(nbcell2dboost==9)&field
+conn2dboost=(list(conn)==connectivite) # convert numpy.ndarray to list
+conn_index2dboost=(list(conn_index)==connectivite_index)
+Boost2D=conn2dboost and conn_index2dboost and (nbcell2dboost==9) and field
 os.remove(dir_mesh+"/out_"+filename)
 
 
@@ -83,20 +77,14 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dmetis=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[12,14,10,4,2,6,13,11,11,13,14,12,16,8,3,9,5,1,7,15,15,7,8,16,14,16,9,10,6,5,15,13,13,15,16,14]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_QUAD4)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_QUAD4)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn2dmetis=(len(conn)==len(connectivite))
-if conn2dmetis:
-    for i in range(0,len(connectivite)):
-        conn2dmetis=conn2dmetis&(conn[i]==connectivite[i])
-conn_index2dmetis=(len(conn_index)==len(connectivite_index))
-if conn_index2dmetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dmetis=conn_index2dmetis&(conn_index[i]==connectivite_index[i])
-Metis2D=conn2dmetis&conn_index2dmetis&(nbcell2dmetis==9)
+conn2dmetis=(list(conn)==connectivite)
+conn_index2dmetis=(list(conn_index)==connectivite_index)
+Metis2D=conn2dmetis and conn_index2dmetis and (nbcell2dmetis==9)
 os.remove(dir_mesh+"/out_"+filename)
 
 ## *** Avec polygone ***
@@ -110,20 +98,14 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dpolyboost=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[2,5,9,10,11,10,9,12,5,6,8,9,4,11,12,16,12,9,8,13,6,1,7,8,16,12,13,15,13,8,7,14,15,13,14,3]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL)
-conn_index=m.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-conn2dpolyboost=(len(conn)==len(connectivite))
-if conn2dpolyboost:
-    for i in range(0,len(connectivite)):
-        conn2dpolyboost=conn2dpolyboost&(conn[i]==connectivite[i])
-conn_index2dpolyboost=(len(conn_index)==len(connectivite_index))
-if conn_index2dpolyboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dpolyboost=conn_index2dpolyboost&(conn_index[i]==connectivite_index[i])
-PolyBoost2D=conn2dpolyboost&conn_index2dpolyboost&(nbcell2dpolyboost==9)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_POLYGON)
+conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL)
+conn2dpolyboost=(list(conn)==connectivite)
+conn_index2dpolyboost=(list(conn_index)==connectivite_index)
+PolyBoost2D=conn2dpolyboost and conn_index2dpolyboost and (nbcell2dpolyboost==9)
 os.remove(dir_mesh+"/out_"+filename)
 
 print "TEST 2D Metis with polygons"
@@ -131,20 +113,14 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell2dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell2dpolymetis=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[6,1,7,8,2,5,9,10,5,6,8,9,15,13,14,3,4,11,12,16,16,12,13,15,11,10,9,12,12,9,8,13,13,8,7,14]
 connectivite_index=[1,5,9,13,17,21,25,29,33,37]
-conn=m.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL)
-conn_index=m.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-conn2dpolymetis=(len(conn)==len(connectivite))
-if conn2dpolymetis:
-    for i in range(0,len(connectivite)):
-        conn2dpolymetis=conn2dpolymetis&(conn[i]==connectivite[i])
-conn_index2dpolymetis=(len(conn_index)==len(connectivite_index))
-if conn_index2dpolymetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index2dpolymetis=conn_index2dpolymetis&(conn_index[i]==connectivite_index[i])
-PolyMetis2D=conn2dpolymetis&conn_index2dpolymetis&(nbcell2dpolymetis==9)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_POLYGON)
+conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL)
+conn2dpolymetis=(list(conn)==connectivite)
+conn_index2dpolymetis=(list(conn_index)==connectivite_index)
+PolyMetis2D=conn2dpolymetis and conn_index2dpolymetis and (nbcell2dpolymetis==9)
 os.remove(dir_mesh+"/out_"+filename)
 
 
@@ -162,20 +138,14 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dboost=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[23,13,5,18,27,22,14,26,17,6,13,23,25,16,22,27,27,22,14,26,24,15,7,20,9,23,18,1,21,27,26,10,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3,12,25,27,21,4,19,24,11]
 connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_HEXA8)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_HEXA8)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn3dboost=(len(conn)==len(connectivite))
-if conn3dboost:
-    for i in range(0,len(connectivite)):
-        conn3dboost=conn3dboost&(conn[i]==connectivite[i])
-conn_index3dboost=(len(conn_index)==len(connectivite_index))
-if conn_index3dboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dboost=conn_index3dboost&(conn_index[i]==connectivite_index[i])
-Boost3D=conn3dboost&conn_index3dboost&(nbcell3dboost==8)
+conn3dboost=(list(conn)==connectivite)
+conn_index3dboost=(list(conn_index)==connectivite_index)
+Boost3D=conn3dboost and conn_index3dboost and (nbcell3dboost==8)
 os.remove(dir_mesh+"/out_"+filename)
 
 
@@ -184,19 +154,13 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dmetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
+nbcell3dmetis=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
 connectivite=[12,25,27,21,4,19,24,11,27,22,14,26,24,15,7,20,17,6,13,23,25,16,22,27,9,23,18,1,21,27,26,10,23,13,5,18,27,22,14,26,25,16,22,27,19,8,15,24,2,17,23,9,12,25,27,21,21,27,26,10,11,24,20,3]
 connectivite_index=[1,9,17,25,33,41,49,57,65]
-conn=m.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,MED_HEXA8)
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_HEXA8)
 conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
-conn3dmetis=(len(conn)==len(connectivite))
-if conn3dmetis:
-    for i in range(0,len(connectivite)):
-        conn3dmetis=conn3dmetis&(conn[i]==connectivite[i])
-conn_index3dmetis=(len(conn_index)==len(connectivite_index))
-if conn_index3dmetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dmetis=conn_index3dmetis&(conn_index[i]==connectivite_index[i])
+conn3dmetis=(list(conn)==connectivite)
+conn_index3dmetis=(list(conn_index)==connectivite_index)
 Metis3D=conn3dmetis&conn_index3dmetis&(nbcell3dmetis==8)
 os.remove(dir_mesh+"/out_"+filename)
 
@@ -222,26 +186,21 @@ method="BOOST"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolyboost=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21,12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12]
-connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
-connectivite_index=[1,7,13,19,25,31,37,43,49]
-conn=m.getPolyhedronConnectivity(MED_FULL_INTERLACE)
-conn_index=m.getPolyhedronIndex(MED_FULL_INTERLACE)
-conn_face_index=m.getPolyhedronFacesIndex()
-conn3dpolyboost=(len(conn)==len(connectivite))
-if conn3dpolyboost:
-    for i in range(0,len(connectivite)):
-        conn3dpolyboost=conn3dpolyboost&(conn[i]==connectivite[i])
-conn_index3dpolyboost=(len(conn_index)==len(connectivite_index))
-if conn3dpolyboost:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dpolyboost=conn_index3dpolyboost&(conn_index[i]==connectivite_index[i])
-conn_face_index3dpolyboost=(len(conn_face_index)==len(connectivite_face_index))
-if conn_face_index3dpolyboost:
-    for i in range(0,len(connectivite_face_index)):
-        conn_face_index3dpolyboost=conn_face_index3dpolyboost&(conn_face_index[i]==connectivite_face_index[i])
-PolyBoost3D=conn3dpolyboost&conn_index3dpolyboost&conn_face_index3dpolyboost&(nbcell3dpolyboost==8)
+nbcell3dpolyboost=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
+connectivite=[23,13,5,18,-1,27,26,14,22,-1,23,27,22,13,-1,13,22,14,5,-1,5,14,26,18,-1,18,26,27,23,
+              17,6,13,23,-1,25,27,22,16,-1,17,25,16,6,-1,6,16,22,13,-1,13,22,27,23,-1,23,27,25,17,
+              27,22,14,26,-1,24,20,7,15,-1,27,24,15,22,-1,22,15,7,14,-1,14,7,20,26,-1,26,20,24,27,
+              9,23,18,1,-1,21,10,26,27,-1,9,21,27,23,-1,23,27,26,18,-1,18,26,10,1,-1,1,10,21,9,
+              25,16,22,27,-1,19,24,15,8,-1,25,19,8,16,-1,16,8,15,22,-1,22,15,24,27,-1,27,24,19,25,
+              2,17,23,9,-1,12,21,27,25,-1,2,12,25,17,-1,17,25,27,23,-1,23,27,21,9,-1,9,21,12,2,
+              21,27,26,10,-1,11,3,20,24,-1,21,11,24,27,-1,27,24,20,26,-1,26,20,3,10,-1,10,3,11,21,
+              12,25,27,21,-1,4,11,24,19,-1,12,4,19,25,-1,25,19,24,27,-1,27,24,11,21,-1,21,11,4,12]
+connectivite_index=[1, 30, 59, 88, 117, 146, 175, 204, 233]
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_POLYHEDRA)
+conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
+conn3dpolyboost=(connectivite==list(conn))
+conn_index3dpolyboost=(connectivite_index==list(conn_index))
+PolyBoost3D=(conn3dpolyboost and conn_index3dpolyboost and (nbcell3dpolyboost==8))
 os.remove(dir_mesh+"/out_"+filename)
 
 
@@ -250,26 +209,21 @@ method="METIS"
 string_to_execute="'"+dir_renumber+" "+dir_mesh+"/"+filename+" "+meshname+" "+method+" "+dir_mesh+"/out_"+filename+"'"
 eval("os.system("+string_to_execute+")")
 m = MESH(MED_DRIVER,dir_mesh+"/out_"+filename,meshname)
-nbcell3dpolymetis=m.getNumberOfElementsWithPoly(MED_CELL,MED_ALL_ELEMENTS)
-connectivite=[12,25,27,21,4,11,24,19,12,4,19,25,25,19,24,27,27,24,11,21,21,11,4,12,27,22,14,26,24,20,7,15,27,24,15,22,22,15,7,14,14,7,20,26,26,20,24,27,17,6,13,23,25,27,22,16,17,25,16,6,6,16,22,13,13,22,27,23,23,27,25,17,9,23,18,1,21,10,26,27,9,21,27,23,23,27,26,18,18,26,10,1,1,10,21,9,23,13,5,18,27,26,14,22,23,27,22,13,13,22,14,5,5,14,26,18,18,26,27,23,25,16,22,27,19,24,15,8,25,19,8,16,16,8,15,22,22,15,24,27,27,24,19,25,2,17,23,9,12,21,27,25,2,12,25,17,17,25,27,23,23,27,21,9,9,21,12,2,21,27,26,10,11,3,20,24,21,11,24,27,27,24,20,26,26,20,3,10,10,3,11,21]
-connectivite_face_index=[1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61,65,69,73,77,81,85,89,93,97,101,105,109,113,117,121,125,129,133,137,141,145,149,153,157,161,165,169,173,177,181,185,189,193]
-connectivite_index=[1,7,13,19,25,31,37,43,49]
-conn=m.getPolyhedronConnectivity(MED_FULL_INTERLACE)
-conn_index=m.getPolyhedronIndex(MED_FULL_INTERLACE)
-conn_face_index=m.getPolyhedronFacesIndex()
-conn3dpolymetis=(len(conn)==len(connectivite))
-conn_index3dpolymetis=(len(conn_index)==len(connectivite_index))
-conn_face_index3dpolymetis=(len(conn_face_index)==len(connectivite_face_index))
-if conn3dpolymetis:
-    for i in range(0,len(connectivite)):
-        conn3dpolymetis=conn3dpolymetis&(conn[i]==connectivite[i])
-if conn_index3dpolymetis:
-    for i in range(0,len(connectivite_index)):
-        conn_index3dpolymetis=conn_index3dpolymetis&(conn_index[i]==connectivite_index[i])
-if conn_face_index3dpolymetis:
-    for i in range(0,len(connectivite_face_index)):
-        conn_face_index3dpolymetis=conn_face_index3dpolymetis&(conn_face_index[i]==connectivite_face_index[i])
-PolyMetis3D=conn3dpolymetis&conn_index3dpolymetis&conn_face_index3dpolymetis&(nbcell3dpolymetis==8)
+nbcell3dpolymetis=m.getNumberOfElements(MED_CELL,MEDMEM_ALL_ELEMENTS)
+connectivite=[12,25,27,21,-1,4,11,24,19,-1,12,4,19,25,-1,25,19,24,27,-1,27,24,11,21,-1,21,11,4,12,
+              27,22,14,26,-1,24,20,7,15,-1,27,24,15,22,-1,22,15,7,14,-1,14,7,20,26,-1,26,20,24,27,
+              17,6,13,23,-1,25,27,22,16,-1,17,25,16,6,-1,6,16,22,13,-1,13,22,27,23,-1,23,27,25,17,
+              9,23,18,1,-1,21,10,26,27,-1,9,21,27,23,-1,23,27,26,18,-1,18,26,10,1,-1,1,10,21,9,
+              23,13,5,18,-1,27,26,14,22,-1,23,27,22,13,-1,13,22,14,5,-1,5,14,26,18,-1,18,26,27,23,
+              25,16,22,27,-1,19,24,15,8,-1,25,19,8,16,-1,16,8,15,22,-1,22,15,24,27,-1,27,24,19,25,
+              2,17,23,9,-1,12,21,27,25,-1,2,12,25,17,-1,17,25,27,23,-1,23,27,21,9,-1,9,21,12,2,
+              21,27,26,10,-1,11,3,20,24,-1,21,11,24,27,-1,27,24,20,26,-1,26,20,3,10,-1,10,3,11,21]
+connectivite_index=[1, 30, 59, 88, 117, 146, 175, 204, 233]
+conn=m.getConnectivity(MED_NODAL,MED_CELL,MEDMEM_POLYHEDRA)
+conn_index=m.getConnectivityIndex(MED_NODAL,MED_CELL);
+conn3dpolymetis=(list(conn)==connectivite)
+conn_index3dpolymetis=(list(conn_index)==connectivite_index)
+PolyMetis3D=(conn3dpolymetis and conn_index3dpolymetis and (nbcell3dpolymetis==8))
 os.remove(dir_mesh+"/out_"+filename)