From 5a81ccdc33e5170a6439260ceb81829b0631441b Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Thu, 8 Apr 2021 08:45:27 +0200 Subject: [PATCH] Cas_test vis OK --- .../blocFissure/CasTests/execution_Cas.py | 4 ++-- src/Tools/blocFissure/CasTests/vis_1.py | 18 +++++++++--------- src/Tools/blocFissure/materielCasTests/vis.py | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py index e96a824ab..27a2944e5 100644 --- a/src/Tools/blocFissure/CasTests/execution_Cas.py +++ b/src/Tools/blocFissure/CasTests/execution_Cas.py @@ -35,7 +35,7 @@ from blocFissure.gmu.casStandard import casStandard #initLog.setPerfTests() # ---tous les cas en séquence, ou les cas sélectionnés ... -TORUNOK = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0] # OK +TORUNOK = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0] # OK # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28 #RUNALL = False RUNALL = True @@ -63,7 +63,7 @@ else: TORUN = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0] # vis TORUN = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1] # tube # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28 - TORUN = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0] # OK + TORUN = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0] # OK # ----------------------------------------------------------------------------------------------- def caract_l_problemes (): diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py index 3b5198787..08e561d36 100644 --- a/src/Tools/blocFissure/CasTests/vis_1.py +++ b/src/Tools/blocFissure/CasTests/vis_1.py @@ -84,7 +84,7 @@ class vis_1(fissureGenerique): shellFiss = geompy.ImportBREP(os.path.join(gmu.pathBloc, "materielCasTests", "visFiss.brep")) fondFiss = geompy.CreateGroup(shellFiss, geompy.ShapeType["EDGE"]) - geompy.UnionIDs(fondFiss, [6, 8, 3]) + geompy.UnionIDs(fondFiss, [6, 8]) geomPublish(initLog.always, shellFiss, "shellFiss", self.numeroCas) geomPublishInFather(initLog.always, shellFiss, fondFiss, "fondFiss", self.numeroCas) @@ -130,12 +130,12 @@ class vis_1(fissureGenerique): # --------------------------------------------------------------------------- def setReferencesMaillageFissure(self): self.referencesMaillageFissure = dict( \ - Entity_Quad_Quadrangle = 4285 ,\ - Entity_Quad_Hexa = 6416, \ - Entity_Node = 85673, \ - Entity_Quad_Edge = 758, \ - Entity_Quad_Triangle = 2336, \ - Entity_Quad_Tetra = 35990, \ - Entity_Quad_Pyramid = 1284, \ - Entity_Quad_Penta = 984 \ + Entity_Quad_Quadrangle = 11596, \ + Entity_Quad_Hexa = 37008, \ + Entity_Node = 250929, \ + Entity_Quad_Edge = 30356, \ + Entity_Quad_Triangle = 8088, \ + Entity_Quad_Tetra = 49055, \ + Entity_Quad_Pyramid = 3026, \ + Entity_Quad_Penta = 4392 \ ) diff --git a/src/Tools/blocFissure/materielCasTests/vis.py b/src/Tools/blocFissure/materielCasTests/vis.py index cd63959e4..8d7aae242 100644 --- a/src/Tools/blocFissure/materielCasTests/vis.py +++ b/src/Tools/blocFissure/materielCasTests/vis.py @@ -143,7 +143,7 @@ Extrusion_1 = geompy.MakePrismVecH(Face_2, OX, 15) Revolution_2 = geompy.MakeRevolution2Ways(generatrice, OY, 65*math.pi/180.0) Fissure = geompy.MakeCommonList([Extrusion_1, Revolution_2], True) fondFiss = geompy.CreateGroup(Fissure, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(fondFiss, [9, 7, 4]) +geompy.UnionIDs(fondFiss, [6, 8]) geomPublish(initLog.debug, Vertex_4, 'Vertex_4' ) geomPublish(initLog.debug, Vertex_6, 'Vertex_6' ) -- 2.30.2