bos #29764 EDF - SMESH_blocfissure* fail

Fix reference numbers for NETGEN-6
This commit is contained in:
eap 2022-04-21 17:48:18 +03:00
parent 91655b13fe
commit f4fda5460f
12 changed files with 66 additions and 40 deletions

View File

@ -74,10 +74,10 @@ class ellipse_2(ellipse_1):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 1748, \
Entity_Quad_Hexa = 3795, \
Entity_Node = 22022, \
Entity_Node = 21579, \
Entity_Quad_Edge = 258, \
Entity_Quad_Triangle = 412, \
Entity_Quad_Tetra = 2442, \
Entity_Quad_Tetra = 2113, \
Entity_Quad_Pyramid = 199, \
Entity_Quad_Penta = 120 \
)

View File

@ -129,10 +129,10 @@ class faceGauche(fissureGenerique):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 4177, \
Entity_Quad_Hexa = 6224, \
Entity_Node = 83887, \
Entity_Node = 76374, \
Entity_Quad_Edge = 750, \
Entity_Quad_Triangle = 2434, \
Entity_Quad_Tetra = 35375, \
Entity_Quad_Tetra = 29698, \
Entity_Quad_Pyramid = 1236, \
Entity_Quad_Penta = 936 \
)

View File

@ -105,13 +105,26 @@ class fissureCoude_1(fissureCoude):
# ---------------------------------------------------------------------------
def setReferencesMaillageFissure(self):
self.referencesMaillageFissure = dict( \
from salome.smesh import smeshBuilder
if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 6042, \
Entity_Quad_Hexa = 7794, \
Entity_Node = 63900, \
Entity_Quad_Edge = 874, \
Entity_Quad_Triangle = 2058, \
Entity_Quad_Tetra = 14900, \
Entity_Quad_Pyramid = 738, \
Entity_Quad_Penta = 672 \
)
else:
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 6042, \
Entity_Quad_Hexa = 7794, \
Entity_Node = 63900, \
Entity_Node = 65091, \
Entity_Quad_Edge = 874, \
Entity_Quad_Triangle = 2058, \
Entity_Quad_Tetra = 14900, \
Entity_Quad_Triangle = 2116, \
Entity_Quad_Tetra = 15734, \
Entity_Quad_Pyramid = 738, \
Entity_Quad_Penta = 672 \
)
)

View File

@ -123,10 +123,10 @@ class fissureCoude_10(fissureCoude):
self.referencesMaillageFissure = dict ( \
Entity_Quad_Quadrangle = 6160, \
Entity_Quad_Hexa = 5864, \
Entity_Node = 80605, \
Entity_Node = 75969, \
Entity_Quad_Edge = 1345, \
Entity_Quad_Triangle = 9726, \
Entity_Quad_Tetra = 25690, \
Entity_Quad_Tetra = 22110, \
Entity_Quad_Pyramid = 1232, \
Entity_Quad_Penta = 1136 \
)

View File

@ -121,10 +121,10 @@ class fissureCoude_2(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 7828, \
Entity_Quad_Hexa = 10437, \
Entity_Node = 106391, \
Entity_Node = 109737, \
Entity_Quad_Edge = 1199, \
Entity_Quad_Triangle = 4702, \
Entity_Quad_Tetra = 33175, \
Entity_Quad_Tetra = 35559, \
Entity_Quad_Pyramid = 1428, \
Entity_Quad_Penta = 1344 \
)

View File

@ -121,10 +121,10 @@ class fissureCoude_5(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 5366, \
Entity_Quad_Hexa = 7120, \
Entity_Node = 54175, \
Entity_Node = 53105, \
Entity_Quad_Edge = 721, \
Entity_Quad_Triangle = 1482, \
Entity_Quad_Tetra = 11324, \
Entity_Quad_Tetra = 10526, \
Entity_Quad_Pyramid = 532, \
Entity_Quad_Penta = 496 \
)

View File

@ -122,10 +122,10 @@ class fissureCoude_6(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 7392, \
Entity_Quad_Hexa = 9888, \
Entity_Node = 62361, \
Entity_Node = 61307, \
Entity_Quad_Edge = 833, \
Entity_Quad_Triangle = 983, \
Entity_Quad_Tetra = 7642, \
Entity_Quad_Triangle = 1014, \
Entity_Quad_Tetra = 6800, \
Entity_Quad_Pyramid = 452, \
Entity_Quad_Penta = 408 \
)
)

View File

@ -123,10 +123,10 @@ class fissureCoude_7(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 7758, \
Entity_Quad_Hexa = 10696, \
Entity_Node = 70936, \
Entity_Node = 69423, \
Entity_Quad_Edge = 881, \
Entity_Quad_Triangle = 1300, \
Entity_Quad_Tetra = 10449, \
Entity_Quad_Triangle = 1350, \
Entity_Quad_Tetra = 9271, \
Entity_Quad_Pyramid = 668, \
Entity_Quad_Penta = 612 \
)
)

View File

@ -123,10 +123,10 @@ class fissureCoude_8(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 4572, \
Entity_Quad_Hexa = 5128, \
Entity_Node = 46393, \
Entity_Node = 43443, \
Entity_Quad_Edge = 648, \
Entity_Quad_Triangle = 1286, \
Entity_Quad_Tetra = 11686, \
Entity_Quad_Triangle = 1332, \
Entity_Quad_Tetra = 9431, \
Entity_Quad_Pyramid = 768, \
Entity_Quad_Penta = 752 \
)

View File

@ -121,10 +121,10 @@ class fissureCoude_9(fissureCoude):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 14864, \
Entity_Quad_Hexa = 26772, \
Entity_Node = 157045, \
Entity_Node = 153298, \
Entity_Quad_Edge = 1237, \
Entity_Quad_Triangle = 3338, \
Entity_Quad_Tetra = 17484, \
Entity_Quad_Tetra = 14643, \
Entity_Quad_Pyramid = 916, \
Entity_Quad_Penta = 780 \
)

View File

@ -533,10 +533,10 @@ class fissure_Coude(fissureGenerique):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 6710, \
Entity_Quad_Hexa = 8656, \
Entity_Node = 77391, \
Entity_Node = 71784, \
Entity_Quad_Edge = 1006, \
Entity_Quad_Triangle = 2496, \
Entity_Quad_Tetra = 20711, \
Entity_Quad_Tetra = 16504, \
Entity_Quad_Pyramid = 1232, \
Entity_Quad_Penta = 1176 \
)

View File

@ -89,13 +89,26 @@ class fissure_Coude_4(fissure_Coude):
# ---------------------------------------------------------------------------
def setReferencesMaillageFissure(self):
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 11852, \
Entity_Quad_Hexa = 22208, \
Entity_Node = 124711, \
Entity_Quad_Edge = 1192, \
Entity_Quad_Triangle = 1534, \
Entity_Quad_Tetra = 12204, \
Entity_Quad_Pyramid = 948, \
Entity_Quad_Penta = 732 \
)
from salome.smesh import smeshBuilder
if smeshBuilder.NETGEN_VERSION_MAJOR < 6:
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 11852, \
Entity_Quad_Hexa = 22208, \
Entity_Node = 124711, \
Entity_Quad_Edge = 1192, \
Entity_Quad_Triangle = 1534, \
Entity_Quad_Tetra = 12204, \
Entity_Quad_Pyramid = 948, \
Entity_Quad_Penta = 732 \
)
else:
self.referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 11852, \
Entity_Quad_Hexa = 22208, \
Entity_Node = 124493, \
Entity_Quad_Edge = 1192, \
Entity_Quad_Triangle = 1616, \
Entity_Quad_Tetra = 11977, \
Entity_Quad_Pyramid = 948, \
Entity_Quad_Penta = 732 \
)