From b66ee19eeaa375d4cde342644be81e8ce29fa14b Mon Sep 17 00:00:00 2001 From: GERALD NICOLAS Date: Thu, 21 Jan 2021 16:09:37 +0100 Subject: [PATCH] =?UTF-8?q?Nom=20des=20probl=C3=A8mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Tools/blocFissure/CasTests/cubeAngle.py | 4 +--- src/Tools/blocFissure/CasTests/cubeAngle2.py | 4 ++-- src/Tools/blocFissure/CasTests/cylindre.py | 4 +--- src/Tools/blocFissure/CasTests/cylindre_2.py | 5 ++--- src/Tools/blocFissure/CasTests/ellipse_1.py | 4 +--- src/Tools/blocFissure/CasTests/ellipse_2.py | 4 +--- src/Tools/blocFissure/CasTests/eprouvetteCourbe.py | 4 +--- src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py | 6 ++---- src/Tools/blocFissure/CasTests/faceGauche.py | 4 +--- src/Tools/blocFissure/CasTests/faceGauche_2.py | 6 ++---- src/Tools/blocFissure/CasTests/fissureCoude_1.py | 7 +++---- src/Tools/blocFissure/CasTests/fissureCoude_10.py | 1 + src/Tools/blocFissure/CasTests/fissureCoude_2.py | 6 +++--- src/Tools/blocFissure/CasTests/fissureCoude_3.py | 7 +++---- src/Tools/blocFissure/CasTests/fissureCoude_4.py | 7 +++---- src/Tools/blocFissure/CasTests/fissureCoude_5.py | 7 +++---- src/Tools/blocFissure/CasTests/fissureCoude_6.py | 4 +++- src/Tools/blocFissure/CasTests/fissureCoude_7.py | 2 ++ src/Tools/blocFissure/CasTests/fissureCoude_8.py | 3 ++- src/Tools/blocFissure/CasTests/fissureCoude_9.py | 3 ++- src/Tools/blocFissure/CasTests/fissure_Coude.py | 6 +++--- src/Tools/blocFissure/CasTests/fissure_Coude_4.py | 6 ++++-- src/Tools/blocFissure/CasTests/vis_1.py | 4 +--- src/Tools/blocFissure/gmu/fissureCoude.py | 2 +- src/Tools/blocFissure/gmu/fissureGenerique.py | 2 +- 25 files changed, 49 insertions(+), 63 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/cubeAngle.py b/src/Tools/blocFissure/CasTests/cubeAngle.py index eb7b73222..456d125f2 100644 --- a/src/Tools/blocFissure/CasTests/cubeAngle.py +++ b/src/Tools/blocFissure/CasTests/cubeAngle.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class cubeAngle(fissureGenerique): - """ - problème de fissure plane coupant 2 faces (angle), débouches normaux, objet plan - """ + """problème de fissure plane coupant 2 faces (angle), débouches normaux, objet plan""" nomProbleme = "cubeAngle" diff --git a/src/Tools/blocFissure/CasTests/cubeAngle2.py b/src/Tools/blocFissure/CasTests/cubeAngle2.py index 3f379333e..f66a0e201 100644 --- a/src/Tools/blocFissure/CasTests/cubeAngle2.py +++ b/src/Tools/blocFissure/CasTests/cubeAngle2.py @@ -21,8 +21,8 @@ from .cubeAngle import cubeAngle class cubeAngle2(cubeAngle): - """ - problème de fissure plane coupant 2 faces (angle), débouches normaux, objet plan + """problème de fissure plane coupant 2 faces (angle), débouches normaux, objet plan + detection d'un probleme de tolerance sur les edges de jonction pipe et face fissure externe """ diff --git a/src/Tools/blocFissure/CasTests/cylindre.py b/src/Tools/blocFissure/CasTests/cylindre.py index fea83e8fa..1e9b2651c 100644 --- a/src/Tools/blocFissure/CasTests/cylindre.py +++ b/src/Tools/blocFissure/CasTests/cylindre.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class cylindre(fissureGenerique): - """ - problème de fissure plane sur cylindre, grand fond de fissure en arc de cercle - """ + """problème de fissure plane sur cylindre, grand fond de fissure en arc de cercle""" nomProbleme = "cylindre" diff --git a/src/Tools/blocFissure/CasTests/cylindre_2.py b/src/Tools/blocFissure/CasTests/cylindre_2.py index 858f80d44..517d1d442 100644 --- a/src/Tools/blocFissure/CasTests/cylindre_2.py +++ b/src/Tools/blocFissure/CasTests/cylindre_2.py @@ -38,9 +38,8 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class cylindre_2(cylindre): - """ - problème de fissure plane sur cylindre hexa, fond de fissure complexe : polyline - """ + """problème de fissure plane sur cylindre hexa, fond de fissure complexe : polyline""" + nomProbleme = "cylindre2" # --------------------------------------------------------------------------- diff --git a/src/Tools/blocFissure/CasTests/ellipse_1.py b/src/Tools/blocFissure/CasTests/ellipse_1.py index 26465ab71..ef4ca730a 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_1.py +++ b/src/Tools/blocFissure/CasTests/ellipse_1.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class ellipse_1(fissureGenerique): - """ - problème de fissure non plane, débouchante non normale - """ + """problème de fissure non plane, débouchante non normale""" nomProbleme = "ellipse1" diff --git a/src/Tools/blocFissure/CasTests/ellipse_2.py b/src/Tools/blocFissure/CasTests/ellipse_2.py index 1596e27d0..1b998477f 100644 --- a/src/Tools/blocFissure/CasTests/ellipse_2.py +++ b/src/Tools/blocFissure/CasTests/ellipse_2.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class ellipse_2(ellipse_1): - """ - problème de fissure non plane, débouchante non normale - """ + """problème de fissure non plane, débouchante non normale""" nomProbleme = "ellipse2" diff --git a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py index e7530c23d..36bde0467 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteCourbe.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class eprouvetteCourbe(fissureGenerique): - """ - problème de fissure plane coupant 3 faces (éprouvette), faces au débouché non planes, incidence presque normale - """ + """problème de fissure plane coupant 3 faces (éprouvette), faces au débouché non planes, incidence presque normale""" nomProbleme = "eprouvetteCourbe" diff --git a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py index c89908216..fc6c04d4c 100644 --- a/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py +++ b/src/Tools/blocFissure/CasTests/eprouvetteDroite_2.py @@ -41,11 +41,9 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class eprouvetteDroite_2(eprouvetteDroite): - """ - problème de fissure plane coupant 3 faces (éprouvette), débouches non normaux, objet plan - """ + """problème de fissure plane coupant 3 faces (éprouvette), débouches non normaux, objet plan""" - nomProbleme = "eprouvetteDroite2" + nomProbleme = "eprouvetteDroite_2" # --------------------------------------------------------------------------- def genereShapeFissure( self, geometriesSaines, geomParams, shapeFissureParams): diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py index f6678951f..1be9de5c4 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche.py +++ b/src/Tools/blocFissure/CasTests/faceGauche.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class faceGauche(fissureGenerique): - """ - problème de fissure non plane, débouchante non normale - """ + """problème de fissure non plane, débouchante non normale""" nomProbleme = "faceGauche" diff --git a/src/Tools/blocFissure/CasTests/faceGauche_2.py b/src/Tools/blocFissure/CasTests/faceGauche_2.py index e134c4cd0..8ebf74361 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche_2.py +++ b/src/Tools/blocFissure/CasTests/faceGauche_2.py @@ -42,11 +42,9 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class faceGauche_2(fissureGenerique): - """ - problème de fissure non plane, débouchante non normale - """ + """problème de fissure non plane, débouchante non normale""" - nomProbleme = "faceGauche2" + nomProbleme = "faceGauche_2" # --------------------------------------------------------------------------- def genereMaillageSain(self, geometriesSaines, meshParams): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_1.py b/src/Tools/blocFissure/CasTests/fissureCoude_1.py index 0a1902a30..cf41e9268 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_1.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_1.py @@ -21,10 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_1(fissureCoude): - """ - problème de fissure du Coude : - adaptation maillage - """ + """problème de fissure du Coude : adaptation maillage""" + + nomProbleme = "fissureCoude_1" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_10.py b/src/Tools/blocFissure/CasTests/fissureCoude_10.py index cfd4626a7..4e3524b08 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_10.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_10.py @@ -23,6 +23,7 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_10(fissureCoude): # cas test ASCOU17 + nomProbleme = "fissureCoude_10" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_2.py b/src/Tools/blocFissure/CasTests/fissureCoude_2.py index dcf7b79d2..6398c3609 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_2.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_2.py @@ -21,10 +21,10 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_2(fissureCoude): + """problème de fissure du Coude : adaptation maillage """ - problème de fissure du Coude : - adaptation maillage - """ + + nomProbleme = "fissureCoude_2" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_3.py b/src/Tools/blocFissure/CasTests/fissureCoude_3.py index d6e7e8a50..9742d9bdc 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_3.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_3.py @@ -21,10 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_3(fissureCoude): - """ - problème de fissure du Coude - adaptation maillage - """ + """problème de fissure du Coude - adaptation maillage""" + + nomProbleme = "fissureCoude_3" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_4.py b/src/Tools/blocFissure/CasTests/fissureCoude_4.py index 493913994..946489063 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_4.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_4.py @@ -21,10 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_4(fissureCoude): - """ - problème de fissure du Coude : ASCOU09A - adaptation maillage - """ + """problème de fissure du Coude : ASCOU09A - adaptation maillage""" + + nomProbleme = "fissureCoude_4" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_5.py b/src/Tools/blocFissure/CasTests/fissureCoude_5.py index 31fa72d96..2ef581dce 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_5.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_5.py @@ -21,10 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_5(fissureCoude): - """ - problème de fissure du Coude : - adaptation maillage - """ + """problème de fissure du Coude : - adaptation maillage""" + + nomProbleme = "fissureCoude_5" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_6.py b/src/Tools/blocFissure/CasTests/fissureCoude_6.py index e42cf5fcc..3363ccc1e 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_6.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_6.py @@ -21,7 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_6(fissureCoude): -# --- cas ASCOU08 + """ASCOU08""" + + nomProbleme = "fissureCoude_6" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_7.py b/src/Tools/blocFissure/CasTests/fissureCoude_7.py index b0f53de79..67df2a1f0 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_7.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_7.py @@ -21,7 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_7(fissureCoude): + """fissureCoude_7""" + nomProbleme = "fissureCoude_7" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_8.py b/src/Tools/blocFissure/CasTests/fissureCoude_8.py index ccb11e387..320c8333f 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_8.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_8.py @@ -21,8 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_8(fissureCoude): - # cas test ASCOU15 + """cas test ASCOU16""" + nomProbleme = "fissureCoude_8" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissureCoude_9.py b/src/Tools/blocFissure/CasTests/fissureCoude_9.py index 22782a81f..887839244 100644 --- a/src/Tools/blocFissure/CasTests/fissureCoude_9.py +++ b/src/Tools/blocFissure/CasTests/fissureCoude_9.py @@ -21,8 +21,9 @@ from blocFissure.gmu.fissureCoude import fissureCoude class fissureCoude_9(fissureCoude): - # cas test ASCOU19 + """cas test ASCOU19""" + nomProbleme = "fissureCoude_9" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude.py b/src/Tools/blocFissure/CasTests/fissure_Coude.py index 898372e11..3e22fe862 100644 --- a/src/Tools/blocFissure/CasTests/fissure_Coude.py +++ b/src/Tools/blocFissure/CasTests/fissure_Coude.py @@ -40,12 +40,12 @@ from blocFissure.gmu.insereFissureLongue import insereFissureLongue O, OX, OY, OZ = triedreBase() class fissure_Coude(fissureGenerique): - """ - problème de fissure du Coude : version de base + """problème de fissure du Coude : version de base + maillage hexa """ - nomProbleme = "tuyau_Coude" + nomProbleme = "fissure_Coude" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py index 482b5272e..e64bab927 100644 --- a/src/Tools/blocFissure/CasTests/fissure_Coude_4.py +++ b/src/Tools/blocFissure/CasTests/fissure_Coude_4.py @@ -21,11 +21,13 @@ from .fissure_Coude import fissure_Coude class fissure_Coude_4(fissure_Coude): - """ - probleme de fissure du Coude : ASCOU09A + """probleme de fissure du Coude : ASCOU09A + adaptation maillage """ + nomProbleme = "fissure_Coude_4" + # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): """ diff --git a/src/Tools/blocFissure/CasTests/vis_1.py b/src/Tools/blocFissure/CasTests/vis_1.py index 65dcedebf..4ddd3715b 100644 --- a/src/Tools/blocFissure/CasTests/vis_1.py +++ b/src/Tools/blocFissure/CasTests/vis_1.py @@ -41,9 +41,7 @@ from blocFissure.gmu.construitFissureGenerale import construitFissureGenerale O, OX, OY, OZ = triedreBase() class vis_1(fissureGenerique): - """ - problème de fissure non plane, débouchante non normale - """ + """problème de fissure non plane, débouchante non normale""" nomProbleme = "vis_1" diff --git a/src/Tools/blocFissure/gmu/fissureCoude.py b/src/Tools/blocFissure/gmu/fissureCoude.py index 95cf1904e..5cb6c83cf 100644 --- a/src/Tools/blocFissure/gmu/fissureCoude.py +++ b/src/Tools/blocFissure/gmu/fissureCoude.py @@ -48,7 +48,7 @@ class fissureCoude(fissureGenerique): maillage hexa """ - nomProbleme = "tuyau_Coude" + nomProbleme = "fissureCoude" # --------------------------------------------------------------------------- def setParamGeometrieSaine(self): diff --git a/src/Tools/blocFissure/gmu/fissureGenerique.py b/src/Tools/blocFissure/gmu/fissureGenerique.py index bbc606aee..e3f214845 100644 --- a/src/Tools/blocFissure/gmu/fissureGenerique.py +++ b/src/Tools/blocFissure/gmu/fissureGenerique.py @@ -32,7 +32,7 @@ class fissureGenerique(): génération d'un bloc défaut inséré dans le maillage sain """ - nomProbleme = "generique" + nomProbleme = "fissureGenerique" def __init__(self, numeroCas): initEtude()