Affichage

diff --git a/src/Tools/blocFissure/materielCasTests/cubeAngle.py b/src/Tools/blocFissure/materielCasTests/cubeAngle.py
index f5446196ec11c102315f00c57323141154311441..b3ed2808b02c68327785ff36125b708b6773b643 100644 (file)
--- a/src/Tools/blocFissure/materielCasTests/cubeAngle.py
+++ b/src/Tools/blocFissure/materielCasTests/cubeAngle.py
@@ -17,8 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-
-"""Géométries nécessaires aux cas-tests :
+"""Géométries et maillages de base nécessaires aux cas-tests :

 . cubeAngle
 . cubeAngle2
 """
 . cubeAngle
 . cubeAngle2
 """

diff --git a/src/Tools/blocFissure/materielCasTests/cubeFin.py b/src/Tools/blocFissure/materielCasTests/cubeFin.py
index 19b3b055e3a4bf5dbd7a58fd535aefdf8ae627e3..398da350a1e18b12106e84e41309d3640570a005 100644 (file)
--- a/src/Tools/blocFissure/materielCasTests/cubeFin.py
+++ b/src/Tools/blocFissure/materielCasTests/cubeFin.py
@@ -17,7 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-"""Géométries nécessaires aux cas-tests :
+"""Géométries et maillages de base nécessaires aux cas-tests :

 . cubeFin_Transverse
 . cubeFin_Coin
 . cubeFin_Milieu
 . cubeFin_Transverse
 . cubeFin_Coin
 . cubeFin_Milieu

diff --git a/src/Tools/blocFissure/materielCasTests/decoupeCylindre.py b/src/Tools/blocFissure/materielCasTests/decoupeCylindre.py
index 8d322a36d49c4d4894141bf926893f16b5c5e102..d9f0b4d04ab435864a6bfd61a92532fda78ea610 100644 (file)
--- a/src/Tools/blocFissure/materielCasTests/decoupeCylindre.py
+++ b/src/Tools/blocFissure/materielCasTests/decoupeCylindre.py
@@ -17,7 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-"""Géométries nécessaires aux cas-tests :
+"""Géométries et maillages de base nécessaires aux cas-tests :

 . cylindre
 . cylindre_2
 """
 . cylindre
 . cylindre_2
 """

diff --git a/src/Tools/blocFissure/materielCasTests/disque_perce.py b/src/Tools/blocFissure/materielCasTests/disque_perce.py
index da476b41b92e5b007f43951c2ccecc261743f96a..0bc931a2339228a44b8bf6520e584e5a3571b619 100644 (file)
--- a/src/Tools/blocFissure/materielCasTests/disque_perce.py
+++ b/src/Tools/blocFissure/materielCasTests/disque_perce.py
@@ -17,7 +17,7 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-"""Géométrie nécessaire au cas-test :
+"""Géométrie et maillage de base nécessaire au cas-test :

 . disque_perce
 """
 
 . disque_perce
 """
 

diff --git a/src/Tools/blocFissure/materielCasTests/tube.py b/src/Tools/blocFissure/materielCasTests/tube.py
index 3f6437aff04268aab0c691b60d95191bf077921d..fd78442cb0b0f498f2fdcff7af46624e4cbd835a 100755 (executable)
--- a/src/Tools/blocFissure/materielCasTests/tube.py
+++ b/src/Tools/blocFissure/materielCasTests/tube.py
@@ -17,21 +17,26 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

+"""Géométrie et maillage de base nécessaire au cas-test :
+. tube
+"""

 
 

-"""Cas-test de blocFissure sur un tube"""
-__revision__ = "V02.06"
+__revision__ = "V02.07"

 
 

-import logging

 import os
 
 import os
 

-from blocFissure import gmu
+import logging

 
 import salome
 from SketchAPI import *
 from salome.shaper import model
 import SHAPERSTUDY
 
 import salome
 from SketchAPI import *
 from salome.shaper import model
 import SHAPERSTUDY

-import SMESH

 from salome.smesh import smeshBuilder
 from salome.smesh import smeshBuilder

+from salome.StdMeshers import StdMeshersBuilder
+import SMESH
+
+from blocFissure import gmu
+from blocFissure.gmu.putName import putName

 
 #=============== Options ====================
 # 1. NOM_OBJET = nom de l'objet
 
 #=============== Options ====================
 # 1. NOM_OBJET = nom de l'objet


@@ -234,7 +239,7 @@ l_groups = l_aux[1:]
 
 smesh = smeshBuilder.New()
 Maillage_tube = smesh.Mesh(objet)
 
 smesh = smeshBuilder.New()
 Maillage_tube = smesh.Mesh(objet)

-smesh.SetName(Maillage_tube, NOM_OBJET)
+putName(Maillage_tube.GetMesh(), NOM_OBJET)

 
 for groupe in l_groups:
   groupe_nom = groupe.GetName()
 
 for groupe in l_groups:
   groupe_nom = groupe.GetName()


@@ -260,6 +265,15 @@ Regular_1D_2 = Maillage_tube.Segment(geom=group_h)
 Number_of_Segments_2 = Regular_1D_2.NumberOfSegments(NB_S_H)
 Propagation_of_1D_Hyp_1 = Regular_1D_2.Propagation()
 
 Number_of_Segments_2 = Regular_1D_2.NumberOfSegments(NB_S_H)
 Propagation_of_1D_Hyp_1 = Regular_1D_2.Propagation()
 

+## set object names
+#smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
+#smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
+#smesh.SetName(Hexa_3D.GetAlgorithm(), 'Hexa_3D')
+putName(Nb_Segments_1, 'Nb. Segments_1', i_pref='tube')
+putName(Number_of_Segments_1, 'Number_of_Segments_1', i_pref='tube')
+putName(Number_of_Segments_2, 'Number_of_Segments_2', i_pref='tube')
+putName(Propagation_of_1D_Hyp, 'Propagation', i_pref='tube')
+

 is_done = Maillage_tube.Compute()
 text = "Maillage_tube.Compute"
 if is_done:
 is_done = Maillage_tube.Compute()
 text = "Maillage_tube.Compute"
 if is_done:


@@ -274,11 +288,5 @@ text = ".. Archivage du maillage dans le fichier '{}'".format(ficmed)
 logging.info(text)
 Maillage_tube.ExportMED(ficmed)
 
 logging.info(text)
 Maillage_tube.ExportMED(ficmed)
 

-## set object names
-smesh.SetName(Regular_1D.GetAlgorithm(), 'Regular_1D')
-smesh.SetName(Nb_Segments_1, 'Nb. Segments_1')
-smesh.SetName(Quadrangle_2D.GetAlgorithm(), 'Quadrangle_2D')
-smesh.SetName(Hexa_3D.GetAlgorithm(), 'Hexa_3D')
-

 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()