From 8f0082e9d096c07207e1bf9d68488c195abf515a Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Thu, 15 Apr 2021 13:39:45 +0200 Subject: [PATCH] SUppression de step dans construitFissureGenerale --- src/Tools/blocFissure/CasTests/cubeAngle.py | 6 +----- src/Tools/blocFissure/CasTests/cylindre.py | 6 +----- src/Tools/blocFissure/CasTests/cylindre_2.py | 7 ++----- src/Tools/blocFissure/CasTests/ellipse_1.py | 6 +----- src/Tools/blocFissure/CasTests/ellipse_2.py | 6 +----- .../blocFissure/CasTests/eprouvetteCourbe.py | 6 +----- .../blocFissure/CasTests/eprouvetteDroite.py | 13 ++++--------- .../blocFissure/CasTests/eprouvetteDroite_2.py | 12 ++++-------- src/Tools/blocFissure/CasTests/faceGauche_2.py | 15 +++------------ .../blocFissure/CasTests/fissure_Coude.py | 18 +++++++++--------- src/Tools/blocFissure/CasTests/tube.py | 7 ++----- src/Tools/blocFissure/CasTests/vis_1.py | 8 ++------ src/Tools/blocFissure/gmu/casStandard.py | 2 +- .../gmu/construitFissureGenerale.py | 2 +- src/Tools/blocFissure/gmu/fissureCoude.py | 2 +- 15 files changed, 34 insertions(+), 82 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/cubeAngle.py b/src/Tools/blocFissure/CasTests/cubeAngle.py index d91cdee85..ef04109da 100644 --- a/src/Tools/blocFissure/CasTests/cubeAngle.py +++ b/src/Tools/blocFissure/CasTests/cubeAngle.py @@ -31,10 +31,6 @@ from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetS from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class cubeAngle(fissureGenerique): """problème de fissure plane coupant 2 faces (angle), débouches normaux, objet plan""" @@ -115,7 +111,7 @@ class cubeAngle(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/cylindre.py b/src/Tools/blocFissure/CasTests/cylindre.py index b6c21c088..6aacd332f 100644 --- a/src/Tools/blocFissure/CasTests/cylindre.py +++ b/src/Tools/blocFissure/CasTests/cylindre.py @@ -31,10 +31,6 @@ from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetS from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class cylindre(fissureGenerique): """problème de fissure plane sur cylindre, grand fond de fissure en arc de cercle""" @@ -110,7 +106,7 @@ class cylindre(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/cylindre_2.py b/src/Tools/blocFissure/CasTests/cylindre_2.py index 329ed3491..05e6f22bc 100644 --- a/src/Tools/blocFissure/CasTests/cylindre_2.py +++ b/src/Tools/blocFissure/CasTests/cylindre_2.py @@ -24,12 +24,9 @@ import os import logging from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh -from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut +from blocFissure.gmu.geomsmesh import geompy -import GEOM -import SALOMEDS -import SMESH +from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from .cylindre import cylindre diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py index 5809e8bfe..fce709094 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_1.py +++ b/src/Tools/blocFissure/CasTests/ellipse_1.py @@ -31,10 +31,6 @@ from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetS from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class ellipse_1(fissureGenerique): """problème de fissure non plane, débouchante non normale""" @@ -124,7 +120,7 @@ class ellipse_1(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py index 19eebe03a..b1dd29490 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_2.py +++ b/src/Tools/blocFissure/CasTests/ellipse_2.py @@ -24,13 +24,9 @@ import os import logging from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh +from blocFissure.gmu.geomsmesh import geompy from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut -import GEOM -import SALOMEDS -import SMESH - from .ellipse_1 import ellipse_1 class ellipse_2(ellipse_1): diff --git a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py index ff776f6db..f587b8cb3 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py @@ -31,10 +31,6 @@ from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetS from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class eprouvetteCourbe(fissureGenerique): """problème de fissure plane coupant 3 faces (éprouvette), faces au débouché non planes, incidence presque normale""" @@ -118,7 +114,7 @@ class eprouvetteCourbe(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/eprouvetteDroite.py b/src/Tools/blocFissure/CasTests/eprouvetteDroite.py index d4c1b29d7..7484c1da1 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteDroite.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteDroite.py @@ -20,18 +20,13 @@ """problème de fissure plane coupant 3 faces (éprouvette), débouches normaux, objet plan""" import os + +import logging + from blocFissure import gmu from blocFissure.gmu.geomsmesh import geompy, smesh from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin -import logging - from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.triedreBase import triedreBase @@ -115,7 +110,7 @@ class eprouvetteDroite(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py index ffe43c6cc..bfcbb176a 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py @@ -20,18 +20,14 @@ """problème de fissure plane coupant 3 faces (éprouvette), débouches non normaux, objet plan""" import os -from blocFissure import gmu -from blocFissure.gmu.geomsmesh import geompy, smesh - -import GEOM -import SALOMEDS -import SMESH import logging -from .eprouvetteDroite import eprouvetteDroite - +from blocFissure import gmu +from blocFissure.gmu.geomsmesh import geompy from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut +from .eprouvetteDroite import eprouvetteDroite + class eprouvetteDroite_2(eprouvetteDroite): """problème de fissure plane coupant 3 faces (éprouvette), débouches non normaux, objet plan""" diff --git a/src/Tools/blocFissure/CasTests/faceGauche_2.py b/src/Tools/blocFissure/CasTests/faceGauche_2.py index 1cb43188f..abe51ca03 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche_2.py +++ b/src/Tools/blocFissure/CasTests/faceGauche_2.py @@ -20,21 +20,12 @@ """problème de fissure non plane, débouchante non normale""" import os +import logging + from blocFissure import gmu from blocFissure.gmu.geomsmesh import geompy, smesh from blocFissure.gmu.putName import putName - -import GEOM -import SALOMEDS -import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin -import logging - from blocFissure.gmu.fissureGenerique import fissureGenerique - - from blocFissure.gmu.triedreBase import triedreBase from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain @@ -115,7 +106,7 @@ class faceGauche_2(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude.py b/src/Tools/blocFissure/CasTests/fissure_Coude.py index 52c6a6b2e..1ebf008ad 100644 --- a/src/Tools/blocFissure/CasTests/fissure_Coude.py +++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py @@ -23,16 +23,16 @@ import logging import os import math -from blocFissure.gmu import initLog -from blocFissure.gmu.geomsmesh import geompy, smesh -from blocFissure.gmu.geomsmesh import geomPublish -from blocFissure.gmu.geomsmesh import geomPublishInFather -from blocFissure.gmu.putName import putName - import GEOM -import SALOMEDS import SMESH +from blocFissure.gmu.geomsmesh import geompy +from blocFissure.gmu.geomsmesh import smesh +from blocFissure.gmu.geomsmesh import geomPublish +from blocFissure.gmu.geomsmesh import geomPublishInFather + +from blocFissure.gmu import initLog +from blocFissure.gmu.putName import putName from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.triedreBase import triedreBase from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut @@ -233,8 +233,8 @@ class fissure_Coude(fissureGenerique): algo3d = maillageSain.Hexahedron() algo2d = maillageSain.Quadrangle() - putName(algo3d, "{}_3d_maillageSain".format(self.mailleur), i_pref=self.numeroCas) - putName(algo2d, "{}_2d_maillageSain".format(self.mailleur), i_pref=self.numeroCas) + putName(algo3d, "3d_maillageSain", i_pref=self.numeroCas) + putName(algo2d, "2d_maillageSain", i_pref=self.numeroCas) algo1d_long_p1 = maillageSain.Segment(geom=long_p1) hypo1d_long_p1 = algo1d_long_p1.NumberOfSegments(n_long_p1) diff --git a/src/Tools/blocFissure/CasTests/tube.py b/src/Tools/blocFissure/CasTests/tube.py index d71d98fe4..c1b22f369 100644 --- a/src/Tools/blocFissure/CasTests/tube.py +++ b/src/Tools/blocFissure/CasTests/tube.py @@ -28,16 +28,13 @@ from blocFissure.gmu import initLog from blocFissure.gmu.geomsmesh import geompy, smesh from blocFissure.gmu.geomsmesh import geomPublish from blocFissure.gmu.geomsmesh import geomPublishInFather + from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut from blocFissure.gmu.creeZoneDefautDansObjetSain import creeZoneDefautDansObjetSain from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale from blocFissure.gmu.putName import putName -import GEOM -import SALOMEDS -import SMESH - class tube(fissureGenerique): """problème de fissure plane dans un tube""" @@ -123,7 +120,7 @@ class tube(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py index 08e561d36..6de374e88 100644 --- a/src/Tools/blocFissure/CasTests/vis_1.py +++ b/src/Tools/blocFissure/CasTests/vis_1.py @@ -27,12 +27,8 @@ from blocFissure.gmu import initLog from blocFissure.gmu.geomsmesh import geompy, smesh from blocFissure.gmu.geomsmesh import geomPublish from blocFissure.gmu.geomsmesh import geomPublishInFather -from blocFissure.gmu.putName import putName - -import GEOM -import SALOMEDS -import SMESH +from blocFissure.gmu.putName import putName from blocFissure.gmu.fissureGenerique import fissureGenerique from blocFissure.gmu.triedreBase import triedreBase from blocFissure.gmu.genereMeshCalculZoneDefaut import genereMeshCalculZoneDefaut @@ -124,7 +120,7 @@ class vis_1(fissureGenerique): mailleur = self.mailleur2d3d() maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/gmu/casStandard.py b/src/Tools/blocFissure/gmu/casStandard.py index 5e433531d..f7f1ce7be 100644 --- a/src/Tools/blocFissure/gmu/casStandard.py +++ b/src/Tools/blocFissure/gmu/casStandard.py @@ -178,7 +178,7 @@ class casStandard(fissureGenerique): mailleur="MeshGems"): maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/gmu/construitFissureGenerale.py b/src/Tools/blocFissure/gmu/construitFissureGenerale.py index eda66284a..060805323 100644 --- a/src/Tools/blocFissure/gmu/construitFissureGenerale.py +++ b/src/Tools/blocFissure/gmu/construitFissureGenerale.py @@ -57,7 +57,7 @@ from .construitFissureGenerale_c import construitFissureGenerale_c def construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step=-1, mailleur="MeshGems", nro_cas=None): + mailleur="MeshGems", nro_cas=None): """procédure complète fissure générale""" logging.info('start') logging.info("Usage du mailleur %s pour le cas n°%s", mailleur, nro_cas) diff --git a/src/Tools/blocFissure/gmu/fissureCoude.py b/src/Tools/blocFissure/gmu/fissureCoude.py index c8b70cf79..47ebf1134 100644 --- a/src/Tools/blocFissure/gmu/fissureCoude.py +++ b/src/Tools/blocFissure/gmu/fissureCoude.py @@ -682,7 +682,7 @@ class fissureCoude(fissureGenerique): mailleur="MeshGems"): maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ maillageFissureParams, elementsDefaut, \ - step, mailleur, self.numeroCas) + mailleur, self.numeroCas) return maillageFissure # --------------------------------------------------------------------------- -- 2.30.2