X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2FsmeshBuilder.py;h=1817d97ac42cd1fd0c33178b8c4033a4905b2f3b;hb=d3e1cabf77f67408ac401e2d387e721605cb3b10;hp=9a7b7611bfe17201619e1c9793822d2acfabc382;hpb=831b40eb011a5f2ad1738518e86fdc6d924f891d;p=modules%2Fsmesh.git
diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py
index 9a7b7611b..1817d97ac 100644
--- a/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@ -27,6 +27,10 @@
## @defgroup l1_creating Creating meshes
## @{
## @defgroup l2_impexp Importing and exporting meshes
+## @{
+## @details
+## These are methods of class \ref smeshBuilder.smeshBuilder "smeshBuilder"
+## @}
## @defgroup l2_construct Constructing meshes
## @defgroup l2_algorithms Defining Algorithms
## @{
@@ -45,8 +49,7 @@
## @defgroup l3_hypos_additi Additional Hypotheses
## @}
-## @defgroup l2_submeshes Constructing submeshes
-## @defgroup l2_compounds Building Compounds
+## @defgroup l2_submeshes Constructing sub-meshes
## @defgroup l2_editing Editing Meshes
## @}
@@ -55,7 +58,6 @@
## @defgroup l1_grouping Grouping elements
## @{
## @defgroup l2_grps_create Creating groups
-## @defgroup l2_grps_edit Editing groups
## @defgroup l2_grps_operon Using operations on groups
## @defgroup l2_grps_delete Deleting Groups
@@ -67,15 +69,13 @@
## @defgroup l2_modif_edit Modifying nodes and elements
## @defgroup l2_modif_renumber Renumbering nodes and elements
## @defgroup l2_modif_trsf Transforming meshes (Translation, Rotation, Symmetry, Sewing, Merging)
-## @defgroup l2_modif_movenode Moving nodes
-## @defgroup l2_modif_throughp Mesh through point
## @defgroup l2_modif_unitetri Uniting triangles
## @defgroup l2_modif_cutquadr Cutting elements
## @defgroup l2_modif_changori Changing orientation of elements
## @defgroup l2_modif_smooth Smoothing
## @defgroup l2_modif_extrurev Extrusion and Revolution
-## @defgroup l2_modif_patterns Pattern mapping
## @defgroup l2_modif_tofromqu Convert to/from Quadratic Mesh
+## @defgroup l2_modif_duplicat Duplication of nodes and elements (to emulate cracks)
## @}
## @defgroup l1_measurements Measurements
@@ -84,13 +84,94 @@ import salome
from salome.geom import geomBuilder
import SMESH # This is necessary for back compatibility
+import omniORB # back compatibility
+SMESH.MED_V2_1 = omniORB.EnumItem("MED_V2_1", 0) # back compatibility
+SMESH.MED_V2_2 = omniORB.EnumItem("MED_V2_2", 1) # back compatibility
+
from SMESH import *
from salome.smesh.smesh_algorithm import Mesh_Algorithm
import SALOME
import SALOMEDS
import os
+import inspect
+
+# In case the omniORBpy EnumItem class does not fully support Python 3
+# (for instance in version 4.2.1-2), the comparison ordering methods must be
+# defined
+#
+try:
+ SMESH.Entity_Triangle < SMESH.Entity_Quadrangle
+except TypeError:
+ def enumitem_eq(self, other):
+ try:
+ if isinstance(other, omniORB.EnumItem):
+ if other._parent_id == self._parent_id:
+ return self._v == other._v
+ else:
+ return self._parent_id == other._parent_id
+ else:
+ return id(self) == id(other)
+ except:
+ return id(self) == id(other)
+
+ def enumitem_lt(self, other):
+ try:
+ if isinstance(other, omniORB.EnumItem):
+ if other._parent_id == self._parent_id:
+ return self._v < other._v
+ else:
+ return self._parent_id < other._parent_id
+ else:
+ return id(self) < id(other)
+ except:
+ return id(self) < id(other)
+
+ def enumitem_le(self, other):
+ try:
+ if isinstance(other, omniORB.EnumItem):
+ if other._parent_id == self._parent_id:
+ return self._v <= other._v
+ else:
+ return self._parent_id <= other._parent_id
+ else:
+ return id(self) <= id(other)
+ except:
+ return id(self) <= id(other)
+ def enumitem_gt(self, other):
+ try:
+ if isinstance(other, omniORB.EnumItem):
+ if other._parent_id == self._parent_id:
+ return self._v > other._v
+ else:
+ return self._parent_id > other._parent_id
+ else:
+ return id(self) > id(other)
+ except:
+ return id(self) > id(other)
+
+ def enumitem_ge(self, other):
+ try:
+ if isinstance(other, omniORB.EnumItem):
+ if other._parent_id == self._parent_id:
+ return self._v >= other._v
+ else:
+ return self._parent_id >= other._parent_id
+ else:
+ return id(self) >= id(other)
+ except:
+ return id(self) >= id(other)
+
+ omniORB.EnumItem.__eq__ = enumitem_eq
+ omniORB.EnumItem.__lt__ = enumitem_lt
+ omniORB.EnumItem.__le__ = enumitem_le
+ omniORB.EnumItem.__gt__ = enumitem_gt
+ omniORB.EnumItem.__ge__ = enumitem_ge
+
+
+## Private class used to workaround a problem that sometimes isinstance(m, Mesh) returns False
+#
class MeshMeta(type):
def __instancecheck__(cls, inst):
"""Implement isinstance(inst, cls)."""
@@ -104,7 +185,7 @@ class MeshMeta(type):
## @addtogroup l1_auxiliary
## @{
-## Converts an angle from degrees to radians
+## Convert an angle from degrees to radians
def DegreesToRadians(AngleInDegrees):
from math import pi
return AngleInDegrees * pi / 180.0
@@ -121,7 +202,7 @@ def ParseParameters(*args):
Parameters = ""
hasVariables = False
varModifFun=None
- if args and callable( args[-1] ):
+ if args and callable(args[-1]):
args, varModifFun = args[:-1], args[-1]
for parameter in args:
@@ -130,7 +211,7 @@ def ParseParameters(*args):
if isinstance(parameter,str):
# check if there is an inexistent variable name
if not notebook.isVariable(parameter):
- raise ValueError, "Variable with name '" + parameter + "' doesn't exist!!!"
+ raise ValueError("Variable with name '" + parameter + "' doesn't exist!!!")
parameter = notebook.get(parameter)
hasVariables = True
if varModifFun:
@@ -145,28 +226,28 @@ def ParseParameters(*args):
Result.append( hasVariables )
return Result
-# Parse parameters converting variables to radians
+## Parse parameters while converting variables to radians
def ParseAngles(*args):
return ParseParameters( *( args + (DegreesToRadians, )))
-# Substitute PointStruct.__init__() to create SMESH.PointStruct using notebook variables.
-# Parameters are stored in PointStruct.parameters attribute
+## Substitute PointStruct.__init__() to create SMESH.PointStruct using notebook variables.
+# Parameters are stored in PointStruct.parameters attribute
def __initPointStruct(point,*args):
point.x, point.y, point.z, point.parameters,hasVars = ParseParameters(*args)
pass
SMESH.PointStruct.__init__ = __initPointStruct
-# Substitute AxisStruct.__init__() to create SMESH.AxisStruct using notebook variables.
-# Parameters are stored in AxisStruct.parameters attribute
+## Substitute AxisStruct.__init__() to create SMESH.AxisStruct using notebook variables.
+# Parameters are stored in AxisStruct.parameters attribute
def __initAxisStruct(ax,*args):
if len( args ) != 6:
- raise RuntimeError,\
- "Bad nb args (%s) passed in SMESH.AxisStruct(x,y,z,dx,dy,dz)"%(len( args ))
+ raise RuntimeError("Bad nb args (%s) passed in SMESH.AxisStruct(x,y,z,dx,dy,dz)"%(len( args )))
ax.x, ax.y, ax.z, ax.vx, ax.vy, ax.vz, ax.parameters,hasVars = ParseParameters(*args)
pass
SMESH.AxisStruct.__init__ = __initAxisStruct
smeshPrecisionConfusion = 1.e-07
+## Compare real values using smeshPrecisionConfusion as tolerance
def IsEqual(val1, val2, tol=smeshPrecisionConfusion):
if abs(val1 - val2) < tol:
return True
@@ -174,7 +255,7 @@ def IsEqual(val1, val2, tol=smeshPrecisionConfusion):
NO_NAME = "NoName"
-## Gets object name
+## Return object name
def GetName(obj):
if obj:
# object not null
@@ -186,13 +267,8 @@ def GetName(obj):
except:
ior = None
if ior:
- # CORBA object
- studies = salome.myStudyManager.GetOpenStudies()
- for sname in studies:
- s = salome.myStudyManager.GetStudyByName(sname)
- if not s: continue
- sobj = s.FindObjectIOR(ior)
- if not sobj: continue
+ sobj = salome.myStudy.FindObjectIOR(ior)
+ if sobj:
return sobj.GetName()
if hasattr(obj, "GetName"):
# unknown CORBA object, having GetName() method
@@ -205,9 +281,9 @@ def GetName(obj):
# unknown non-CORBA object, having GetName() method
return obj.GetName()
pass
- raise RuntimeError, "Null or invalid object"
+ raise RuntimeError("Null or invalid object")
-## Prints error message if a hypothesis was not assigned.
+## Print error message if a hypothesis was not assigned.
def TreatHypoStatus(status, hypName, geomName, isAlgo, mesh):
if isAlgo:
hypType = "algorithm"
@@ -216,21 +292,21 @@ def TreatHypoStatus(status, hypName, geomName, isAlgo, mesh):
pass
reason = ""
if hasattr( status, "__getitem__" ):
- status,reason = status[0],status[1]
- if status == HYP_UNKNOWN_FATAL :
+ status, reason = status[0], status[1]
+ if status == HYP_UNKNOWN_FATAL:
reason = "for unknown reason"
- elif status == HYP_INCOMPATIBLE :
+ elif status == HYP_INCOMPATIBLE:
reason = "this hypothesis mismatches the algorithm"
- elif status == HYP_NOTCONFORM :
+ elif status == HYP_NOTCONFORM:
reason = "a non-conform mesh would be built"
- elif status == HYP_ALREADY_EXIST :
+ elif status == HYP_ALREADY_EXIST:
if isAlgo: return # it does not influence anything
reason = hypType + " of the same dimension is already assigned to this shape"
- elif status == HYP_BAD_DIM :
+ elif status == HYP_BAD_DIM:
reason = hypType + " mismatches the shape"
- elif status == HYP_CONCURENT :
+ elif status == HYP_CONCURENT:
reason = "there are concurrent hypotheses on sub-shapes"
- elif status == HYP_BAD_SUBSHAPE :
+ elif status == HYP_BAD_SUBSHAPE:
reason = "the shape is neither the main one, nor its sub-shape, nor a valid group"
elif status == HYP_BAD_GEOMETRY:
reason = "the algorithm is not applicable to this geometry"
@@ -252,26 +328,21 @@ def TreatHypoStatus(status, hypName, geomName, isAlgo, mesh):
if meshName and meshName != NO_NAME:
where = '"%s" shape in "%s" mesh ' % ( geomName, meshName )
if status < HYP_UNKNOWN_FATAL and where:
- print '"%s" was assigned to %s but %s' %( hypName, where, reason )
+ print('"%s" was assigned to %s but %s' %( hypName, where, reason ))
elif where:
- print '"%s" was not assigned to %s : %s' %( hypName, where, reason )
+ print('"%s" was not assigned to %s : %s' %( hypName, where, reason ))
else:
- print '"%s" was not assigned : %s' %( hypName, reason )
+ print('"%s" was not assigned : %s' %( hypName, reason ))
pass
## Private method. Add geom (sub-shape of the main shape) into the study if not yet there
def AssureGeomPublished(mesh, geom, name=''):
if not isinstance( geom, geomBuilder.GEOM._objref_GEOM_Object ):
return
- if not geom.GetStudyEntry() and \
- mesh.smeshpyD.GetCurrentStudy():
- ## set the study
- studyID = mesh.smeshpyD.GetCurrentStudy()._get_StudyId()
- if studyID != mesh.geompyD.myStudyId:
- mesh.geompyD.init_geom( mesh.smeshpyD.GetCurrentStudy())
+ if not geom.GetStudyEntry():
## get a name
if not name and geom.GetShapeType() != geomBuilder.GEOM.COMPOUND:
- # for all groups SubShapeName() returns "Compound_-1"
+ # for all groups SubShapeName() return "Compound_-1"
name = mesh.geompyD.SubShapeName(geom, mesh.geom)
if not name:
name = "%s_%s"%(geom.GetShapeType(), id(geom)%10000)
@@ -283,7 +354,7 @@ def AssureGeomPublished(mesh, geom, name=''):
def FirstVertexOnCurve(mesh, edge):
vv = mesh.geompyD.SubShapeAll( edge, geomBuilder.geomBuilder.ShapeType["VERTEX"])
if not vv:
- raise TypeError, "Given object has no vertices"
+ raise TypeError("Given object has no vertices")
if len( vv ) == 1: return vv[0]
v0 = mesh.geompyD.MakeVertexOnCurve(edge,0.)
xyz = mesh.geompyD.PointCoordinates( v0 ) # coords of the first vertex
@@ -298,6 +369,10 @@ def FirstVertexOnCurve(mesh, edge):
else:
return vv[1]
+## Return a long value from enumeration
+def EnumToLong(theItem):
+ return theItem._v
+
# end of l1_auxiliary
## @}
@@ -311,7 +386,7 @@ created = False
## This class allows to create, load or manipulate meshes.
# It has a set of methods to create, load or copy meshes, to combine several meshes, etc.
# It also has methods to get infos and measure meshes.
-class smeshBuilder(object, SMESH._objref_SMESH_Gen):
+class smeshBuilder(SMESH._objref_SMESH_Gen):
# MirrorType enumeration
POINT = SMESH_MeshEditor.POINT
@@ -325,12 +400,12 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
PrecisionConfusion = smeshPrecisionConfusion
# TopAbs_State enumeration
- [TopAbs_IN, TopAbs_OUT, TopAbs_ON, TopAbs_UNKNOWN] = range(4)
+ [TopAbs_IN, TopAbs_OUT, TopAbs_ON, TopAbs_UNKNOWN] = list(range(4))
# Methods of splitting a hexahedron into tetrahedra
Hex_5Tet, Hex_6Tet, Hex_24Tet, Hex_2Prisms, Hex_4Prisms = 1, 2, 3, 1, 2
- def __new__(cls):
+ def __new__(cls, *args):
global engine
global smeshInst
global doLcc
@@ -367,38 +442,40 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
#print "====2 ", smeshInst
return smeshInst
- def __init__(self):
+ def __init__(self, *args):
global created
#print "--------------- smeshbuilder __init__ ---", created
if not created:
- created = True
- SMESH._objref_SMESH_Gen.__init__(self)
+ created = True
+ SMESH._objref_SMESH_Gen.__init__(self, *args)
## Dump component to the Python script
# This method overrides IDL function to allow default values for the parameters.
- def DumpPython(self, theStudy, theIsPublished=True, theIsMultiFile=True):
- return SMESH._objref_SMESH_Gen.DumpPython(self, theStudy, theIsPublished, theIsMultiFile)
+ # @ingroup l1_auxiliary
+ def DumpPython(self, theIsPublished=True, theIsMultiFile=True):
+ return SMESH._objref_SMESH_Gen.DumpPython(self, theIsPublished, theIsMultiFile)
## Set mode of DumpPython(), \a historical or \a snapshot.
- # In the \a historical mode, the Python Dump script includes all commands
- # performed by SMESH engine. In the \a snapshot mode, commands
- # relating to objects removed from the Study are excluded from the script
- # as well as commands not influencing the current state of meshes
+ # In the \a historical mode, the Python Dump script includes all commands
+ # performed by SMESH engine. In the \a snapshot mode, commands
+ # relating to objects removed from the Study are excluded from the script
+ # as well as commands not influencing the current state of meshes
+ # @ingroup l1_auxiliary
def SetDumpPythonHistorical(self, isHistorical):
if isHistorical: val = "true"
else: val = "false"
SMESH._objref_SMESH_Gen.SetOption(self, "historical_python_dump", val)
- ## Sets the current study and Geometry component
+ ## Set Geometry component
# @ingroup l1_auxiliary
- def init_smesh(self,theStudy,geompyD = None):
+ def init_smesh(self,isPublished = True,geompyD = None):
#print "init_smesh"
- self.SetCurrentStudy(theStudy,geompyD)
- if theStudy:
+ self.UpdateStudy(geompyD)
+ if isPublished:
global notebook
- notebook.myStudy = theStudy
+ notebook.myStudy = salome.myStudy
- ## Creates a mesh. This can be either an empty mesh, possibly having an underlying geometry,
+ ## Create a mesh. This can be either an empty mesh, possibly having an underlying geometry,
# or a mesh wrapping a CORBA mesh given as a parameter.
# @param obj either (1) a CORBA mesh (SMESH._objref_SMESH_Mesh) got e.g. by calling
# salome.myStudy.FindObjectID("0:1:2:3").GetObject() or
@@ -412,15 +489,10 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
obj,name = name,obj
return Mesh(self,self.geompyD,obj,name)
- ## Returns a long value from enumeration
- # @ingroup l1_controls
- def EnumToLong(self,theItem):
- return theItem._v
-
- ## Returns a string representation of the color.
+ ## Return a string representation of the color.
# To be used with filters.
# @param c color value (SALOMEDS.Color)
- # @ingroup l1_controls
+ # @ingroup l1_auxiliary
def ColorToString(self,c):
val = ""
if isinstance(c, SALOMEDS.Color):
@@ -428,10 +500,10 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
elif isinstance(c, str):
val = c
else:
- raise ValueError, "Color value should be of string or SALOMEDS.Color type"
+ raise ValueError("Color value should be of string or SALOMEDS.Color type")
return val
- ## Gets PointStruct from vertex
+ ## Get PointStruct from vertex
# @param theVertex a GEOM object(vertex)
# @return SMESH.PointStruct
# @ingroup l1_auxiliary
@@ -439,14 +511,14 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
[x, y, z] = self.geompyD.PointCoordinates(theVertex)
return PointStruct(x,y,z)
- ## Gets DirStruct from vector
+ ## Get DirStruct from vector
# @param theVector a GEOM object(vector)
# @return SMESH.DirStruct
# @ingroup l1_auxiliary
def GetDirStruct(self,theVector):
vertices = self.geompyD.SubShapeAll( theVector, geomBuilder.geomBuilder.ShapeType["VERTEX"] )
if(len(vertices) != 2):
- print "Error: vector object is incorrect."
+ print("Error: vector object is incorrect.")
return None
p1 = self.geompyD.PointCoordinates(vertices[0])
p2 = self.geompyD.PointCoordinates(vertices[1])
@@ -454,7 +526,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
dirst = DirStruct(pnt)
return dirst
- ## Makes DirStruct from a triplet
+ ## Make DirStruct from a triplet
# @param x,y,z vector components
# @return SMESH.DirStruct
# @ingroup l1_auxiliary
@@ -497,7 +569,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# From SMESH_Gen interface:
# ------------------------
- ## Sets the given name to the object
+ ## Set the given name to the object
# @param obj the object to rename
# @param name a new object name
# @ingroup l1_auxiliary
@@ -509,45 +581,43 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
ior = salome.orb.object_to_string(obj)
SMESH._objref_SMESH_Gen.SetName(self, ior, name)
- ## Sets the current mode
+ ## Set the current mode
# @ingroup l1_auxiliary
def SetEmbeddedMode( self,theMode ):
SMESH._objref_SMESH_Gen.SetEmbeddedMode(self,theMode)
- ## Gets the current mode
+ ## Get the current mode
# @ingroup l1_auxiliary
def IsEmbeddedMode(self):
return SMESH._objref_SMESH_Gen.IsEmbeddedMode(self)
-
- ## Sets the current study. Calling SetCurrentStudy( None ) allows to
- # switch OFF automatic pubilishing in the Study of mesh objects.
+
+ ## Update the current study. Calling UpdateStudy() allows to
+ # update meshes at switching GEOM->SMESH
# @ingroup l1_auxiliary
- def SetCurrentStudy( self, theStudy, geompyD = None ):
+ def UpdateStudy( self, geompyD = None ):
+ #self.UpdateStudy()
if not geompyD:
from salome.geom import geomBuilder
geompyD = geomBuilder.geom
pass
self.geompyD=geompyD
self.SetGeomEngine(geompyD)
- SMESH._objref_SMESH_Gen.SetCurrentStudy(self,theStudy)
- global notebook
- if theStudy:
- notebook = salome_notebook.NoteBook( theStudy )
- else:
- notebook = salome_notebook.NoteBook( salome_notebook.PseudoStudyForNoteBook() )
- if theStudy:
- sb = theStudy.NewBuilder()
- sc = theStudy.FindComponent("SMESH")
- if sc: sb.LoadWith(sc, self)
- pass
+ SMESH._objref_SMESH_Gen.UpdateStudy(self)
+ sb = salome.myStudy.NewBuilder()
+ sc = salome.myStudy.FindComponent("SMESH")
+ if sc: sb.LoadWith(sc, self)
pass
-
- ## Gets the current study
+
+ ## Sets enable publishing in the study. Calling SetEnablePublish( false ) allows to
+ # switch OFF publishing in the Study of mesh objects.
# @ingroup l1_auxiliary
- def GetCurrentStudy(self):
- return SMESH._objref_SMESH_Gen.GetCurrentStudy(self)
+ def SetEnablePublish( self, theIsEnablePublish ):
+ #self.SetEnablePublish(theIsEnablePublish)
+ SMESH._objref_SMESH_Gen.SetEnablePublish(self,theIsEnablePublish)
+ global notebook
+ notebook = salome_notebook.NoteBook( theIsEnablePublish )
- ## Creates a Mesh object importing data from the given UNV file
+ ## Create a Mesh object importing data from the given UNV file
# @return an instance of Mesh class
# @ingroup l2_impexp
def CreateMeshesFromUNV( self,theFileName ):
@@ -555,7 +625,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aMesh = Mesh(self, self.geompyD, aSmeshMesh)
return aMesh
- ## Creates a Mesh object(s) importing data from the given MED file
+ ## Create a Mesh object(s) importing data from the given MED file
# @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus )
# @ingroup l2_impexp
def CreateMeshesFromMED( self,theFileName ):
@@ -563,7 +633,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ]
return aMeshes, aStatus
- ## Creates a Mesh object(s) importing data from the given SAUV file
+ ## Create a Mesh object(s) importing data from the given SAUV file
# @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus )
# @ingroup l2_impexp
def CreateMeshesFromSAUV( self,theFileName ):
@@ -571,7 +641,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ]
return aMeshes, aStatus
- ## Creates a Mesh object importing data from the given STL file
+ ## Create a Mesh object importing data from the given STL file
# @return an instance of Mesh class
# @ingroup l2_impexp
def CreateMeshesFromSTL( self, theFileName ):
@@ -579,7 +649,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aMesh = Mesh(self, self.geompyD, aSmeshMesh)
return aMesh
- ## Creates Mesh objects importing data from the given CGNS file
+ ## Create Mesh objects importing data from the given CGNS file
# @return a tuple ( list of Mesh class instances, SMESH.DriverMED_ReadStatus )
# @ingroup l2_impexp
def CreateMeshesFromCGNS( self, theFileName ):
@@ -587,7 +657,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aMeshes = [ Mesh(self, self.geompyD, m) for m in aSmeshMeshes ]
return aMeshes, aStatus
- ## Creates a Mesh object importing data from the given GMF file.
+ ## Create a Mesh object importing data from the given GMF file.
# GMF files must have .mesh extension for the ASCII format and .meshb for
# the binary format.
# @return [ an instance of Mesh class, SMESH.ComputeError ]
@@ -596,7 +666,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aSmeshMesh, error = SMESH._objref_SMESH_Gen.CreateMeshesFromGMF(self,
theFileName,
True)
- if error.comment: print "*** CreateMeshesFromGMF() errors:\n", error.comment
+ if error.comment: print("*** CreateMeshesFromGMF() errors:\n", error.comment)
return Mesh(self, self.geompyD, aSmeshMesh), error
## Concatenate the given meshes into one mesh. All groups of input meshes will be
@@ -608,7 +678,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# @param allGroups forces creation of groups corresponding to every input mesh
# @param name name of a new mesh
# @return an instance of Mesh class
- # @ingroup l2_compounds
+ # @ingroup l1_creating
def Concatenate( self, meshes, uniteIdenticalGroups,
mergeNodesAndElements = False, mergeTolerance = 1e-5, allGroups = False,
name = ""):
@@ -635,29 +705,30 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# @param toCopyGroups to create in the new mesh groups the copied elements belongs to
# @param toKeepIDs to preserve order of the copied elements or not
# @return an instance of Mesh class
+ # @ingroup l1_creating
def CopyMesh( self, meshPart, meshName, toCopyGroups=False, toKeepIDs=False):
if (isinstance( meshPart, Mesh )):
meshPart = meshPart.GetMesh()
mesh = SMESH._objref_SMESH_Gen.CopyMesh( self,meshPart,meshName,toCopyGroups,toKeepIDs )
return Mesh(self, self.geompyD, mesh)
- ## From SMESH_Gen interface
+ ## Return IDs of sub-shapes
# @return the list of integer values
# @ingroup l1_auxiliary
def GetSubShapesId( self, theMainObject, theListOfSubObjects ):
return SMESH._objref_SMESH_Gen.GetSubShapesId(self,theMainObject, theListOfSubObjects)
- ## From SMESH_Gen interface. Creates a pattern
+ ## Create a pattern mapper.
# @return an instance of SMESH_Pattern
#
# Example of Patterns usage
- # @ingroup l2_modif_patterns
+ # @ingroup l1_modifying
def GetPattern(self):
return SMESH._objref_SMESH_Gen.GetPattern(self)
- ## Sets number of segments per diagonal of boundary box of geometry by which
- # default segment length of appropriate 1D hypotheses is defined.
- # Default value is 10
+ ## Set number of segments per diagonal of boundary box of geometry, by which
+ # default segment length of appropriate 1D hypotheses is defined in GUI.
+ # Default value is 10.
# @ingroup l1_auxiliary
def SetBoundaryBoxSegmentation(self, nbSegments):
SMESH._objref_SMESH_Gen.SetBoundaryBoxSegmentation(self,nbSegments)
@@ -665,24 +736,24 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# Filtering. Auxiliary functions:
# ------------------------------
- ## Creates an empty criterion
+ ## Create an empty criterion
# @return SMESH.Filter.Criterion
# @ingroup l1_controls
def GetEmptyCriterion(self):
- Type = self.EnumToLong(FT_Undefined)
- Compare = self.EnumToLong(FT_Undefined)
+ Type = EnumToLong(FT_Undefined)
+ Compare = EnumToLong(FT_Undefined)
Threshold = 0
ThresholdStr = ""
ThresholdID = ""
- UnaryOp = self.EnumToLong(FT_Undefined)
- BinaryOp = self.EnumToLong(FT_Undefined)
+ UnaryOp = EnumToLong(FT_Undefined)
+ BinaryOp = EnumToLong(FT_Undefined)
Tolerance = 1e-07
TypeOfElement = ALL
Precision = -1 ##@1e-07
return Filter.Criterion(Type, Compare, Threshold, ThresholdStr, ThresholdID,
UnaryOp, BinaryOp, Tolerance, TypeOfElement, Precision)
- ## Creates a criterion by the given parameters
+ ## Create a criterion by the given parameters
# \n Criterion structures allow to define complex filters by combining them with logical operations (AND / OR) (see example below)
# @param elementType the type of elements(SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME)
# @param CritType the type of criterion (SMESH.FT_Taper, SMESH.FT_Area, etc.)
@@ -707,24 +778,24 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
BinaryOp=FT_Undefined,
Tolerance=1e-07):
if not CritType in SMESH.FunctorType._items:
- raise TypeError, "CritType should be of SMESH.FunctorType"
+ raise TypeError("CritType should be of SMESH.FunctorType")
aCriterion = self.GetEmptyCriterion()
aCriterion.TypeOfElement = elementType
- aCriterion.Type = self.EnumToLong(CritType)
+ aCriterion.Type = EnumToLong(CritType)
aCriterion.Tolerance = Tolerance
aThreshold = Threshold
if Compare in [FT_LessThan, FT_MoreThan, FT_EqualTo]:
- aCriterion.Compare = self.EnumToLong(Compare)
+ aCriterion.Compare = EnumToLong(Compare)
elif Compare == "=" or Compare == "==":
- aCriterion.Compare = self.EnumToLong(FT_EqualTo)
+ aCriterion.Compare = EnumToLong(FT_EqualTo)
elif Compare == "<":
- aCriterion.Compare = self.EnumToLong(FT_LessThan)
+ aCriterion.Compare = EnumToLong(FT_LessThan)
elif Compare == ">":
- aCriterion.Compare = self.EnumToLong(FT_MoreThan)
+ aCriterion.Compare = EnumToLong(FT_MoreThan)
elif Compare != FT_Undefined:
- aCriterion.Compare = self.EnumToLong(FT_EqualTo)
+ aCriterion.Compare = EnumToLong(FT_EqualTo)
aThreshold = Compare
if CritType in [FT_BelongToGeom, FT_BelongToPlane, FT_BelongToGenSurface,
@@ -742,7 +813,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
elif isinstance( aThreshold, str ):
aCriterion.ThresholdStr = aThreshold
else:
- raise TypeError, "The Threshold should be a shape."
+ raise TypeError("The Threshold should be a shape.")
if isinstance(UnaryOp,float):
aCriterion.Tolerance = UnaryOp
UnaryOp = FT_Undefined
@@ -751,10 +822,10 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# Check that Threshold is a group
if isinstance(aThreshold, SMESH._objref_SMESH_GroupBase):
if aThreshold.GetType() != elementType:
- raise ValueError, "Group type mismatches Element type"
+ raise ValueError("Group type mismatches Element type")
aCriterion.ThresholdStr = aThreshold.GetName()
aCriterion.ThresholdID = salome.orb.object_to_string( aThreshold )
- study = self.GetCurrentStudy()
+ study = salome.myStudy
if study:
so = study.FindObjectIOR( aCriterion.ThresholdID )
if so:
@@ -762,13 +833,13 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
if entry:
aCriterion.ThresholdID = entry
else:
- raise TypeError, "The Threshold should be a Mesh Group"
+ raise TypeError("The Threshold should be a Mesh Group")
elif CritType == FT_RangeOfIds:
# Check that Threshold is string
if isinstance(aThreshold, str):
aCriterion.ThresholdStr = aThreshold
else:
- raise TypeError, "The Threshold should be a string."
+ raise TypeError("The Threshold should be a string.")
elif CritType == FT_CoplanarFaces:
# Check the Threshold
if isinstance(aThreshold, int):
@@ -776,11 +847,10 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
elif isinstance(aThreshold, str):
ID = int(aThreshold)
if ID < 1:
- raise ValueError, "Invalid ID of mesh face: '%s'"%aThreshold
+ raise ValueError("Invalid ID of mesh face: '%s'"%aThreshold)
aCriterion.ThresholdID = aThreshold
else:
- raise TypeError,\
- "The Threshold should be an ID of mesh face and not '%s'"%aThreshold
+ raise TypeError("The Threshold should be an ID of mesh face and not '%s'"%aThreshold)
elif CritType == FT_ConnectedElements:
# Check the Threshold
if isinstance(aThreshold, geomBuilder.GEOM._objref_GEOM_Object): # shape
@@ -794,7 +864,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aCriterion.Threshold = aThreshold
elif isinstance(aThreshold, list): # 3 point coordinates
if len( aThreshold ) < 3:
- raise ValueError, "too few point coordinates, must be 3"
+ raise ValueError("too few point coordinates, must be 3")
aCriterion.ThresholdStr = " ".join( [str(c) for c in aThreshold[:3]] )
elif isinstance(aThreshold, str):
if aThreshold.isdigit():
@@ -802,40 +872,39 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
else:
aCriterion.ThresholdStr = aThreshold # hope that it's point coordinates
else:
- raise TypeError,\
- "The Threshold should either a VERTEX, or a node ID, "\
- "or a list of point coordinates and not '%s'"%aThreshold
+ raise TypeError("The Threshold should either a VERTEX, or a node ID, "\
+ "or a list of point coordinates and not '%s'"%aThreshold)
elif CritType == FT_ElemGeomType:
# Check the Threshold
try:
- aCriterion.Threshold = self.EnumToLong(aThreshold)
+ aCriterion.Threshold = EnumToLong(aThreshold)
assert( aThreshold in SMESH.GeometryType._items )
except:
if isinstance(aThreshold, int):
aCriterion.Threshold = aThreshold
else:
- raise TypeError, "The Threshold should be an integer or SMESH.GeometryType."
+ raise TypeError("The Threshold should be an integer or SMESH.GeometryType.")
pass
pass
elif CritType == FT_EntityType:
# Check the Threshold
try:
- aCriterion.Threshold = self.EnumToLong(aThreshold)
+ aCriterion.Threshold = EnumToLong(aThreshold)
assert( aThreshold in SMESH.EntityType._items )
except:
if isinstance(aThreshold, int):
aCriterion.Threshold = aThreshold
else:
- raise TypeError, "The Threshold should be an integer or SMESH.EntityType."
+ raise TypeError("The Threshold should be an integer or SMESH.EntityType.")
pass
pass
-
+
elif CritType == FT_GroupColor:
# Check the Threshold
try:
aCriterion.ThresholdStr = self.ColorToString(aThreshold)
except:
- raise TypeError, "The threshold value should be of SALOMEDS.Color type"
+ raise TypeError("The threshold value should be of SALOMEDS.Color type")
pass
elif CritType in [FT_FreeBorders, FT_FreeEdges, FT_FreeNodes, FT_FreeFaces,
FT_LinearOrQuadratic, FT_BadOrientedVolume,
@@ -844,7 +913,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
FT_EqualNodes,FT_EqualEdges,FT_EqualFaces,FT_EqualVolumes ]:
# At this point the Threshold is unnecessary
if aThreshold == FT_LogicalNOT:
- aCriterion.UnaryOp = self.EnumToLong(FT_LogicalNOT)
+ aCriterion.UnaryOp = EnumToLong(FT_LogicalNOT)
elif aThreshold in [FT_LogicalAND, FT_LogicalOR]:
aCriterion.BinaryOp = aThreshold
else:
@@ -853,24 +922,24 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aThreshold = float(aThreshold)
aCriterion.Threshold = aThreshold
except:
- raise TypeError, "The Threshold should be a number."
+ raise TypeError("The Threshold should be a number.")
return None
if Threshold == FT_LogicalNOT or UnaryOp == FT_LogicalNOT:
- aCriterion.UnaryOp = self.EnumToLong(FT_LogicalNOT)
+ aCriterion.UnaryOp = EnumToLong(FT_LogicalNOT)
if Threshold in [FT_LogicalAND, FT_LogicalOR]:
- aCriterion.BinaryOp = self.EnumToLong(Threshold)
+ aCriterion.BinaryOp = EnumToLong(Threshold)
if UnaryOp in [FT_LogicalAND, FT_LogicalOR]:
- aCriterion.BinaryOp = self.EnumToLong(UnaryOp)
+ aCriterion.BinaryOp = EnumToLong(UnaryOp)
if BinaryOp in [FT_LogicalAND, FT_LogicalOR]:
- aCriterion.BinaryOp = self.EnumToLong(BinaryOp)
+ aCriterion.BinaryOp = EnumToLong(BinaryOp)
return aCriterion
- ## Creates a filter with the given parameters
+ ## Create a filter with the given parameters
# @param elementType the type of elements (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME)
# @param CritType the type of criterion (SMESH.FT_Taper, SMESH.FT_Area, etc.)
# Type SMESH.FunctorType._items in the Python Console to see all values.
@@ -904,7 +973,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
aFilterMgr.UnRegister()
return aFilter
- ## Creates a filter from criteria
+ ## Create a filter from criteria
# @param criteria a list of criteria
# @param binOp binary operator used when binary operator of criteria is undefined
# @return SMESH_Filter
@@ -913,15 +982,15 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# @ingroup l1_controls
def GetFilterFromCriteria(self,criteria, binOp=SMESH.FT_LogicalAND):
for i in range( len( criteria ) - 1 ):
- if criteria[i].BinaryOp == self.EnumToLong( SMESH.FT_Undefined ):
- criteria[i].BinaryOp = self.EnumToLong( binOp )
+ if criteria[i].BinaryOp == EnumToLong( SMESH.FT_Undefined ):
+ criteria[i].BinaryOp = EnumToLong( binOp )
aFilterMgr = self.CreateFilterManager()
aFilter = aFilterMgr.CreateFilter()
aFilter.SetCriteria(criteria)
aFilterMgr.UnRegister()
return aFilter
- ## Creates a numerical functor by its type
+ ## Create a numerical functor by its type
# @param theCriterion functor type - an item of SMESH.FunctorType enumeration.
# Type SMESH.FunctorType._items in the Python Console to see all items.
# Note that not all items correspond to numerical functors.
@@ -965,11 +1034,11 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
elif theCriterion == FT_BallDiameter:
functor = aFilterMgr.CreateBallDiameter()
else:
- print "Error: given parameter is not numerical functor type."
+ print("Error: given parameter is not numerical functor type.")
aFilterMgr.UnRegister()
return functor
- ## Creates hypothesis
+ ## Create hypothesis
# @param theHType mesh hypothesis type (string)
# @param theLibName mesh plug-in library name
# @return created hypothesis instance
@@ -990,7 +1059,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
return hyp
- ## Gets the mesh statistic
+ ## Get the mesh statistic
# @return dictionary "element type" - "count of elements"
# @ingroup l1_meshinfo
def GetMeshInfo(self, obj):
@@ -999,7 +1068,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
d = {}
if hasattr(obj, "GetMeshInfo"):
values = obj.GetMeshInfo()
- for i in range(SMESH.Entity_Last._v):
+ for i in range(EnumToLong(SMESH.Entity_Last)):
if i < len(values): d[SMESH.EntityType._item(i)]=values[i]
pass
return d
@@ -1161,13 +1230,13 @@ omniORB.registerObjref(SMESH._objref_SMESH_Gen._NP_RepositoryId, smeshBuilder)
# import salome
# salome.salome_init()
# from salome.smesh import smeshBuilder
-# smesh = smeshBuilder.New(salome.myStudy)
+# smesh = smeshBuilder.New()
# \endcode
-# @param study SALOME study, generally obtained by salome.myStudy.
+# @param isPublished If False, the notebool will not be used.
# @param instance CORBA proxy of SMESH Engine. If None, the default Engine is used.
# @return smeshBuilder instance
-def New( study, instance=None):
+def New( isPublished = True, instance=None):
"""
Create a new smeshBuilder instance.The smeshBuilder class provides the Python
interface to create or load meshes.
@@ -1176,10 +1245,10 @@ def New( study, instance=None):
import salome
salome.salome_init()
from salome.smesh import smeshBuilder
- smesh = smeshBuilder.New(salome.myStudy)
+ smesh = smeshBuilder.New()
Parameters:
- study SALOME study, generally obtained by salome.myStudy.
+ isPublished If False, the notebool will not be used.
instance CORBA proxy of SMESH Engine. If None, the default Engine is used.
Returns:
smeshBuilder instance
@@ -1189,10 +1258,10 @@ def New( study, instance=None):
global doLcc
engine = instance
if engine is None:
- doLcc = True
+ doLcc = True
smeshInst = smeshBuilder()
assert isinstance(smeshInst,smeshBuilder), "Smesh engine class is %s but should be smeshBuilder.smeshBuilder. Import salome.smesh.smeshBuilder before creating the instance."%smeshInst.__class__
- smeshInst.init_smesh(study)
+ smeshInst.init_smesh(isPublished)
return smeshInst
@@ -1203,17 +1272,15 @@ def New( study, instance=None):
# It has a set of methods to build a mesh on the given geometry, including the definition of sub-meshes.
# It also has methods to define groups of mesh elements, to modify a mesh (by addition of
# new nodes and elements and by changing the existing entities), to get information
-# about a mesh and to export a mesh into different formats.
-class Mesh:
- __metaclass__ = MeshMeta
-
+# about a mesh and to export a mesh in different formats.
+class Mesh(metaclass=MeshMeta):
geom = 0
mesh = 0
editor = 0
## Constructor
#
- # Creates a mesh on the shape \a obj (or an empty mesh if \a obj is equal to 0) and
+ # Create a mesh on the shape \a obj (or an empty mesh if \a obj is equal to 0) and
# sets the GUI name of this mesh to \a name.
# @param smeshpyD an instance of smeshBuilder class
# @param geompyD an instance of geomBuilder class
@@ -1221,8 +1288,8 @@ class Mesh:
# @param name Study name of the mesh
# @ingroup l2_construct
def __init__(self, smeshpyD, geompyD, obj=0, name=0):
- self.smeshpyD=smeshpyD
- self.geompyD=geompyD
+ self.smeshpyD = smeshpyD
+ self.geompyD = geompyD
if obj is None:
obj = 0
objHasName = False
@@ -1231,12 +1298,9 @@ class Mesh:
self.geom = obj
objHasName = True
# publish geom of mesh (issue 0021122)
- if not self.geom.GetStudyEntry() and smeshpyD.GetCurrentStudy():
+ if not self.geom.GetStudyEntry():
objHasName = False
- studyID = smeshpyD.GetCurrentStudy()._get_StudyId()
- if studyID != geompyD.myStudyId:
- geompyD.init_geom( smeshpyD.GetCurrentStudy())
- pass
+ geompyD.init_geom()
if name:
geo_name = name + " shape"
else:
@@ -1257,7 +1321,7 @@ class Mesh:
self.geom = self.mesh.GetShapeToMesh()
self.editor = self.mesh.GetMeshEditor()
- self.functors = [None] * SMESH.FT_Undefined._v
+ self.functors = [None] * EnumToLong(SMESH.FT_Undefined)
# set self to algoCreator's
for attrName in dir(self):
@@ -1274,8 +1338,8 @@ class Mesh:
#self.mesh.UnRegister()
pass
pass
-
- ## Initializes the Mesh object from an instance of SMESH_Mesh interface
+
+ ## Initialize the Mesh object from an instance of SMESH_Mesh interface
# @param theMesh a SMESH_Mesh object
# @ingroup l2_construct
def SetMesh(self, theMesh):
@@ -1287,60 +1351,76 @@ class Mesh:
self.geom = self.mesh.GetShapeToMesh()
pass
- ## Returns the mesh, that is an instance of SMESH_Mesh interface
+ ## Return the mesh, that is an instance of SMESH_Mesh interface
# @return a SMESH_Mesh object
# @ingroup l2_construct
def GetMesh(self):
return self.mesh
- ## Gets the name of the mesh
+ ## Get the name of the mesh
# @return the name of the mesh as a string
# @ingroup l2_construct
def GetName(self):
name = GetName(self.GetMesh())
return name
- ## Sets a name to the mesh
+ ## Set a name to the mesh
# @param name a new name of the mesh
# @ingroup l2_construct
def SetName(self, name):
self.smeshpyD.SetName(self.GetMesh(), name)
- ## Gets the subMesh object associated to a \a theSubObject geometrical object.
- # The subMesh object gives access to the IDs of nodes and elements.
+ ## Get a sub-mesh object associated to a \a geom geometrical object.
# @param geom a geometrical object (shape)
- # @param name a name for the submesh
- # @return an object of type SMESH_SubMesh, representing a part of mesh, which lies on the given shape
+ # @param name a name for the sub-mesh in the Object Browser
+ # @return an object of type SMESH.SMESH_subMesh, representing a part of mesh,
+ # which lies on the given shape
+ #
+ # The sub-mesh object gives access to the IDs of nodes and elements.
+ # The sub-mesh object has the following methods:
+ # - SMESH.SMESH_subMesh.GetNumberOfElements()
+ # - SMESH.SMESH_subMesh.GetNumberOfNodes( all )
+ # - SMESH.SMESH_subMesh.GetElementsId()
+ # - SMESH.SMESH_subMesh.GetElementsByType( ElementType )
+ # - SMESH.SMESH_subMesh.GetNodesId()
+ # - SMESH.SMESH_subMesh.GetSubShape()
+ # - SMESH.SMESH_subMesh.GetFather()
+ # - SMESH.SMESH_subMesh.GetId()
+ # @note A sub-mesh is implicitly created when a sub-shape is specified at
+ # creating an algorithm, for example: algo1D = mesh.Segment(geom=Edge_1)
+ # creates a sub-mesh on @c Edge_1 and assign Wire Discretization algorithm to it.
+ # The created sub-mesh can be retrieved from the algorithm:
+ # submesh = algo1D.GetSubMesh()
# @ingroup l2_submeshes
def GetSubMesh(self, geom, name):
AssureGeomPublished( self, geom, name )
submesh = self.mesh.GetSubMesh( geom, name )
return submesh
- ## Returns the shape associated to the mesh
+ ## Return the shape associated to the mesh
# @return a GEOM_Object
# @ingroup l2_construct
def GetShape(self):
return self.geom
- ## Associates the given shape to the mesh (entails the recreation of the mesh)
+ ## Associate the given shape to the mesh (entails the recreation of the mesh)
# @param geom the shape to be meshed (GEOM_Object)
# @ingroup l2_construct
def SetShape(self, geom):
self.mesh = self.smeshpyD.CreateMesh(geom)
- ## Loads mesh from the study after opening the study
+ ## Load mesh from the study after opening the study
def Load(self):
self.mesh.Load()
- ## Returns true if the hypotheses are defined well
+ ## Return true if the hypotheses are defined well
# @param theSubObject a sub-shape of a mesh shape
# @return True or False
# @ingroup l2_construct
def IsReadyToCompute(self, theSubObject):
return self.smeshpyD.IsReadyToCompute(self.mesh, theSubObject)
- ## Returns errors of hypotheses definition.
+ ## Return errors of hypotheses definition.
# The list of errors is empty if everything is OK.
# @param theSubObject a sub-shape of a mesh shape
# @return a list of errors
@@ -1348,20 +1428,20 @@ class Mesh:
def GetAlgoState(self, theSubObject):
return self.smeshpyD.GetAlgoState(self.mesh, theSubObject)
- ## Returns a geometrical object on which the given element was built.
+ ## Return a geometrical object on which the given element was built.
# The returned geometrical object, if not nil, is either found in the
# study or published by this method with the given name
# @param theElementID the id of the mesh element
# @param theGeomName the user-defined name of the geometrical object
# @return GEOM::GEOM_Object instance
- # @ingroup l2_construct
+ # @ingroup l1_meshinfo
def GetGeometryByMeshElement(self, theElementID, theGeomName):
return self.smeshpyD.GetGeometryByMeshElement( self.mesh, theElementID, theGeomName )
- ## Returns the mesh dimension depending on the dimension of the underlying shape
+ ## Return the mesh dimension depending on the dimension of the underlying shape
# or, if the mesh is not based on any shape, basing on deimension of elements
# @return mesh dimension as an integer value [0,3]
- # @ingroup l1_auxiliary
+ # @ingroup l1_meshinfo
def MeshDimension(self):
if self.mesh.HasShapeToMesh():
shells = self.geompyD.SubShapeAllIDs( self.geom, self.geompyD.ShapeType["SOLID"] )
@@ -1379,10 +1459,11 @@ class Mesh:
if self.NbEdges() > 0: return 1
return 0
- ## Evaluates size of prospective mesh on a shape
+ ## Evaluate size of prospective mesh on a shape
# @return a list where i-th element is a number of elements of i-th SMESH.EntityType
# To know predicted number of e.g. edges, inquire it this way
# Evaluate()[ EnumToLong( Entity_Edge )]
+ # @ingroup l2_construct
def Evaluate(self, geom=0):
if geom == 0 or not isinstance(geom, geomBuilder.GEOM._objref_GEOM_Object):
if self.geom == 0:
@@ -1392,7 +1473,7 @@ class Mesh:
return self.smeshpyD.Evaluate(self.mesh, geom)
- ## Computes the mesh and returns the status of the computation
+ ## Compute the mesh and return the status of the computation
# @param geom geomtrical shape on which mesh data should be computed
# @param discardModifs if True and the mesh has been edited since
# a last total re-compute and that may prevent successful partial re-compute,
@@ -1411,12 +1492,12 @@ class Mesh:
if discardModifs and self.mesh.HasModificationsToDiscard(): # issue 0020693
self.mesh.Clear()
ok = self.smeshpyD.Compute(self.mesh, geom)
- except SALOME.SALOME_Exception, ex:
- print "Mesh computation failed, exception caught:"
- print " ", ex.details.text
+ except SALOME.SALOME_Exception as ex:
+ print("Mesh computation failed, exception caught:")
+ print(" ", ex.details.text)
except:
import traceback
- print "Mesh computation failed, exception caught:"
+ print("Mesh computation failed, exception caught:")
traceback.print_exc()
if True:#not ok:
allReasons = ""
@@ -1446,7 +1527,7 @@ class Mesh:
errText = "code %s" % -err.code
if errText: errText += ". "
errText += err.comment
- if allReasons != "":allReasons += "\n"
+ if allReasons: allReasons += "\n"
if ok:
allReasons += '- "%s"%s - %s' %(err.algoName, shapeText, errText)
else:
@@ -1484,7 +1565,7 @@ class Mesh:
reason = ("For unknown reason. "
"Developer, revise Mesh.Compute() implementation in smeshBuilder.py!")
pass
- if allReasons != "":allReasons += "\n"
+ if allReasons: allReasons += "\n"
allReasons += "- " + reason
pass
if not ok or allReasons != "":
@@ -1493,19 +1574,20 @@ class Mesh:
else: msg += " has not been computed"
if allReasons != "": msg += ":"
else: msg += "."
- print msg
- print allReasons
+ print(msg)
+ print(allReasons)
pass
- if salome.sg.hasDesktop() and self.mesh.GetStudyId() >= 0:
+ if salome.sg.hasDesktop():
if not isinstance( refresh, list): # not a call from subMesh.Compute()
smeshgui = salome.ImportComponentGUI("SMESH")
- smeshgui.Init(self.mesh.GetStudyId())
+ smeshgui.Init()
smeshgui.SetMeshIcon( salome.ObjectToID( self.mesh ), ok, (self.NbNodes()==0) )
- if refresh: salome.sg.updateObjBrowser(True)
+ if refresh: salome.sg.updateObjBrowser()
return ok
## Return a list of error messages (SMESH.ComputeError) of the last Compute()
+ # @ingroup l2_construct
def GetComputeErrors(self, shape=0 ):
if shape == 0:
shape = self.mesh.GetShapeToMesh()
@@ -1518,17 +1600,16 @@ class Mesh:
# - FACE #3 (not published sub-shape)
# - sub-shape #3 (invalid sub-shape ID)
# - #3 (error in this function)
+ # @ingroup l1_auxiliary
def GetSubShapeName(self, subShapeID ):
if not self.mesh.HasShapeToMesh():
return ""
try:
shapeText = ""
mainIOR = salome.orb.object_to_string( self.GetShape() )
- for sname in salome.myStudyManager.GetOpenStudies():
- s = salome.myStudyManager.GetStudyByName(sname)
- if not s: continue
- mainSO = s.FindObjectIOR(mainIOR)
- if not mainSO: continue
+ s = salome.myStudy
+ mainSO = s.FindObjectIOR(mainIOR)
+ if mainSO:
if subShapeID == 1:
shapeText = '"%s"' % mainSO.GetName()
subIt = s.NewChildIterator(mainSO)
@@ -1545,7 +1626,6 @@ class Mesh:
continue
if ids == subShapeID:
shapeText = '"%s"' % subSO.GetName()
- break
if not shapeText:
shape = self.geompyD.GetSubShape( self.GetShape(), [subShapeID])
if shape:
@@ -1560,6 +1640,7 @@ class Mesh:
# error of an algorithm
# @param publish if @c True, the returned groups will be published in the study
# @return a list of GEOM groups each named after a failed algorithm
+ # @ingroup l2_construct
def GetFailedShapes(self, publish=False):
algo2shapes = {}
@@ -1574,9 +1655,9 @@ class Mesh:
pass
groups = []
- for algoName, shapes in algo2shapes.items():
+ for algoName, shapes in list(algo2shapes.items()):
while shapes:
- groupType = self.smeshpyD.EnumToLong( shapes[0].GetShapeType() )
+ groupType = EnumToLong( shapes[0].GetShapeType() )
otherTypeShapes = []
sameTypeShapes = []
group = self.geompyD.CreateGroup( self.geom, groupType )
@@ -1604,37 +1685,36 @@ class Mesh:
def GetMeshOrder(self):
return self.mesh.GetMeshOrder()
- ## Set order in which concurrent sub-meshes sould be meshed
+ ## Set order in which concurrent sub-meshes should be meshed
# @param submeshes list of lists of sub-meshes
# @ingroup l2_construct
def SetMeshOrder(self, submeshes):
return self.mesh.SetMeshOrder(submeshes)
- ## Removes all nodes and elements
+ ## Remove all nodes and elements generated on geometry. Imported elements remain.
# @param refresh if @c True, Object browser is automatically updated (when running in GUI)
# @ingroup l2_construct
def Clear(self, refresh=False):
self.mesh.Clear()
- if ( salome.sg.hasDesktop() and
- salome.myStudyManager.GetStudyByID( self.mesh.GetStudyId() ) ):
+ if ( salome.sg.hasDesktop() ):
smeshgui = salome.ImportComponentGUI("SMESH")
- smeshgui.Init(self.mesh.GetStudyId())
+ smeshgui.Init()
smeshgui.SetMeshIcon( salome.ObjectToID( self.mesh ), False, True )
- if refresh: salome.sg.updateObjBrowser(True)
+ if refresh: salome.sg.updateObjBrowser()
- ## Removes all nodes and elements of indicated shape
+ ## Remove all nodes and elements of indicated shape
# @param refresh if @c True, Object browser is automatically updated (when running in GUI)
# @param geomId the ID of a sub-shape to remove elements on
- # @ingroup l2_construct
+ # @ingroup l2_submeshes
def ClearSubMesh(self, geomId, refresh=False):
self.mesh.ClearSubMesh(geomId)
if salome.sg.hasDesktop():
smeshgui = salome.ImportComponentGUI("SMESH")
- smeshgui.Init(self.mesh.GetStudyId())
+ smeshgui.Init()
smeshgui.SetMeshIcon( salome.ObjectToID( self.mesh ), False, True )
- if refresh: salome.sg.updateObjBrowser(True)
+ if refresh: salome.sg.updateObjBrowser()
- ## Computes a tetrahedral mesh using AutomaticLength + MEFISTO + Tetrahedron
+ ## Compute a tetrahedral mesh using AutomaticLength + MEFISTO + Tetrahedron
# @param fineness [0.0,1.0] defines mesh fineness
# @return True or False
# @ingroup l3_algos_basic
@@ -1651,7 +1731,7 @@ class Mesh:
pass
return self.Compute()
- ## Computes an hexahedral mesh using AutomaticLength + Quadrangle + Hexahedron
+ ## Compute an hexahedral mesh using AutomaticLength + Quadrangle + Hexahedron
# @param fineness [0.0, 1.0] defines mesh fineness
# @return True or False
# @ingroup l3_algos_basic
@@ -1668,11 +1748,11 @@ class Mesh:
pass
return self.Compute()
- ## Assigns a hypothesis
+ ## Assign a hypothesis
# @param hyp a hypothesis to assign
# @param geom a subhape of mesh geometry
# @return SMESH.Hypothesis_Status
- # @ingroup l2_hypotheses
+ # @ingroup l2_editing
def AddHypothesis(self, hyp, geom=0):
if isinstance( hyp, geomBuilder.GEOM._objref_GEOM_Object ):
hyp, geom = geom, hyp
@@ -1697,7 +1777,7 @@ class Mesh:
AssureGeomPublished( self, geom, "shape for %s" % hyp.GetName())
status = self.mesh.AddHypothesis(geom, hyp)
else:
- status = HYP_BAD_GEOMETRY,""
+ status = HYP_BAD_GEOMETRY, ""
hyp_name = GetName( hyp )
geom_name = ""
if geom:
@@ -1710,7 +1790,7 @@ class Mesh:
# @param hyp a hypothesis to check
# @param geom a subhape of mesh geometry
# @return True of False
- # @ingroup l2_hypotheses
+ # @ingroup l2_editing
def IsUsedHypothesis(self, hyp, geom):
if not hyp: # or not geom
return False
@@ -1723,11 +1803,11 @@ class Mesh:
return True
return False
- ## Unassigns a hypothesis
+ ## Unassign a hypothesis
# @param hyp a hypothesis to unassign
# @param geom a sub-shape of mesh geometry
# @return SMESH.Hypothesis_Status
- # @ingroup l2_hypotheses
+ # @ingroup l2_editing
def RemoveHypothesis(self, hyp, geom=0):
if not hyp:
return None
@@ -1742,18 +1822,18 @@ class Mesh:
return self.mesh.RemoveHypothesis( shape, hyp )
hypName = GetName( hyp )
geoName = GetName( shape )
- print "WARNING: RemoveHypothesis() failed as '%s' is not assigned to '%s' shape" % ( hypName, geoName )
+ print("WARNING: RemoveHypothesis() failed as '%s' is not assigned to '%s' shape" % ( hypName, geoName ))
return None
- ## Gets the list of hypotheses added on a geometry
+ ## Get the list of hypotheses added on a geometry
# @param geom a sub-shape of mesh geometry
# @return the sequence of SMESH_Hypothesis
- # @ingroup l2_hypotheses
+ # @ingroup l2_editing
def GetHypothesisList(self, geom):
return self.mesh.GetHypothesisList( geom )
- ## Removes all global hypotheses
- # @ingroup l2_hypotheses
+ ## Remove all global hypotheses
+ # @ingroup l2_editing
def RemoveGlobalHypotheses(self):
current_hyps = self.mesh.GetHypothesisList( self.geom )
for hyp in current_hyps:
@@ -1761,41 +1841,56 @@ class Mesh:
pass
pass
- ## Exports the mesh in a file in MED format and chooses the \a version of MED format
+ ## Export the mesh in a file in MED format
## allowing to overwrite the file if it exists or add the exported data to its contents
- # @param f is the file name
+ # @param fileName is the file name
# @param auto_groups boolean parameter for creating/not creating
# the groups Group_On_All_Nodes, Group_On_All_Faces, ... ;
- # the typical use is auto_groups=false.
- # @param version MED format version(MED_V2_1 or MED_V2_2)
+ # the typical use is auto_groups=False.
# @param overwrite boolean parameter for overwriting/not overwriting the file
# @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh
- # @param autoDimension: if @c True (default), a space dimension of a MED mesh can be either
+ # @param autoDimension if @c True (default), a space dimension of a MED mesh can be either
# - 1D if all mesh nodes lie on OX coordinate axis, or
# - 2D if all mesh nodes lie on XOY coordinate plane, or
- # - 3D in the rest cases.
+ # - 3D in the rest cases.
# If @a autoDimension is @c False, the space dimension is always 3.
- # @param fields : list of GEOM fields defined on the shape to mesh.
- # @param geomAssocFields : each character of this string means a need to export a
+ # @param fields list of GEOM fields defined on the shape to mesh.
+ # @param geomAssocFields each character of this string means a need to export a
# corresponding field; correspondence between fields and characters is following:
- # - 'v' stands for _vertices_ field;
- # - 'e' stands for _edges_ field;
- # - 'f' stands for _faces_ field;
- # - 's' stands for _solids_ field.
+ # - 'v' stands for "_vertices _" field;
+ # - 'e' stands for "_edges _" field;
+ # - 'f' stands for "_faces _" field;
+ # - 's' stands for "_solids _" field.
# @ingroup l2_impexp
- def ExportMED(self, f, auto_groups=0, version=MED_V2_2,
- overwrite=1, meshPart=None, autoDimension=True, fields=[], geomAssocFields=''):
+ def ExportMED(self, *args, **kwargs):
+ # process positional arguments
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]] # backward compatibility
+ fileName = args[0]
+ auto_groups = args[1] if len(args) > 1 else False
+ overwrite = args[2] if len(args) > 2 else True
+ meshPart = args[3] if len(args) > 3 else None
+ autoDimension = args[4] if len(args) > 4 else True
+ fields = args[5] if len(args) > 5 else []
+ geomAssocFields = args[6] if len(args) > 6 else ''
+ # process keywords arguments
+ auto_groups = kwargs.get("auto_groups", auto_groups)
+ overwrite = kwargs.get("overwrite", overwrite)
+ meshPart = kwargs.get("meshPart", meshPart)
+ autoDimension = kwargs.get("autoDimension", autoDimension)
+ fields = kwargs.get("fields", fields)
+ geomAssocFields = kwargs.get("geomAssocFields", geomAssocFields)
+ # invoke engine's function
if meshPart or fields or geomAssocFields:
unRegister = genObjUnRegister()
if isinstance( meshPart, list ):
meshPart = self.GetIDSource( meshPart, SMESH.ALL )
unRegister.set( meshPart )
- self.mesh.ExportPartToMED( meshPart, f, auto_groups, version, overwrite, autoDimension,
+ self.mesh.ExportPartToMED( meshPart, fileName, auto_groups, overwrite, autoDimension,
fields, geomAssocFields)
else:
- self.mesh.ExportToMEDX(f, auto_groups, version, overwrite, autoDimension)
+ self.mesh.ExportMED(fileName, auto_groups, overwrite, autoDimension)
- ## Exports the mesh in a file in SAUV format
+ ## Export the mesh in a file in SAUV format
# @param f is the file name
# @param auto_groups boolean parameter for creating/not creating
# the groups Group_On_All_Nodes, Group_On_All_Faces, ... ;
@@ -1804,7 +1899,7 @@ class Mesh:
def ExportSAUV(self, f, auto_groups=0):
self.mesh.ExportSAUV(f, auto_groups)
- ## Exports the mesh in a file in DAT format
+ ## Export the mesh in a file in DAT format
# @param f the file name
# @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh
# @ingroup l2_impexp
@@ -1818,7 +1913,7 @@ class Mesh:
else:
self.mesh.ExportDAT(f)
- ## Exports the mesh in a file in UNV format
+ ## Export the mesh in a file in UNV format
# @param f the file name
# @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh
# @ingroup l2_impexp
@@ -1847,7 +1942,7 @@ class Mesh:
else:
self.mesh.ExportSTL(f, ascii)
- ## Exports the mesh in a file in CGNS format
+ ## Export the mesh in a file in CGNS format
# @param f is the file name
# @param overwrite boolean parameter for overwriting/not overwriting the file
# @param meshPart a part of mesh (group, sub-mesh) to export instead of the mesh
@@ -1863,7 +1958,7 @@ class Mesh:
meshPart = self.mesh
self.mesh.ExportCGNS(meshPart, f, overwrite)
- ## Exports the mesh in a file in GMF format.
+ ## Export the mesh in a file in GMF format.
# GMF files must have .mesh extension for the ASCII format and .meshb for
# the bynary format. Other extensions are not allowed.
# @param f is the file name
@@ -1880,29 +1975,68 @@ class Mesh:
meshPart = self.mesh
self.mesh.ExportGMF(meshPart, f, True)
- ## Deprecated, used only for compatibility! Please, use ExportToMEDX() method instead.
- # Exports the mesh in a file in MED format and chooses the \a version of MED format
- ## allowing to overwrite the file if it exists or add the exported data to its contents
- # @param f the file name
- # @param version values are SMESH.MED_V2_1, SMESH.MED_V2_2
+ ## Deprecated, used only for compatibility! Please, use ExportMED() method instead.
+ # Export the mesh in a file in MED format
+ # allowing to overwrite the file if it exists or add the exported data to its contents
+ # @param fileName the file name
# @param opt boolean parameter for creating/not creating
# the groups Group_On_All_Nodes, Group_On_All_Faces, ...
# @param overwrite boolean parameter for overwriting/not overwriting the file
- # @param autoDimension: if @c True (default), a space dimension of a MED mesh can be either
+ # @param autoDimension if @c True (default), a space dimension of a MED mesh can be either
# - 1D if all mesh nodes lie on OX coordinate axis, or
# - 2D if all mesh nodes lie on XOY coordinate plane, or
- # - 3D in the rest cases.
- #
+ # - 3D in the rest cases.
+ # If @a autoDimension is @c False, the space dimension is always 3.
+ # @ingroup l2_impexp
+ def ExportToMED(self, *args, **kwargs):
+ print("WARNING: ExportToMED() is deprecated, use ExportMED() instead")
+ # process positional arguments
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]] # backward compatibility
+ fileName = args[0]
+ auto_groups = args[1] if len(args) > 1 else False
+ overwrite = args[2] if len(args) > 2 else True
+ autoDimension = args[3] if len(args) > 3 else True
+ # process keywords arguments
+ auto_groups = kwargs.get("opt", auto_groups) # old keyword name
+ auto_groups = kwargs.get("auto_groups", auto_groups) # new keyword name
+ overwrite = kwargs.get("overwrite", overwrite)
+ autoDimension = kwargs.get("autoDimension", autoDimension)
+ # invoke engine's function
+ self.mesh.ExportMED(fileName, auto_groups, overwrite, autoDimension)
+
+ ## Deprecated, used only for compatibility! Please, use ExportMED() method instead.
+ # Export the mesh in a file in MED format
+ # allowing to overwrite the file if it exists or add the exported data to its contents
+ # @param fileName the file name
+ # @param opt boolean parameter for creating/not creating
+ # the groups Group_On_All_Nodes, Group_On_All_Faces, ...
+ # @param overwrite boolean parameter for overwriting/not overwriting the file
+ # @param autoDimension if @c True (default), a space dimension of a MED mesh can be either
+ # - 1D if all mesh nodes lie on OX coordinate axis, or
+ # - 2D if all mesh nodes lie on XOY coordinate plane, or
+ # - 3D in the rest cases.
# If @a autoDimension is @c False, the space dimension is always 3.
# @ingroup l2_impexp
- def ExportToMED(self, f, version, opt=0, overwrite=1, autoDimension=True):
- self.mesh.ExportToMEDX(f, opt, version, overwrite, autoDimension)
+ def ExportToMEDX(self, *args, **kwargs):
+ print("WARNING: ExportToMEDX() is deprecated, use ExportMED() instead")
+ # process positional arguments
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]] # backward compatibility
+ fileName = args[0]
+ auto_groups = args[1] if len(args) > 1 else False
+ overwrite = args[2] if len(args) > 2 else True
+ autoDimension = args[3] if len(args) > 3 else True
+ # process keywords arguments
+ auto_groups = kwargs.get("auto_groups", auto_groups)
+ overwrite = kwargs.get("overwrite", overwrite)
+ autoDimension = kwargs.get("autoDimension", autoDimension)
+ # invoke engine's function
+ self.mesh.ExportMED(fileName, auto_groups, overwrite, autoDimension)
# Operations with groups:
# ----------------------
- ## Creates an empty mesh group
- # @param elementType the type of elements in the group; either of
+ ## Create an empty mesh group
+ # @param elementType the type of elements in the group; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME)
# @param name the name of the mesh group
# @return SMESH_Group
@@ -1910,7 +2044,7 @@ class Mesh:
def CreateEmptyGroup(self, elementType, name):
return self.mesh.CreateGroup(elementType, name)
- ## Creates a mesh group based on the geometric object \a grp
+ ## Create a mesh group based on the geometric object \a grp
# and gives a \a name, \n if this parameter is not defined
# the name is the same as the geometric group name \n
# Note: Works like GroupOnGeom().
@@ -1921,12 +2055,12 @@ class Mesh:
def Group(self, grp, name=""):
return self.GroupOnGeom(grp, name)
- ## Creates a mesh group based on the geometrical object \a grp
+ ## Create a mesh group based on the geometrical object \a grp
# and gives a \a name, \n if this parameter is not defined
# the name is the same as the geometrical group name
# @param grp a geometrical group, a vertex, an edge, a face or a solid
# @param name the name of the mesh group
- # @param typ the type of elements in the group; either of
+ # @param typ the type of elements in the group; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME). If not set, it is
# automatically detected by the type of the geometry
# @return SMESH_GroupOnGeom
@@ -1953,17 +2087,16 @@ class Mesh:
elif tgeo == "COMPOUND":
sub = self.geompyD.SubShapeAll( shape, self.geompyD.ShapeType["SHAPE"])
if not sub:
- raise ValueError,"_groupTypeFromShape(): empty geometric group or compound '%s'" % GetName(shape)
+ raise ValueError("_groupTypeFromShape(): empty geometric group or compound '%s'" % GetName(shape))
return self._groupTypeFromShape( sub[0] )
else:
- raise ValueError, \
- "_groupTypeFromShape(): invalid geometry '%s'" % GetName(shape)
+ raise ValueError("_groupTypeFromShape(): invalid geometry '%s'" % GetName(shape))
return typ
- ## Creates a mesh group with given \a name based on the \a filter which
+ ## Create a mesh group with given \a name based on the \a filter which
## is a special type of group dynamically updating it's contents during
## mesh modification
- # @param typ the type of elements in the group; either of
+ # @param typ the type of elements in the group; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME).
# @param name the name of the mesh group
# @param filter the filter defining group contents
@@ -1972,9 +2105,9 @@ class Mesh:
def GroupOnFilter(self, typ, name, filter):
return self.mesh.CreateGroupFromFilter(typ, name, filter)
- ## Creates a mesh group by the given ids of elements
+ ## Create a mesh group by the given ids of elements
# @param groupName the name of the mesh group
- # @param elementType the type of elements in the group; either of
+ # @param elementType the type of elements in the group; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME).
# @param elemIDs either the list of ids, group, sub-mesh, or filter
# @return SMESH_Group
@@ -1989,7 +2122,7 @@ class Mesh:
group.Add(elemIDs)
return group
- ## Creates a mesh group by the given conditions
+ ## Create a mesh group by the given conditions
# @param groupName the name of the mesh group
# @param elementType the type of elements(SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME)
# @param CritType the type of criterion (SMESH.FT_Taper, SMESH.FT_Area, etc.)
@@ -2014,7 +2147,7 @@ class Mesh:
group = self.MakeGroupByCriterion(groupName, aCriterion)
return group
- ## Creates a mesh group by the given criterion
+ ## Create a mesh group by the given criterion
# @param groupName the name of the mesh group
# @param Criterion the instance of Criterion class
# @return SMESH_GroupOnFilter
@@ -2022,7 +2155,7 @@ class Mesh:
def MakeGroupByCriterion(self, groupName, Criterion):
return self.MakeGroupByCriteria( groupName, [Criterion] )
- ## Creates a mesh group by the given criteria (list of criteria)
+ ## Create a mesh group by the given criteria (list of criteria)
# @param groupName the name of the mesh group
# @param theCriteria the list of criteria
# @param binOp binary operator used when binary operator of criteria is undefined
@@ -2033,7 +2166,7 @@ class Mesh:
group = self.MakeGroupByFilter(groupName, aFilter)
return group
- ## Creates a mesh group by the given filter
+ ## Create a mesh group by the given filter
# @param groupName the name of the mesh group
# @param theFilter the instance of Filter class
# @return SMESH_GroupOnFilter
@@ -2045,19 +2178,19 @@ class Mesh:
group = self.GroupOnFilter( theFilter.GetElementType(), groupName, theFilter )
return group
- ## Removes a group
+ ## Remove a group
# @ingroup l2_grps_delete
def RemoveGroup(self, group):
self.mesh.RemoveGroup(group)
- ## Removes a group with its contents
+ ## Remove a group with its contents
# @ingroup l2_grps_delete
def RemoveGroupWithContents(self, group):
self.mesh.RemoveGroupWithContents(group)
- ## Gets the list of groups existing in the mesh in the order
+ ## Get the list of groups existing in the mesh in the order
# of creation (starting from the oldest one)
- # @param elemType type of elements the groups contain; either of
+ # @param elemType type of elements the groups contain; either of
# (SMESH.ALL, SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME);
# by default groups of elements of all types are returned
# @return a sequence of SMESH_GroupBase
@@ -2074,13 +2207,13 @@ class Mesh:
pass
return typedGroups
- ## Gets the number of groups existing in the mesh
+ ## Get the number of groups existing in the mesh
# @return the quantity of groups as an integer value
# @ingroup l2_grps_create
def NbGroups(self):
return self.mesh.NbGroups()
- ## Gets the list of names of groups existing in the mesh
+ ## Get the list of names of groups existing in the mesh
# @return list of strings
# @ingroup l2_grps_create
def GetGroupNames(self):
@@ -2090,9 +2223,9 @@ class Mesh:
names.append(group.GetName())
return names
- ## Finds groups by name and type
+ ## Find groups by name and type
# @param name name of the group of interest
- # @param elemType type of elements the groups contain; either of
+ # @param elemType type of elements the groups contain; either of
# (SMESH.ALL, SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME);
# by default one group of any type of elements is returned
# if elemType == SMESH.ALL then all groups of any type are returned
@@ -2104,12 +2237,12 @@ class Mesh:
if group.GetName() == name:
if elemType is None:
return [group]
- if ( elemType == SMESH.ALL or
+ if ( elemType == SMESH.ALL or
group.GetType() == elemType ):
groups.append( group )
return groups
- ## Produces a union of two groups.
+ ## Produce a union of two groups.
# A new group is created. All mesh elements that are
# present in the initial groups are added to the new one
# @return an instance of SMESH_Group
@@ -2117,15 +2250,15 @@ class Mesh:
def UnionGroups(self, group1, group2, name):
return self.mesh.UnionGroups(group1, group2, name)
- ## Produces a union list of groups.
+ ## Produce a union list of groups.
# New group is created. All mesh elements that are present in
# initial groups are added to the new one
# @return an instance of SMESH_Group
# @ingroup l2_grps_operon
def UnionListOfGroups(self, groups, name):
- return self.mesh.UnionListOfGroups(groups, name)
+ return self.mesh.UnionListOfGroups(groups, name)
- ## Prodices an intersection of two groups.
+ ## Prodice an intersection of two groups.
# A new group is created. All mesh elements that are common
# for the two initial groups are added to the new one.
# @return an instance of SMESH_Group
@@ -2133,15 +2266,15 @@ class Mesh:
def IntersectGroups(self, group1, group2, name):
return self.mesh.IntersectGroups(group1, group2, name)
- ## Produces an intersection of groups.
+ ## Produce an intersection of groups.
# New group is created. All mesh elements that are present in all
# initial groups simultaneously are added to the new one
# @return an instance of SMESH_Group
# @ingroup l2_grps_operon
def IntersectListOfGroups(self, groups, name):
- return self.mesh.IntersectListOfGroups(groups, name)
+ return self.mesh.IntersectListOfGroups(groups, name)
- ## Produces a cut of two groups.
+ ## Produce a cut of two groups.
# A new group is created. All mesh elements that are present in
# the main group but are not present in the tool group are added to the new one
# @return an instance of SMESH_Group
@@ -2149,7 +2282,7 @@ class Mesh:
def CutGroups(self, main_group, tool_group, name):
return self.mesh.CutGroups(main_group, tool_group, name)
- ## Produces a cut of groups.
+ ## Produce a cut of groups.
# A new group is created. All mesh elements that are present in main groups
# but do not present in tool groups are added to the new one
# @return an instance of SMESH_Group
@@ -2160,7 +2293,7 @@ class Mesh:
##
# Create a standalone group of entities basing on nodes of other groups.
# \param groups - list of reference groups, sub-meshes or filters, of any type.
- # \param elemType - a type of elements to include to the new group; either of
+ # \param elemType - a type of elements to include to the new group; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME).
# \param name - a name of the new group.
# \param nbCommonNodes - a criterion of inclusion of an element to the new group
@@ -2185,14 +2318,14 @@ class Mesh:
## Convert group on geom into standalone group
- # @ingroup l2_grps_edit
+ # @ingroup l2_grps_operon
def ConvertToStandalone(self, group):
return self.mesh.ConvertToStandalone(group)
# Get some info about mesh:
# ------------------------
- ## Returns the log of nodes and elements added or removed
+ ## Return the log of nodes and elements added or removed
# since the previous clear of the log.
# @param clearAfterGet log is emptied after Get (safe if concurrents access)
# @return list of log_block structures:
@@ -2204,44 +2337,40 @@ class Mesh:
def GetLog(self, clearAfterGet):
return self.mesh.GetLog(clearAfterGet)
- ## Clears the log of nodes and elements added or removed since the previous
+ ## Clear the log of nodes and elements added or removed since the previous
# clear. Must be used immediately after GetLog if clearAfterGet is false.
# @ingroup l1_auxiliary
def ClearLog(self):
self.mesh.ClearLog()
- ## Toggles auto color mode on the object.
+ ## Toggle auto color mode on the object.
# @param theAutoColor the flag which toggles auto color mode.
- # @ingroup l1_auxiliary
+ #
+ # If switched on, a default color of a new group in Create Group dialog is chosen randomly.
+ # @ingroup l1_grouping
def SetAutoColor(self, theAutoColor):
self.mesh.SetAutoColor(theAutoColor)
- ## Gets flag of object auto color mode.
+ ## Get flag of object auto color mode.
# @return True or False
- # @ingroup l1_auxiliary
+ # @ingroup l1_grouping
def GetAutoColor(self):
return self.mesh.GetAutoColor()
- ## Gets the internal ID
+ ## Get the internal ID
# @return integer value, which is the internal Id of the mesh
# @ingroup l1_auxiliary
def GetId(self):
return self.mesh.GetId()
- ## Get the study Id
- # @return integer value, which is the study Id of the mesh
- # @ingroup l1_auxiliary
- def GetStudyId(self):
- return self.mesh.GetStudyId()
-
- ## Checks the group names for duplications.
+ ## Check the group names for duplications.
# Consider the maximum group name length stored in MED file.
# @return True or False
- # @ingroup l1_auxiliary
+ # @ingroup l1_grouping
def HasDuplicatedGroupNamesMED(self):
return self.mesh.HasDuplicatedGroupNamesMED()
- ## Obtains the mesh editor tool
+ ## Obtain the mesh editor tool
# @return an instance of SMESH_MeshEditor
# @ingroup l1_modifying
def GetMeshEditor(self):
@@ -2268,44 +2397,44 @@ class Mesh:
# Get informations about mesh contents:
# ------------------------------------
- ## Gets the mesh stattistic
+ ## Get the mesh stattistic
# @return dictionary type element - count of elements
# @ingroup l1_meshinfo
def GetMeshInfo(self, obj = None):
if not obj: obj = self.mesh
return self.smeshpyD.GetMeshInfo(obj)
- ## Returns the number of nodes in the mesh
+ ## Return the number of nodes in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbNodes(self):
return self.mesh.NbNodes()
- ## Returns the number of elements in the mesh
+ ## Return the number of elements in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbElements(self):
return self.mesh.NbElements()
- ## Returns the number of 0d elements in the mesh
+ ## Return the number of 0d elements in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def Nb0DElements(self):
return self.mesh.Nb0DElements()
- ## Returns the number of ball discrete elements in the mesh
+ ## Return the number of ball discrete elements in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbBalls(self):
return self.mesh.NbBalls()
- ## Returns the number of edges in the mesh
+ ## Return the number of edges in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbEdges(self):
return self.mesh.NbEdges()
- ## Returns the number of edges with the given order in the mesh
+ ## Return the number of edges with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2313,13 +2442,13 @@ class Mesh:
def NbEdgesOfOrder(self, elementOrder):
return self.mesh.NbEdgesOfOrder(elementOrder)
- ## Returns the number of faces in the mesh
+ ## Return the number of faces in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbFaces(self):
return self.mesh.NbFaces()
- ## Returns the number of faces with the given order in the mesh
+ ## Return the number of faces with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2327,13 +2456,13 @@ class Mesh:
def NbFacesOfOrder(self, elementOrder):
return self.mesh.NbFacesOfOrder(elementOrder)
- ## Returns the number of triangles in the mesh
+ ## Return the number of triangles in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbTriangles(self):
return self.mesh.NbTriangles()
- ## Returns the number of triangles with the given order in the mesh
+ ## Return the number of triangles with the given order in the mesh
# @param elementOrder is the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2341,19 +2470,19 @@ class Mesh:
def NbTrianglesOfOrder(self, elementOrder):
return self.mesh.NbTrianglesOfOrder(elementOrder)
- ## Returns the number of biquadratic triangles in the mesh
+ ## Return the number of biquadratic triangles in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbBiQuadTriangles(self):
return self.mesh.NbBiQuadTriangles()
- ## Returns the number of quadrangles in the mesh
+ ## Return the number of quadrangles in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbQuadrangles(self):
return self.mesh.NbQuadrangles()
- ## Returns the number of quadrangles with the given order in the mesh
+ ## Return the number of quadrangles with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2361,13 +2490,13 @@ class Mesh:
def NbQuadranglesOfOrder(self, elementOrder):
return self.mesh.NbQuadranglesOfOrder(elementOrder)
- ## Returns the number of biquadratic quadrangles in the mesh
+ ## Return the number of biquadratic quadrangles in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbBiQuadQuadrangles(self):
return self.mesh.NbBiQuadQuadrangles()
- ## Returns the number of polygons of given order in the mesh
+ ## Return the number of polygons of given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2375,13 +2504,13 @@ class Mesh:
def NbPolygons(self, elementOrder = SMESH.ORDER_ANY):
return self.mesh.NbPolygonsOfOrder(elementOrder)
- ## Returns the number of volumes in the mesh
+ ## Return the number of volumes in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbVolumes(self):
return self.mesh.NbVolumes()
- ## Returns the number of volumes with the given order in the mesh
+ ## Return the number of volumes with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2389,13 +2518,13 @@ class Mesh:
def NbVolumesOfOrder(self, elementOrder):
return self.mesh.NbVolumesOfOrder(elementOrder)
- ## Returns the number of tetrahedrons in the mesh
+ ## Return the number of tetrahedrons in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbTetras(self):
return self.mesh.NbTetras()
- ## Returns the number of tetrahedrons with the given order in the mesh
+ ## Return the number of tetrahedrons with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2403,13 +2532,13 @@ class Mesh:
def NbTetrasOfOrder(self, elementOrder):
return self.mesh.NbTetrasOfOrder(elementOrder)
- ## Returns the number of hexahedrons in the mesh
+ ## Return the number of hexahedrons in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbHexas(self):
return self.mesh.NbHexas()
- ## Returns the number of hexahedrons with the given order in the mesh
+ ## Return the number of hexahedrons with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2417,19 +2546,19 @@ class Mesh:
def NbHexasOfOrder(self, elementOrder):
return self.mesh.NbHexasOfOrder(elementOrder)
- ## Returns the number of triquadratic hexahedrons in the mesh
+ ## Return the number of triquadratic hexahedrons in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbTriQuadraticHexas(self):
return self.mesh.NbTriQuadraticHexas()
- ## Returns the number of pyramids in the mesh
+ ## Return the number of pyramids in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbPyramids(self):
return self.mesh.NbPyramids()
- ## Returns the number of pyramids with the given order in the mesh
+ ## Return the number of pyramids with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2437,13 +2566,13 @@ class Mesh:
def NbPyramidsOfOrder(self, elementOrder):
return self.mesh.NbPyramidsOfOrder(elementOrder)
- ## Returns the number of prisms in the mesh
+ ## Return the number of prisms in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbPrisms(self):
return self.mesh.NbPrisms()
- ## Returns the number of prisms with the given order in the mesh
+ ## Return the number of prisms with the given order in the mesh
# @param elementOrder the order of elements:
# SMESH.ORDER_ANY, SMESH.ORDER_LINEAR or SMESH.ORDER_QUADRATIC
# @return an integer value
@@ -2451,31 +2580,31 @@ class Mesh:
def NbPrismsOfOrder(self, elementOrder):
return self.mesh.NbPrismsOfOrder(elementOrder)
- ## Returns the number of hexagonal prisms in the mesh
+ ## Return the number of hexagonal prisms in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbHexagonalPrisms(self):
return self.mesh.NbHexagonalPrisms()
- ## Returns the number of polyhedrons in the mesh
+ ## Return the number of polyhedrons in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbPolyhedrons(self):
return self.mesh.NbPolyhedrons()
- ## Returns the number of submeshes in the mesh
+ ## Return the number of submeshes in the mesh
# @return an integer value
# @ingroup l1_meshinfo
def NbSubMesh(self):
return self.mesh.NbSubMesh()
- ## Returns the list of mesh elements IDs
+ ## Return the list of mesh elements IDs
# @return the list of integer values
# @ingroup l1_meshinfo
def GetElementsId(self):
return self.mesh.GetElementsId()
- ## Returns the list of IDs of mesh elements with the given type
+ ## Return the list of IDs of mesh elements with the given type
# @param elementType the required type of elements, either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE or SMESH.VOLUME)
# @return list of integer values
@@ -2483,7 +2612,7 @@ class Mesh:
def GetElementsByType(self, elementType):
return self.mesh.GetElementsByType(elementType)
- ## Returns the list of mesh nodes IDs
+ ## Return the list of mesh nodes IDs
# @return the list of integer values
# @ingroup l1_meshinfo
def GetNodesId(self):
@@ -2492,28 +2621,28 @@ class Mesh:
# Get the information about mesh elements:
# ------------------------------------
- ## Returns the type of mesh element
+ ## Return the type of mesh element
# @return the value from SMESH::ElementType enumeration
# Type SMESH.ElementType._items in the Python Console to see all possible values.
# @ingroup l1_meshinfo
def GetElementType(self, id, iselem=True):
return self.mesh.GetElementType(id, iselem)
- ## Returns the geometric type of mesh element
+ ## Return the geometric type of mesh element
# @return the value from SMESH::EntityType enumeration
# Type SMESH.EntityType._items in the Python Console to see all possible values.
# @ingroup l1_meshinfo
def GetElementGeomType(self, id):
return self.mesh.GetElementGeomType(id)
- ## Returns the shape type of mesh element
+ ## Return the shape type of mesh element
# @return the value from SMESH::GeometryType enumeration.
# Type SMESH.GeometryType._items in the Python Console to see all possible values.
# @ingroup l1_meshinfo
def GetElementShape(self, id):
return self.mesh.GetElementShape(id)
- ## Returns the list of submesh elements IDs
+ ## Return the list of submesh elements IDs
# @param Shape a geom object(sub-shape)
# Shape must be the sub-shape of a ShapeToMesh()
# @return the list of integer values
@@ -2525,7 +2654,7 @@ class Mesh:
ShapeID = Shape
return self.mesh.GetSubMeshElementsId(ShapeID)
- ## Returns the list of submesh nodes IDs
+ ## Return the list of submesh nodes IDs
# @param Shape a geom object(sub-shape)
# Shape must be the sub-shape of a ShapeToMesh()
# @param all If true, gives all nodes of submesh elements, otherwise gives only submesh nodes
@@ -2538,7 +2667,7 @@ class Mesh:
ShapeID = Shape
return self.mesh.GetSubMeshNodesId(ShapeID, all)
- ## Returns type of elements on given shape
+ ## Return type of elements on given shape
# @param Shape a geom object(sub-shape)
# Shape must be a sub-shape of a ShapeToMesh()
# @return element type
@@ -2550,7 +2679,7 @@ class Mesh:
ShapeID = Shape
return self.mesh.GetSubMeshElementType(ShapeID)
- ## Gets the mesh description
+ ## Get the mesh description
# @return string value
# @ingroup l1_meshinfo
def Dump(self):
@@ -2560,72 +2689,72 @@ class Mesh:
# Get the information about nodes and elements of a mesh by its IDs:
# -----------------------------------------------------------
- ## Gets XYZ coordinates of a node
- # \n If there is no nodes for the given ID - returns an empty list
+ ## Get XYZ coordinates of a node
+ # \n If there is no nodes for the given ID - return an empty list
# @return a list of double precision values
# @ingroup l1_meshinfo
def GetNodeXYZ(self, id):
return self.mesh.GetNodeXYZ(id)
- ## Returns list of IDs of inverse elements for the given node
- # \n If there is no node for the given ID - returns an empty list
+ ## Return list of IDs of inverse elements for the given node
+ # \n If there is no node for the given ID - return an empty list
# @return a list of integer values
# @ingroup l1_meshinfo
def GetNodeInverseElements(self, id):
return self.mesh.GetNodeInverseElements(id)
- ## @brief Returns the position of a node on the shape
+ ## Return the position of a node on the shape
# @return SMESH::NodePosition
# @ingroup l1_meshinfo
def GetNodePosition(self,NodeID):
return self.mesh.GetNodePosition(NodeID)
- ## @brief Returns the position of an element on the shape
+ ## Return the position of an element on the shape
# @return SMESH::ElementPosition
# @ingroup l1_meshinfo
def GetElementPosition(self,ElemID):
return self.mesh.GetElementPosition(ElemID)
- ## Returns the ID of the shape, on which the given node was generated.
+ ## Return the ID of the shape, on which the given node was generated.
# @return an integer value > 0 or -1 if there is no node for the given
# ID or the node is not assigned to any geometry
# @ingroup l1_meshinfo
def GetShapeID(self, id):
return self.mesh.GetShapeID(id)
- ## Returns the ID of the shape, on which the given element was generated.
+ ## Return the ID of the shape, on which the given element was generated.
# @return an integer value > 0 or -1 if there is no element for the given
# ID or the element is not assigned to any geometry
# @ingroup l1_meshinfo
def GetShapeIDForElem(self,id):
return self.mesh.GetShapeIDForElem(id)
- ## Returns the number of nodes of the given element
+ ## Return the number of nodes of the given element
# @return an integer value > 0 or -1 if there is no element for the given ID
# @ingroup l1_meshinfo
def GetElemNbNodes(self, id):
return self.mesh.GetElemNbNodes(id)
- ## Returns the node ID the given (zero based) index for the given element
- # \n If there is no element for the given ID - returns -1
- # \n If there is no node for the given index - returns -2
+ ## Return the node ID the given (zero based) index for the given element
+ # \n If there is no element for the given ID - return -1
+ # \n If there is no node for the given index - return -2
# @return an integer value
# @ingroup l1_meshinfo
def GetElemNode(self, id, index):
return self.mesh.GetElemNode(id, index)
- ## Returns the IDs of nodes of the given element
+ ## Return the IDs of nodes of the given element
# @return a list of integer values
# @ingroup l1_meshinfo
def GetElemNodes(self, id):
return self.mesh.GetElemNodes(id)
- ## Returns true if the given node is the medium node in the given quadratic element
+ ## Return true if the given node is the medium node in the given quadratic element
# @ingroup l1_meshinfo
def IsMediumNode(self, elementID, nodeID):
return self.mesh.IsMediumNode(elementID, nodeID)
- ## Returns true if the given node is the medium node in one of quadratic elements
+ ## Return true if the given node is the medium node in one of quadratic elements
# @param nodeID ID of the node
# @param elementType the type of elements to check a state of the node, either of
# (SMESH.ALL, SMESH.NODE, SMESH.EDGE, SMESH.FACE or SMESH.VOLUME)
@@ -2633,55 +2762,60 @@ class Mesh:
def IsMediumNodeOfAnyElem(self, nodeID, elementType = SMESH.ALL ):
return self.mesh.IsMediumNodeOfAnyElem(nodeID, elementType)
- ## Returns the number of edges for the given element
+ ## Return the number of edges for the given element
# @ingroup l1_meshinfo
def ElemNbEdges(self, id):
return self.mesh.ElemNbEdges(id)
- ## Returns the number of faces for the given element
+ ## Return the number of faces for the given element
# @ingroup l1_meshinfo
def ElemNbFaces(self, id):
return self.mesh.ElemNbFaces(id)
- ## Returns nodes of given face (counted from zero) for given volumic element.
+ ## Return nodes of given face (counted from zero) for given volumic element.
# @ingroup l1_meshinfo
def GetElemFaceNodes(self,elemId, faceIndex):
return self.mesh.GetElemFaceNodes(elemId, faceIndex)
- ## Returns three components of normal of given mesh face
+ ## Return three components of normal of given mesh face
# (or an empty array in KO case)
# @ingroup l1_meshinfo
def GetFaceNormal(self, faceId, normalized=False):
return self.mesh.GetFaceNormal(faceId,normalized)
- ## Returns an element based on all given nodes.
+ ## Return an element based on all given nodes.
# @ingroup l1_meshinfo
- def FindElementByNodes(self,nodes):
+ def FindElementByNodes(self, nodes):
return self.mesh.FindElementByNodes(nodes)
- ## Returns true if the given element is a polygon
+ ## Return elements including all given nodes.
+ # @ingroup l1_meshinfo
+ def GetElementsByNodes(self, nodes, elemType=SMESH.ALL):
+ return self.mesh.GetElementsByNodes( nodes, elemType )
+
+ ## Return true if the given element is a polygon
# @ingroup l1_meshinfo
def IsPoly(self, id):
return self.mesh.IsPoly(id)
- ## Returns true if the given element is quadratic
+ ## Return true if the given element is quadratic
# @ingroup l1_meshinfo
def IsQuadratic(self, id):
return self.mesh.IsQuadratic(id)
- ## Returns diameter of a ball discrete element or zero in case of an invalid \a id
+ ## Return diameter of a ball discrete element or zero in case of an invalid \a id
# @ingroup l1_meshinfo
def GetBallDiameter(self, id):
return self.mesh.GetBallDiameter(id)
- ## Returns XYZ coordinates of the barycenter of the given element
- # \n If there is no element for the given ID - returns an empty list
+ ## Return XYZ coordinates of the barycenter of the given element
+ # \n If there is no element for the given ID - return an empty list
# @return a list of three double values
# @ingroup l1_meshinfo
def BaryCenter(self, id):
return self.mesh.BaryCenter(id)
- ## Passes mesh elements through the given filter and return IDs of fitting elements
+ ## Pass mesh elements through the given filter and return IDs of fitting elements
# @param theFilter SMESH_Filter
# @return a list of ids
# @ingroup l1_controls
@@ -2689,10 +2823,13 @@ class Mesh:
theFilter.SetMesh( self.mesh )
return theFilter.GetIDs()
- ## Verifies whether a 2D mesh element has free edges (edges connected to one face only)\n
- # Returns a list of special structures (borders).
+ # Get mesh measurements information:
+ # ------------------------------------
+
+ ## Verify whether a 2D mesh element has free edges (edges connected to one face only)\n
+ # Return a list of special structures (borders).
# @return a list of SMESH.FreeEdges.Border structure: edge id and ids of two its nodes.
- # @ingroup l1_controls
+ # @ingroup l1_measurements
def GetFreeBorders(self):
aFilterMgr = self.smeshpyD.CreateFilterManager()
aPredicate = aFilterMgr.CreateFreeEdges()
@@ -2701,10 +2838,6 @@ class Mesh:
aFilterMgr.UnRegister()
return aBorders
-
- # Get mesh measurements information:
- # ------------------------------------
-
## Get minimum distance between two nodes, elements or distance to the origin
# @param id1 first node/element id
# @param id2 second node/element id (if 0, distance from @a id1 to the origin is computed)
@@ -2712,6 +2845,7 @@ class Mesh:
# @param isElem2 @c True if @a id2 is element id, @c False if it is node id
# @return minimum distance value
# @sa GetMinDistance()
+ # @ingroup l1_measurements
def MinDistance(self, id1, id2=0, isElem1=False, isElem2=False):
aMeasure = self.GetMinDistance(id1, id2, isElem1, isElem2)
return aMeasure.value
@@ -2723,6 +2857,7 @@ class Mesh:
# @param isElem2 @c True if @a id2 is element id, @c False if it is node id
# @return Measure structure
# @sa MinDistance()
+ # @ingroup l1_measurements
def GetMinDistance(self, id1, id2=0, isElem1=False, isElem2=False):
if isElem1:
id1 = self.editor.MakeIDSource([id1], SMESH.FACE)
@@ -2748,6 +2883,7 @@ class Mesh:
# @c False specifies that @a objects are nodes
# @return tuple of six values (minX, minY, minZ, maxX, maxY, maxZ)
# @sa GetBoundingBox()
+ # @ingroup l1_measurements
def BoundingBox(self, objects=None, isElem=False):
result = self.GetBoundingBox(objects, isElem)
if result is None:
@@ -2762,6 +2898,7 @@ class Mesh:
# @c False specifies that @a objects are nodes
# @return Measure structure
# @sa BoundingBox()
+ # @ingroup l1_measurements
def GetBoundingBox(self, IDs=None, isElem=False):
if IDs is None:
IDs = [self.mesh]
@@ -2796,21 +2933,21 @@ class Mesh:
# Mesh edition (SMESH_MeshEditor functionality):
# ---------------------------------------------
- ## Removes the elements from the mesh by ids
+ ## Remove the elements from the mesh by ids
# @param IDsOfElements is a list of ids of elements to remove
# @return True or False
# @ingroup l2_modif_del
def RemoveElements(self, IDsOfElements):
return self.editor.RemoveElements(IDsOfElements)
- ## Removes nodes from mesh by ids
+ ## Remove nodes from mesh by ids
# @param IDsOfNodes is a list of ids of nodes to remove
# @return True or False
# @ingroup l2_modif_del
def RemoveNodes(self, IDsOfNodes):
return self.editor.RemoveNodes(IDsOfNodes)
- ## Removes all orphan (free) nodes from mesh
+ ## Remove all orphan (free) nodes from mesh
# @return number of the removed nodes
# @ingroup l2_modif_del
def RemoveOrphanNodes(self):
@@ -2824,7 +2961,7 @@ class Mesh:
if hasVars: self.mesh.SetParameters(Parameters)
return self.editor.AddNode( x, y, z)
- ## Creates a 0D element on a node with given number.
+ ## Create a 0D element on a node with given number.
# @param IDOfNode the ID of node for creation of the element.
# @param DuplicateElements to add one more 0D element to a node or not
# @return the Id of the new 0D element
@@ -2832,7 +2969,7 @@ class Mesh:
def Add0DElement( self, IDOfNode, DuplicateElements=True ):
return self.editor.Add0DElement( IDOfNode, DuplicateElements )
- ## Create 0D elements on all nodes of the given elements except those
+ ## Create 0D elements on all nodes of the given elements except those
# nodes on which a 0D element already exists.
# @param theObject an object on whose nodes 0D elements will be created.
# It can be mesh, sub-mesh, group, list of element IDs or a holder
@@ -2841,7 +2978,7 @@ class Mesh:
# and/or found on nodes of \a theObject.
# @param DuplicateElements to add one more 0D element to a node or not
# @return an object (a new group or a temporary SMESH_IDSource) holding
- # IDs of new and/or found 0D elements. IDs of 0D elements
+ # IDs of new and/or found 0D elements. IDs of 0D elements
# can be retrieved from the returned object by calling GetIDs()
# @ingroup l2_modif_add
def Add0DElementsToAllNodes(self, theObject, theGroupName="", DuplicateElements=False):
@@ -2853,7 +2990,7 @@ class Mesh:
unRegister.set( theObject )
return self.editor.Create0DElementsOnAllNodes( theObject, theGroupName, DuplicateElements )
- ## Creates a ball element on a node with given ID.
+ ## Create a ball element on a node with given ID.
# @param IDOfNode the ID of node for creation of the element.
# @param diameter the bal diameter.
# @return the Id of the new ball element
@@ -2861,7 +2998,7 @@ class Mesh:
def AddBall(self, IDOfNode, diameter):
return self.editor.AddBall( IDOfNode, diameter )
- ## Creates a linear or quadratic edge (this is determined
+ ## Create a linear or quadratic edge (this is determined
# by the number of given nodes).
# @param IDsOfNodes the list of node IDs for creation of the element.
# The order of nodes in this list should correspond to the description
@@ -2872,7 +3009,7 @@ class Mesh:
def AddEdge(self, IDsOfNodes):
return self.editor.AddEdge(IDsOfNodes)
- ## Creates a linear or quadratic face (this is determined
+ ## Create a linear or quadratic face (this is determined
# by the number of given nodes).
# @param IDsOfNodes the list of node IDs for creation of the element.
# The order of nodes in this list should correspond to the description
@@ -2883,14 +3020,14 @@ class Mesh:
def AddFace(self, IDsOfNodes):
return self.editor.AddFace(IDsOfNodes)
- ## Adds a polygonal face to the mesh by the list of node IDs
+ ## Add a polygonal face to the mesh by the list of node IDs
# @param IdsOfNodes the list of node IDs for creation of the element.
# @return the Id of the new face
# @ingroup l2_modif_add
def AddPolygonalFace(self, IdsOfNodes):
return self.editor.AddPolygonalFace(IdsOfNodes)
- ## Adds a quadratic polygonal face to the mesh by the list of node IDs
+ ## Add a quadratic polygonal face to the mesh by the list of node IDs
# @param IdsOfNodes the list of node IDs for creation of the element;
# corner nodes follow first.
# @return the Id of the new face
@@ -2898,7 +3035,7 @@ class Mesh:
def AddQuadPolygonalFace(self, IdsOfNodes):
return self.editor.AddQuadPolygonalFace(IdsOfNodes)
- ## Creates both simple and quadratic volume (this is determined
+ ## Create both simple and quadratic volume (this is determined
# by the number of given nodes).
# @param IDsOfNodes the list of node IDs for creation of the element.
# The order of nodes in this list should correspond to the description
@@ -2909,7 +3046,7 @@ class Mesh:
def AddVolume(self, IDsOfNodes):
return self.editor.AddVolume(IDsOfNodes)
- ## Creates a volume of many faces, giving nodes for each face.
+ ## Create a volume of many faces, giving nodes for each face.
# @param IdsOfNodes the list of node IDs for volume creation face by face.
# @param Quantities the list of integer values, Quantities[i]
# gives the quantity of nodes in face number i.
@@ -2918,7 +3055,7 @@ class Mesh:
def AddPolyhedralVolume (self, IdsOfNodes, Quantities):
return self.editor.AddPolyhedralVolume(IdsOfNodes, Quantities)
- ## Creates a volume of many faces, giving the IDs of the existing faces.
+ ## Create a volume of many faces, giving the IDs of the existing faces.
# @param IdsOfFaces the list of face IDs for volume creation.
#
# Note: The created volume will refer only to the nodes
@@ -2941,8 +3078,8 @@ class Mesh:
VertexID = Vertex
try:
self.editor.SetNodeOnVertex(NodeID, VertexID)
- except SALOME.SALOME_Exception, inst:
- raise ValueError, inst.details.text
+ except SALOME.SALOME_Exception as inst:
+ raise ValueError(inst.details.text)
return True
@@ -2959,8 +3096,8 @@ class Mesh:
EdgeID = Edge
try:
self.editor.SetNodeOnEdge(NodeID, EdgeID, paramOnEdge)
- except SALOME.SALOME_Exception, inst:
- raise ValueError, inst.details.text
+ except SALOME.SALOME_Exception as inst:
+ raise ValueError(inst.details.text)
return True
## @brief Stores node position on a face
@@ -2977,8 +3114,8 @@ class Mesh:
FaceID = Face
try:
self.editor.SetNodeOnFace(NodeID, FaceID, u, v)
- except SALOME.SALOME_Exception, inst:
- raise ValueError, inst.details.text
+ except SALOME.SALOME_Exception as inst:
+ raise ValueError(inst.details.text)
return True
## @brief Binds a node to a solid
@@ -2993,8 +3130,8 @@ class Mesh:
SolidID = Solid
try:
self.editor.SetNodeInVolume(NodeID, SolidID)
- except SALOME.SALOME_Exception, inst:
- raise ValueError, inst.details.text
+ except SALOME.SALOME_Exception as inst:
+ raise ValueError(inst.details.text)
return True
## @brief Bind an element to a shape
@@ -3009,57 +3146,57 @@ class Mesh:
ShapeID = Shape
try:
self.editor.SetMeshElementOnShape(ElementID, ShapeID)
- except SALOME.SALOME_Exception, inst:
- raise ValueError, inst.details.text
+ except SALOME.SALOME_Exception as inst:
+ raise ValueError(inst.details.text)
return True
- ## Moves the node with the given id
+ ## Move the node with the given id
# @param NodeID the id of the node
# @param x a new X coordinate
# @param y a new Y coordinate
# @param z a new Z coordinate
# @return True if succeed else False
- # @ingroup l2_modif_movenode
+ # @ingroup l2_modif_edit
def MoveNode(self, NodeID, x, y, z):
x,y,z,Parameters,hasVars = ParseParameters(x,y,z)
if hasVars: self.mesh.SetParameters(Parameters)
return self.editor.MoveNode(NodeID, x, y, z)
- ## Finds the node closest to a point and moves it to a point location
+ ## Find the node closest to a point and moves it to a point location
# @param x the X coordinate of a point
# @param y the Y coordinate of a point
# @param z the Z coordinate of a point
# @param NodeID if specified (>0), the node with this ID is moved,
# otherwise, the node closest to point (@a x,@a y,@a z) is moved
# @return the ID of a node
- # @ingroup l2_modif_throughp
+ # @ingroup l2_modif_edit
def MoveClosestNodeToPoint(self, x, y, z, NodeID):
x,y,z,Parameters,hasVars = ParseParameters(x,y,z)
if hasVars: self.mesh.SetParameters(Parameters)
return self.editor.MoveClosestNodeToPoint(x, y, z, NodeID)
- ## Finds the node closest to a point
+ ## Find the node closest to a point
# @param x the X coordinate of a point
# @param y the Y coordinate of a point
# @param z the Z coordinate of a point
# @return the ID of a node
- # @ingroup l2_modif_throughp
+ # @ingroup l1_meshinfo
def FindNodeClosestTo(self, x, y, z):
#preview = self.mesh.GetMeshEditPreviewer()
#return preview.MoveClosestNodeToPoint(x, y, z, -1)
return self.editor.FindNodeClosestTo(x, y, z)
- ## Finds the elements where a point lays IN or ON
+ ## Find the elements where a point lays IN or ON
# @param x the X coordinate of a point
# @param y the Y coordinate of a point
# @param z the Z coordinate of a point
- # @param elementType type of elements to find; either of
+ # @param elementType type of elements to find; either of
# (SMESH.NODE, SMESH.EDGE, SMESH.FACE, SMESH.VOLUME); SMESH.ALL type
# means elements of any type excluding nodes, discrete and 0D elements.
# @param meshPart a part of mesh (group, sub-mesh) to search within
# @return list of IDs of found elements
- # @ingroup l2_modif_throughp
+ # @ingroup l1_meshinfo
def FindElementsByPoint(self, x, y, z, elementType = SMESH.ALL, meshPart=None):
if meshPart:
return self.editor.FindAmongElementsByPoint( meshPart, x, y, z, elementType );
@@ -3069,19 +3206,20 @@ class Mesh:
## Return point state in a closed 2D mesh in terms of TopAbs_State enumeration:
# 0-IN, 1-OUT, 2-ON, 3-UNKNOWN
# UNKNOWN state means that either mesh is wrong or the analysis fails.
+ # @ingroup l1_meshinfo
def GetPointState(self, x, y, z):
return self.editor.GetPointState(x, y, z)
- ## Finds the node closest to a point and moves it to a point location
+ ## Find the node closest to a point and moves it to a point location
# @param x the X coordinate of a point
# @param y the Y coordinate of a point
# @param z the Z coordinate of a point
# @return the ID of a moved node
- # @ingroup l2_modif_throughp
+ # @ingroup l2_modif_edit
def MeshToPassThroughAPoint(self, x, y, z):
return self.editor.MoveClosestNodeToPoint(x, y, z, -1)
- ## Replaces two neighbour triangles sharing Node1-Node2 link
+ ## Replace two neighbour triangles sharing Node1-Node2 link
# with the triangles built on the same 4 nodes but having other common link.
# @param NodeID1 the ID of the first node
# @param NodeID2 the ID of the second node
@@ -3090,7 +3228,7 @@ class Mesh:
def InverseDiag(self, NodeID1, NodeID2):
return self.editor.InverseDiag(NodeID1, NodeID2)
- ## Replaces two neighbour triangles sharing Node1-Node2 link
+ ## Replace two neighbour triangles sharing Node1-Node2 link
# with a quadrangle built on the same 4 nodes.
# @param NodeID1 the ID of the first node
# @param NodeID2 the ID of the second node
@@ -3099,7 +3237,7 @@ class Mesh:
def DeleteDiag(self, NodeID1, NodeID2):
return self.editor.DeleteDiag(NodeID1, NodeID2)
- ## Reorients elements by ids
+ ## Reorient elements by ids
# @param IDsOfElements if undefined reorients all mesh elements
# @return True if succeed else False
# @ingroup l2_modif_changori
@@ -3108,7 +3246,7 @@ class Mesh:
IDsOfElements = self.GetElementsId()
return self.editor.Reorient(IDsOfElements)
- ## Reorients all elements of the object
+ ## Reorient all elements of the object
# @param theObject mesh, submesh or group
# @return True if succeed else False
# @ingroup l2_modif_changori
@@ -3185,7 +3323,7 @@ class Mesh:
unRegister.set( the3DObject )
return self.editor.Reorient2DBy3D( the2DObject, the3DObject, theOutsideNormal )
- ## Fuses the neighbouring triangles into quadrangles.
+ ## Fuse the neighbouring triangles into quadrangles.
# @param IDsOfElements The triangles to be fused.
# @param theCriterion a numerical functor, in terms of enum SMESH.FunctorType, used to
# applied to possible quadrangles to choose a neighbour to fuse with.
@@ -3204,7 +3342,7 @@ class Mesh:
Functor = self.smeshpyD.GetFunctor(theCriterion)
return self.editor.TriToQuad(IDsOfElements, Functor, MaxAngle)
- ## Fuses the neighbouring triangles of the object into quadrangles
+ ## Fuse the neighbouring triangles of the object into quadrangles
# @param theObject is mesh, submesh or group
# @param theCriterion is a numerical functor, in terms of enum SMESH.FunctorType,
# applied to possible quadrangles to choose a neighbour to fuse with.
@@ -3222,7 +3360,7 @@ class Mesh:
Functor = self.smeshpyD.GetFunctor(theCriterion)
return self.editor.TriToQuadObject(theObject, Functor, MaxAngle)
- ## Splits quadrangles into triangles.
+ ## Split quadrangles into triangles.
# @param IDsOfElements the faces to be splitted.
# @param theCriterion is a numerical functor, in terms of enum SMESH.FunctorType, used to
# choose a diagonal for splitting. If @a theCriterion is None, which is a default
@@ -3239,7 +3377,7 @@ class Mesh:
Functor = self.smeshpyD.GetFunctor(theCriterion)
return self.editor.QuadToTri(IDsOfElements, Functor)
- ## Splits quadrangles into triangles.
+ ## Split quadrangles into triangles.
# @param theObject the object from which the list of elements is taken,
# this is mesh, submesh or group
# @param theCriterion is a numerical functor, in terms of enum SMESH.FunctorType, used to
@@ -3257,7 +3395,7 @@ class Mesh:
Functor = self.smeshpyD.GetFunctor(theCriterion)
return self.editor.QuadToTriObject(theObject, Functor)
- ## Splits each of given quadrangles into 4 triangles. A node is added at the center of
+ ## Split each of given quadrangles into 4 triangles. A node is added at the center of
# a quadrangle.
# @param theElements the faces to be splitted. This can be either mesh, sub-mesh,
# group or a list of face IDs. By default all quadrangles are split
@@ -3273,7 +3411,7 @@ class Mesh:
unRegister.set( theElements )
return self.editor.QuadTo4Tri( theElements )
- ## Splits quadrangles into triangles.
+ ## Split quadrangles into triangles.
# @param IDsOfElements the faces to be splitted
# @param Diag13 is used to choose a diagonal for splitting.
# @return TRUE in case of success, FALSE otherwise.
@@ -3283,7 +3421,7 @@ class Mesh:
IDsOfElements = self.GetElementsId()
return self.editor.SplitQuad(IDsOfElements, Diag13)
- ## Splits quadrangles into triangles.
+ ## Split quadrangles into triangles.
# @param theObject the object from which the list of elements is taken,
# this is mesh, submesh or group
# @param Diag13 is used to choose a diagonal for splitting.
@@ -3294,7 +3432,7 @@ class Mesh:
theObject = theObject.GetMesh()
return self.editor.SplitQuadObject(theObject, Diag13)
- ## Finds a better splitting of the given quadrangle.
+ ## Find a better splitting of the given quadrangle.
# @param IDOfQuad the ID of the quadrangle to be splitted.
# @param theCriterion is a numerical functor, in terms of enum SMESH.FunctorType, used to
# choose a diagonal for splitting.
@@ -3306,7 +3444,7 @@ class Mesh:
def BestSplit (self, IDOfQuad, theCriterion):
return self.editor.BestSplit(IDOfQuad, self.smeshpyD.GetFunctor(theCriterion))
- ## Splits volumic elements into tetrahedrons
+ ## Split volumic elements into tetrahedrons
# @param elems either a list of elements or a mesh or a group or a submesh or a filter
# @param method flags passing splitting method:
# smesh.Hex_5Tet, smesh.Hex_6Tet, smesh.Hex_24Tet.
@@ -3344,7 +3482,7 @@ class Mesh:
elems = [elems]
self.editor.SplitBiQuadraticIntoLinear( elems )
- ## Splits hexahedra into prisms
+ ## Split hexahedra into prisms
# @param elems either a list of elements or a mesh or a group or a submesh or a filter
# @param startHexPoint a point used to find a hexahedron for which @a facetNormal
# gives a normal vector defining facets to split into triangles.
@@ -3385,9 +3523,9 @@ class Mesh:
self.editor.SplitHexahedraIntoPrisms(elems, startHexPoint, facetNormal, method, allDomains)
- ## Splits quadrangle faces near triangular facets of volumes
+ ## Split quadrangle faces near triangular facets of volumes
#
- # @ingroup l1_auxiliary
+ # @ingroup l2_modif_cutquadr
def SplitQuadsNearTriangularFacets(self):
faces_array = self.GetElementsByType(SMESH.FACE)
for face_id in faces_array:
@@ -3425,7 +3563,7 @@ class Mesh:
# key-point will be mapped into theNode001-th node of each volume.
# The (0,0,0) key-point of the used pattern corresponds to a non-split corner.
# @return TRUE in case of success, FALSE otherwise.
- # @ingroup l1_auxiliary
+ # @ingroup l2_modif_cutquadr
def SplitHexaToTetras (self, theObject, theNode000, theNode001):
# Pattern: 5.---------.6
# /|#* /|
@@ -3461,12 +3599,12 @@ class Mesh:
pattern = self.smeshpyD.GetPattern()
isDone = pattern.LoadFromFile(pattern_tetra)
if not isDone:
- print 'Pattern.LoadFromFile :', pattern.GetErrorCode()
+ print('Pattern.LoadFromFile :', pattern.GetErrorCode())
return isDone
pattern.ApplyToHexahedrons(self.mesh, theObject.GetIDs(), theNode000, theNode001)
isDone = pattern.MakeMesh(self.mesh, False, False)
- if not isDone: print 'Pattern.MakeMesh :', pattern.GetErrorCode()
+ if not isDone: print('Pattern.MakeMesh :', pattern.GetErrorCode())
# split quafrangle faces near triangular facets of volumes
self.SplitQuadsNearTriangularFacets()
@@ -3483,7 +3621,7 @@ class Mesh:
# will be mapped into the theNode001-th node of each volume.
# Edge (0,0,0)-(0,0,1) of used pattern connects two not split corners.
# @return TRUE in case of success, FALSE otherwise.
- # @ingroup l1_auxiliary
+ # @ingroup l2_modif_cutquadr
def SplitHexaToPrisms (self, theObject, theNode000, theNode001):
# Pattern: 5.---------.6
# /|# /|
@@ -3515,19 +3653,19 @@ class Mesh:
pattern = self.smeshpyD.GetPattern()
isDone = pattern.LoadFromFile(pattern_prism)
if not isDone:
- print 'Pattern.LoadFromFile :', pattern.GetErrorCode()
+ print('Pattern.LoadFromFile :', pattern.GetErrorCode())
return isDone
pattern.ApplyToHexahedrons(self.mesh, theObject.GetIDs(), theNode000, theNode001)
isDone = pattern.MakeMesh(self.mesh, False, False)
- if not isDone: print 'Pattern.MakeMesh :', pattern.GetErrorCode()
+ if not isDone: print('Pattern.MakeMesh :', pattern.GetErrorCode())
- # Splits quafrangle faces near triangular facets of volumes
+ # Split quafrangle faces near triangular facets of volumes
self.SplitQuadsNearTriangularFacets()
return isDone
- ## Smoothes elements
+ ## Smooth elements
# @param IDsOfElements the list if ids of elements to smooth
# @param IDsOfFixedNodes the list of ids of fixed nodes.
# Note that nodes built on edges and boundary nodes are always fixed.
@@ -3546,7 +3684,7 @@ class Mesh:
return self.editor.Smooth(IDsOfElements, IDsOfFixedNodes,
MaxNbOfIterations, MaxAspectRatio, Method)
- ## Smoothes elements which belong to the given object
+ ## Smooth elements which belong to the given object
# @param theObject the object to smooth
# @param IDsOfFixedNodes the list of ids of fixed nodes.
# Note that nodes built on edges and boundary nodes are always fixed.
@@ -3563,7 +3701,7 @@ class Mesh:
return self.editor.SmoothObject(theObject, IDsOfFixedNodes,
MaxNbOfIterations, MaxAspectRatio, Method)
- ## Parametrically smoothes the given elements
+ ## Parametrically smooth the given elements
# @param IDsOfElements the list if ids of elements to smooth
# @param IDsOfFixedNodes the list of ids of fixed nodes.
# Note that nodes built on edges and boundary nodes are always fixed.
@@ -3582,7 +3720,7 @@ class Mesh:
return self.editor.SmoothParametric(IDsOfElements, IDsOfFixedNodes,
MaxNbOfIterations, MaxAspectRatio, Method)
- ## Parametrically smoothes the elements which belong to the given object
+ ## Parametrically smooth the elements which belong to the given object
# @param theObject the object to smooth
# @param IDsOfFixedNodes the list of ids of fixed nodes.
# Note that nodes built on edges and boundary nodes are always fixed.
@@ -3599,7 +3737,7 @@ class Mesh:
return self.editor.SmoothParametricObject(theObject, IDsOfFixedNodes,
MaxNbOfIterations, MaxAspectRatio, Method)
- ## Converts the mesh to quadratic or bi-quadratic, deletes old elements, replacing
+ ## Convert the mesh to quadratic or bi-quadratic, deletes old elements, replacing
# them with quadratic with the same id.
# @param theForce3d new node creation method:
# 0 - the medium node lies at the geometrical entity from which the mesh element is built
@@ -3620,10 +3758,10 @@ class Mesh:
self.editor.ConvertToQuadratic(theForce3d)
error = self.editor.GetLastError()
if error and error.comment:
- print error.comment
+ print(error.comment)
return error
-
- ## Converts the mesh from quadratic to ordinary,
+
+ ## Convert the mesh from quadratic to ordinary,
# deletes old quadratic elements, \n replacing
# them with ordinary mesh elements with the same id.
# @param theSubMesh a group or a sub-mesh to convert; WARNING: in this case the mesh can become not conformal
@@ -3634,19 +3772,19 @@ class Mesh:
else:
return self.editor.ConvertFromQuadratic()
- ## Creates 2D mesh as skin on boundary faces of a 3D mesh
+ ## Create 2D mesh as skin on boundary faces of a 3D mesh
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_add
def Make2DMeshFrom3D(self):
return self.editor.Make2DMeshFrom3D()
- ## Creates missing boundary elements
+ ## Create missing boundary elements
# @param elements - elements whose boundary is to be checked:
# mesh, group, sub-mesh or list of elements
# if elements is mesh, it must be the mesh whose MakeBoundaryMesh() is called
# @param dimension - defines type of boundary elements to create, either of
# { SMESH.BND_2DFROM3D, SMESH.BND_1DFROM3D, SMESH.BND_1DFROM2D }
- # SMESH.BND_1DFROM3D creates mesh edges on all borders of free facets of 3D cells
+ # SMESH.BND_1DFROM3D create mesh edges on all borders of free facets of 3D cells
# @param groupName - a name of group to store created boundary elements in,
# "" means not to create the group
# @param meshName - a name of new mesh to store created boundary elements in,
@@ -3656,7 +3794,7 @@ class Mesh:
# @param toCopyExistingBondary - if true, not only new but also pre-existing
# boundary elements will be copied into the new mesh
# @return tuple (mesh, group) where boundary elements were added to
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_add
def MakeBoundaryMesh(self, elements, dimension=SMESH.BND_2DFROM3D, groupName="", meshName="",
toCopyElements=False, toCopyExistingBondary=False):
unRegister = genObjUnRegister()
@@ -3673,13 +3811,13 @@ class Mesh:
return mesh, group
##
- # @brief Creates missing boundary elements around either the whole mesh or
+ # @brief Create missing boundary elements around either the whole mesh or
# groups of elements
# @param dimension - defines type of boundary elements to create, either of
# { SMESH.BND_2DFROM3D, SMESH.BND_1DFROM3D, SMESH.BND_1DFROM2D }
# @param groupName - a name of group to store all boundary elements in,
# "" means not to create the group
- # @param meshName - a name of a new mesh, which is a copy of the initial
+ # @param meshName - a name of a new mesh, which is a copy of the initial
# mesh + created boundary elements; "" means not to create the new mesh
# @param toCopyAll - if true, the whole initial mesh will be copied into
# the new mesh else only boundary elements will be copied into the new mesh
@@ -3689,6 +3827,7 @@ class Mesh:
# mesh - the mesh where elements were added to
# group - the group of boundary elements or None
#
+ # @ingroup l2_modif_add
def MakeBoundaryElements(self, dimension=SMESH.BND_2DFROM3D, groupName="", meshName="",
toCopyAll=False, groups=[]):
nb, mesh, group = self.editor.MakeBoundaryElements(dimension,groupName,meshName,
@@ -3720,7 +3859,7 @@ class Mesh:
arg = [arg]
return arg
- ## Generates new elements by rotation of the given elements and nodes around the axis
+ ## Generate new elements by rotation of the given elements and nodes around the axis
# @param nodes - nodes to revolve: a list including ids, groups, sub-meshes or a mesh
# @param edges - edges to revolve: a list including ids, groups, sub-meshes or a mesh
# @param faces - faces to revolve: a list including ids, groups, sub-meshes or a mesh
@@ -3756,7 +3895,7 @@ class Mesh:
Axis, AngleInRadians,
NbOfSteps, Tolerance, MakeGroups)
- ## Generates new elements by rotation of the elements around the axis
+ ## Generate new elements by rotation of the elements around the axis
# @param IDsOfElements the list of ids of elements to sweep
# @param Axis the axis of rotation, AxisStruct or line(geom object)
# @param AngleInRadians the angle of Rotation (in radians) or a name of variable which defines angle in degrees
@@ -3773,7 +3912,7 @@ class Mesh:
AngleInRadians, NbOfSteps, Tolerance,
MakeGroups, TotalAngle)
- ## Generates new elements by rotation of the elements of object around the axis
+ ## Generate new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped.
# It can be a mesh, a sub mesh or a group.
# @param Axis the axis of rotation, AxisStruct or line(geom object)
@@ -3791,7 +3930,7 @@ class Mesh:
AngleInRadians, NbOfSteps, Tolerance,
MakeGroups, TotalAngle )
- ## Generates new elements by rotation of the elements of object around the axis
+ ## Generate new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped.
# It can be a mesh, a sub mesh or a group.
# @param Axis the axis of rotation, AxisStruct or line(geom object)
@@ -3809,7 +3948,7 @@ class Mesh:
AngleInRadians, NbOfSteps, Tolerance,
MakeGroups, TotalAngle)
- ## Generates new elements by rotation of the elements of object around the axis
+ ## Generate new elements by rotation of the elements of object around the axis
# @param theObject object which elements should be sweeped.
# It can be a mesh, a sub mesh or a group.
# @param Axis the axis of rotation, AxisStruct or line(geom object)
@@ -3826,7 +3965,7 @@ class Mesh:
return self.RotationSweepObjects([],[],theObject, Axis, AngleInRadians,
NbOfSteps, Tolerance, MakeGroups, TotalAngle)
- ## Generates new elements by extrusion of the given elements and nodes
+ ## Generate new elements by extrusion of the given elements and nodes
# @param nodes nodes to extrude: a list including ids, groups, sub-meshes or a mesh
# @param edges edges to extrude: a list including ids, groups, sub-meshes or a mesh
# @param faces faces to extrude: a list including ids, groups, sub-meshes or a mesh
@@ -3846,6 +3985,7 @@ class Mesh:
# - a GEOM point
# @return the list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionSweepObjects(self, nodes, edges, faces, StepVector, NbOfSteps, MakeGroups=False,
scaleFactors=[], linearVariation=False, basePoint=[] ):
unRegister = genObjUnRegister()
@@ -3861,7 +4001,7 @@ class Mesh:
if isinstance( basePoint, int):
xyz = self.GetNodeXYZ( basePoint )
if not xyz:
- raise RuntimeError, "Invalid node ID: %s" % basePoint
+ raise RuntimeError("Invalid node ID: %s" % basePoint)
basePoint = xyz
if isinstance( basePoint, geomBuilder.GEOM._objref_GEOM_Object ):
basePoint = self.geompyD.PointCoordinates( basePoint )
@@ -3876,7 +4016,7 @@ class Mesh:
MakeGroups)
- ## Generates new elements by extrusion of the elements with given ids
+ ## Generate new elements by extrusion of the elements with given ids
# @param IDsOfElements the list of ids of elements or nodes for extrusion
# @param StepVector vector or DirStruct or 3 vector components, defining
# the direction and value of extrusion for one step (the total extrusion
@@ -3886,13 +4026,14 @@ class Mesh:
# @param IsNodes is True if elements with given ids are nodes
# @return the list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionSweep(self, IDsOfElements, StepVector, NbOfSteps, MakeGroups=False, IsNodes = False):
n,e,f = [],[],[]
if IsNodes: n = IDsOfElements
else : e,f, = IDsOfElements,IDsOfElements
return self.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups)
- ## Generates new elements by extrusion along the normal to a discretized surface or wire
+ ## Generate new elements by extrusion along the normal to a discretized surface or wire
# @param Elements elements to extrude - a list including ids, groups, sub-meshes or a mesh.
# Only faces can be extruded so far. A sub-mesh should be a sub-mesh on geom faces.
# @param StepSize length of one extrusion step (the total extrusion
@@ -3912,6 +4053,7 @@ class Mesh:
# @return the list of created groups (SMESH_GroupBase) if \a MakeGroups=True,
# empty list otherwise.
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionByNormal(self, Elements, StepSize, NbOfSteps,
ByAverageNormal=False, UseInputElemsOnly=True, MakeGroups=False, Dim = 2):
unRegister = genObjUnRegister()
@@ -3919,7 +4061,7 @@ class Mesh:
Elements = [ Elements.GetMesh() ]
if isinstance( Elements, list ):
if not Elements:
- raise RuntimeError, "Elements empty!"
+ raise RuntimeError("Elements empty!")
if isinstance( Elements[0], int ):
Elements = self.GetIDSource( Elements, SMESH.ALL )
unRegister.set( Elements )
@@ -3930,7 +4072,7 @@ class Mesh:
return self.editor.ExtrusionByNormal(Elements, StepSize, NbOfSteps,
ByAverageNormal, UseInputElemsOnly, MakeGroups, Dim)
- ## Generates new elements by extrusion of the elements or nodes which belong to the object
+ ## Generate new elements by extrusion of the elements or nodes which belong to the object
# @param theObject the object whose elements or nodes should be processed.
# It can be a mesh, a sub-mesh or a group.
# @param StepVector vector or DirStruct or 3 vector components, defining
@@ -3941,13 +4083,14 @@ class Mesh:
# @param IsNodes is True if elements to extrude are nodes
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionSweepObject(self, theObject, StepVector, NbOfSteps, MakeGroups=False, IsNodes=False):
n,e,f = [],[],[]
if IsNodes: n = theObject
else : e,f, = theObject,theObject
return self.ExtrusionSweepObjects(n,e,f, StepVector, NbOfSteps, MakeGroups)
- ## Generates new elements by extrusion of edges which belong to the object
+ ## Generate new elements by extrusion of edges which belong to the object
# @param theObject object whose 1D elements should be processed.
# It can be a mesh, a sub-mesh or a group.
# @param StepVector vector or DirStruct or 3 vector components, defining
@@ -3957,10 +4100,11 @@ class Mesh:
# @param MakeGroups to generate new groups from existing ones
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionSweepObject1D(self, theObject, StepVector, NbOfSteps, MakeGroups=False):
return self.ExtrusionSweepObjects([],theObject,[], StepVector, NbOfSteps, MakeGroups)
- ## Generates new elements by extrusion of faces which belong to the object
+ ## Generate new elements by extrusion of faces which belong to the object
# @param theObject object whose 2D elements should be processed.
# It can be a mesh, a sub-mesh or a group.
# @param StepVector vector or DirStruct or 3 vector components, defining
@@ -3970,10 +4114,11 @@ class Mesh:
# @param MakeGroups forces the generation of new groups from existing ones
# @return list of created groups (SMESH_GroupBase) if MakeGroups=True, empty list otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion example
def ExtrusionSweepObject2D(self, theObject, StepVector, NbOfSteps, MakeGroups=False):
return self.ExtrusionSweepObjects([],[],theObject, StepVector, NbOfSteps, MakeGroups)
- ## Generates new elements by extrusion of the elements with given ids
+ ## Generate new elements by extrusion of the elements with given ids
# @param IDsOfElements is ids of elements
# @param StepVector vector or DirStruct or 3 vector components, defining
# the direction and value of extrusion for one step (the total extrusion
@@ -3994,7 +4139,7 @@ class Mesh:
return self.editor.AdvancedExtrusion(IDsOfElements, StepVector, NbOfSteps,
ExtrFlags, SewTolerance, MakeGroups)
- ## Generates new elements by extrusion of the given elements and nodes along the path.
+ ## Generate new elements by extrusion of the given elements and nodes along the path.
# The path of extrusion must be a meshed edge.
# @param Nodes nodes to extrude: a list including ids, groups, sub-meshes or a mesh
# @param Edges edges to extrude: a list including ids, groups, sub-meshes or a mesh
@@ -4014,6 +4159,7 @@ class Mesh:
# @param MakeGroups forces the generation of new groups from existing ones
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPathObjects(self, Nodes, Edges, Faces, PathMesh, PathShape=None,
NodeStart=1, HasAngles=False, Angles=[], LinearVariation=False,
HasRefPoint=False, RefPoint=[0,0,0], MakeGroups=False):
@@ -4037,7 +4183,7 @@ class Mesh:
HasAngles, Angles, LinearVariation,
HasRefPoint, RefPoint, MakeGroups)
- ## Generates new elements by extrusion of the given elements
+ ## Generate new elements by extrusion of the given elements
# The path of extrusion must be a meshed edge.
# @param Base mesh or group, or sub-mesh, or list of ids of elements for extrusion
# @param Path - 1D mesh or 1D sub-mesh, along which proceeds the extrusion
@@ -4057,6 +4203,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True,
# only SMESH::Extrusion_Error otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPathX(self, Base, Path, NodeStart,
HasAngles=False, Angles=[], LinearVariation=False,
HasRefPoint=False, RefPoint=[0,0,0], MakeGroups=False,
@@ -4071,7 +4218,7 @@ class Mesh:
if MakeGroups: return gr,er
return er
- ## Generates new elements by extrusion of the given elements
+ ## Generate new elements by extrusion of the given elements
# The path of extrusion must be a meshed edge.
# @param IDsOfElements ids of elements
# @param PathMesh mesh containing a 1D sub-mesh on the edge, along which proceeds the extrusion
@@ -4089,6 +4236,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True,
# only SMESH::Extrusion_Error otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPath(self, IDsOfElements, PathMesh, PathShape, NodeStart,
HasAngles=False, Angles=[], HasRefPoint=False, RefPoint=[],
MakeGroups=False, LinearVariation=False):
@@ -4100,7 +4248,7 @@ class Mesh:
if MakeGroups: return gr,er
return er
- ## Generates new elements by extrusion of the elements which belong to the object
+ ## Generate new elements by extrusion of the elements which belong to the object
# The path of extrusion must be a meshed edge.
# @param theObject the object whose elements should be processed.
# It can be a mesh, a sub-mesh or a group.
@@ -4119,6 +4267,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True,
# only SMESH::Extrusion_Error otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPathObject(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles=False, Angles=[], HasRefPoint=False, RefPoint=[],
MakeGroups=False, LinearVariation=False):
@@ -4129,7 +4278,7 @@ class Mesh:
if MakeGroups: return gr,er
return er
- ## Generates new elements by extrusion of mesh segments which belong to the object
+ ## Generate new elements by extrusion of mesh segments which belong to the object
# The path of extrusion must be a meshed edge.
# @param theObject the object whose 1D elements should be processed.
# It can be a mesh, a sub-mesh or a group.
@@ -4148,6 +4297,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True,
# only SMESH::Extrusion_Error otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPathObject1D(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles=False, Angles=[], HasRefPoint=False, RefPoint=[],
MakeGroups=False, LinearVariation=False):
@@ -4158,7 +4308,7 @@ class Mesh:
if MakeGroups: return gr,er
return er
- ## Generates new elements by extrusion of faces which belong to the object
+ ## Generate new elements by extrusion of faces which belong to the object
# The path of extrusion must be a meshed edge.
# @param theObject the object whose 2D elements should be processed.
# It can be a mesh, a sub-mesh or a group.
@@ -4177,6 +4327,7 @@ class Mesh:
# @return list of created groups (SMESH_GroupBase) and SMESH::Extrusion_Error if MakeGroups=True,
# only SMESH::Extrusion_Error otherwise
# @ingroup l2_modif_extrurev
+ # @ref tui_extrusion_along_path example
def ExtrusionAlongPathObject2D(self, theObject, PathMesh, PathShape, NodeStart,
HasAngles=False, Angles=[], HasRefPoint=False, RefPoint=[],
MakeGroups=False, LinearVariation=False):
@@ -4187,7 +4338,7 @@ class Mesh:
if MakeGroups: return gr,er
return er
- ## Creates a symmetrical copy of mesh elements
+ ## Create a symmetrical copy of mesh elements
# @param IDsOfElements list of elements ids
# @param Mirror is AxisStruct or geom object(point, line, plane)
# @param theMirrorType smeshBuilder.POINT, smeshBuilder.AXIS or smeshBuilder.PLANE
@@ -4209,7 +4360,7 @@ class Mesh:
self.editor.Mirror(IDsOfElements, Mirror, theMirrorType, Copy)
return []
- ## Creates a new mesh by a symmetrical copy of mesh elements
+ ## Create a new mesh by a symmetrical copy of mesh elements
# @param IDsOfElements the list of elements ids
# @param Mirror is AxisStruct or geom object (point, line, plane)
# @param theMirrorType smeshBuilder.POINT, smeshBuilder.AXIS or smeshBuilder.PLANE
@@ -4230,7 +4381,7 @@ class Mesh:
MakeGroups, NewMeshName)
return Mesh(self.smeshpyD,self.geompyD,mesh)
- ## Creates a symmetrical copy of the object
+ ## Create a symmetrical copy of the object
# @param theObject mesh, submesh or group
# @param Mirror AxisStruct or geom object (point, line, plane)
# @param theMirrorType smeshBuilder.POINT, smeshBuilder.AXIS or smeshBuilder.PLANE
@@ -4252,7 +4403,7 @@ class Mesh:
self.editor.MirrorObject(theObject, Mirror, theMirrorType, Copy)
return []
- ## Creates a new mesh by a symmetrical copy of the object
+ ## Create a new mesh by a symmetrical copy of the object
# @param theObject mesh, submesh or group
# @param Mirror AxisStruct or geom object (point, line, plane)
# @param theMirrorType smeshBuilder.POINT, smeshBuilder.AXIS or smeshBuilder.PLANE
@@ -4273,7 +4424,7 @@ class Mesh:
MakeGroups, NewMeshName)
return Mesh( self.smeshpyD,self.geompyD,mesh )
- ## Translates the elements
+ ## Translate the elements
# @param IDsOfElements list of elements ids
# @param Vector the direction of translation (DirStruct or vector or 3 vector components)
# @param Copy allows copying the translated elements
@@ -4293,7 +4444,7 @@ class Mesh:
self.editor.Translate(IDsOfElements, Vector, Copy)
return []
- ## Creates a new mesh of translated elements
+ ## Create a new mesh of translated elements
# @param IDsOfElements list of elements ids
# @param Vector the direction of translation (DirStruct or vector or 3 vector components)
# @param MakeGroups forces the generation of new groups from existing ones
@@ -4311,7 +4462,7 @@ class Mesh:
mesh = self.editor.TranslateMakeMesh(IDsOfElements, Vector, MakeGroups, NewMeshName)
return Mesh ( self.smeshpyD, self.geompyD, mesh )
- ## Translates the object
+ ## Translate the object
# @param theObject the object to translate (mesh, submesh, or group)
# @param Vector direction of translation (DirStruct or geom vector or 3 vector components)
# @param Copy allows copying the translated elements
@@ -4331,7 +4482,7 @@ class Mesh:
self.editor.TranslateObject(theObject, Vector, Copy)
return []
- ## Creates a new mesh from the translated object
+ ## Create a new mesh from the translated object
# @param theObject the object to translate (mesh, submesh, or group)
# @param Vector the direction of translation (DirStruct or geom vector or 3 vector components)
# @param MakeGroups forces the generation of new groups from existing ones
@@ -4351,7 +4502,7 @@ class Mesh:
- ## Scales the object
+ ## Scale the object
# @param theObject - the object to translate (mesh, submesh, or group)
# @param thePoint - base point for scale (SMESH.PointStruct or list of 3 coordinates)
# @param theScaleFact - list of 1-3 scale factors for axises
@@ -4370,9 +4521,9 @@ class Mesh:
if ( isinstance( thePoint, list )):
thePoint = PointStruct( thePoint[0], thePoint[1], thePoint[2] )
if ( isinstance( theScaleFact, float )):
- theScaleFact = [theScaleFact]
+ theScaleFact = [theScaleFact]
if ( isinstance( theScaleFact, int )):
- theScaleFact = [ float(theScaleFact)]
+ theScaleFact = [ float(theScaleFact)]
self.mesh.SetParameters(thePoint.parameters)
@@ -4381,7 +4532,7 @@ class Mesh:
self.editor.Scale(theObject, thePoint, theScaleFact, Copy)
return []
- ## Creates a new mesh from the translated object
+ ## Create a new mesh from the translated object
# @param theObject - the object to translate (mesh, submesh, or group)
# @param thePoint - base point for scale (SMESH.PointStruct or list of 3 coordinates)
# @param theScaleFact - list of 1-3 scale factors for axises
@@ -4398,9 +4549,9 @@ class Mesh:
if ( isinstance( thePoint, list )):
thePoint = PointStruct( thePoint[0], thePoint[1], thePoint[2] )
if ( isinstance( theScaleFact, float )):
- theScaleFact = [theScaleFact]
+ theScaleFact = [theScaleFact]
if ( isinstance( theScaleFact, int )):
- theScaleFact = [ float(theScaleFact)]
+ theScaleFact = [ float(theScaleFact)]
self.mesh.SetParameters(thePoint.parameters)
mesh = self.editor.ScaleMakeMesh(theObject, thePoint, theScaleFact,
@@ -4409,7 +4560,7 @@ class Mesh:
- ## Rotates the elements
+ ## Rotate the elements
# @param IDsOfElements list of elements ids
# @param Axis the axis of rotation (AxisStruct or geom line)
# @param AngleInRadians the angle of rotation (in radians) or a name of variable which defines angle in degrees
@@ -4430,7 +4581,7 @@ class Mesh:
self.editor.Rotate(IDsOfElements, Axis, AngleInRadians, Copy)
return []
- ## Creates a new mesh of rotated elements
+ ## Create a new mesh of rotated elements
# @param IDsOfElements list of element ids
# @param Axis the axis of rotation (AxisStruct or geom line)
# @param AngleInRadians the angle of rotation (in radians) or a name of variable which defines angle in degrees
@@ -4450,7 +4601,7 @@ class Mesh:
MakeGroups, NewMeshName)
return Mesh( self.smeshpyD, self.geompyD, mesh )
- ## Rotates the object
+ ## Rotate the object
# @param theObject the object to rotate( mesh, submesh, or group)
# @param Axis the axis of rotation (AxisStruct or geom line)
# @param AngleInRadians the angle of rotation (in radians) or a name of variable which defines angle in degrees
@@ -4471,7 +4622,7 @@ class Mesh:
self.editor.RotateObject(theObject, Axis, AngleInRadians, Copy)
return []
- ## Creates a new mesh from the rotated object
+ ## Create a new mesh from the rotated object
# @param theObject the object to rotate (mesh, submesh, or group)
# @param Axis the axis of rotation (AxisStruct or geom line)
# @param AngleInRadians the angle of rotation (in radians) or a name of variable which defines angle in degrees
@@ -4491,7 +4642,7 @@ class Mesh:
self.mesh.SetParameters(Parameters)
return Mesh( self.smeshpyD, self.geompyD, mesh )
- ## Finds groups of adjacent nodes within Tolerance.
+ ## Find groups of adjacent nodes within Tolerance.
# @param Tolerance the value of tolerance
# @param SeparateCornerAndMediumNodes if @c True, in quadratic mesh puts
# corner and medium nodes in separate groups thus preventing
@@ -4501,7 +4652,7 @@ class Mesh:
def FindCoincidentNodes (self, Tolerance, SeparateCornerAndMediumNodes=False):
return self.editor.FindCoincidentNodes( Tolerance, SeparateCornerAndMediumNodes )
- ## Finds groups of ajacent nodes within Tolerance.
+ ## Find groups of ajacent nodes within Tolerance.
# @param Tolerance the value of tolerance
# @param SubMeshOrGroup SubMesh, Group or Filter
# @param exceptNodes list of either SubMeshes, Groups or node IDs to exclude from search
@@ -4523,19 +4674,21 @@ class Mesh:
return self.editor.FindCoincidentNodesOnPartBut(SubMeshOrGroup, Tolerance,
exceptNodes, SeparateCornerAndMediumNodes)
- ## Merges nodes
+ ## Merge nodes
# @param GroupsOfNodes a list of groups of nodes IDs for merging
# (e.g. [[1,12,13],[25,4]], then nodes 12, 13 and 4 will be removed and replaced
# by nodes 1 and 25 correspondingly in all elements and groups
# @param NodesToKeep nodes to keep in the mesh: a list of groups, sub-meshes or node IDs.
# If @a NodesToKeep does not include a node to keep for some group to merge,
# then the first node in the group is kept.
+ # @param AvoidMakingHoles prevent merging nodes which cause removal of elements becoming
+ # invalid
# @ingroup l2_modif_trsf
- def MergeNodes (self, GroupsOfNodes, NodesToKeep=[]):
+ def MergeNodes (self, GroupsOfNodes, NodesToKeep=[], AvoidMakingHoles=False):
# NodesToKeep are converted to SMESH_IDSource in meshEditor.MergeNodes()
- self.editor.MergeNodes(GroupsOfNodes,NodesToKeep)
+ self.editor.MergeNodes( GroupsOfNodes, NodesToKeep, AvoidMakingHoles )
- ## Finds the elements built on the same nodes.
+ ## Find the elements built on the same nodes.
# @param MeshOrSubMeshOrGroup Mesh or SubMesh, or Group of elements for searching
# @return the list of groups of equal elements IDs (e.g. [[1,12,13],[4,25]])
# @ingroup l2_modif_trsf
@@ -4546,7 +4699,7 @@ class Mesh:
MeshOrSubMeshOrGroup = MeshOrSubMeshOrGroup.GetMesh()
return self.editor.FindEqualElements( MeshOrSubMeshOrGroup )
- ## Merges elements in each given group.
+ ## Merge elements in each given group.
# @param GroupsOfElementsID a list of groups of elements IDs for merging
# (e.g. [[1,12,13],[25,4]], then elements 12, 13 and 4 will be removed and
# replaced by elements 1 and 25 in all groups)
@@ -4554,19 +4707,19 @@ class Mesh:
def MergeElements(self, GroupsOfElementsID):
self.editor.MergeElements(GroupsOfElementsID)
- ## Leaves one element and removes all other elements built on the same nodes.
+ ## Leave one element and remove all other elements built on the same nodes.
# @ingroup l2_modif_trsf
def MergeEqualElements(self):
self.editor.MergeEqualElements()
- ## Returns groups of FreeBorder's coincident within the given tolerance.
+ ## Return groups of FreeBorder's coincident within the given tolerance.
# @param tolerance the tolerance. If the tolerance <= 0.0 then one tenth of an average
# size of elements adjacent to free borders being compared is used.
# @return SMESH.CoincidentFreeBorders structure
# @ingroup l2_modif_trsf
def FindCoincidentFreeBorders (self, tolerance=0.):
return self.editor.FindCoincidentFreeBorders( tolerance )
-
+
## Sew FreeBorder's of each group
# @param freeBorders either a SMESH.CoincidentFreeBorders structure or a list of lists
# where each enclosed list contains node IDs of a group of coincident free
@@ -4592,7 +4745,7 @@ class Mesh:
coincidentGroups = []
for nodeList in freeBorders:
if not nodeList or len( nodeList ) % 3:
- raise ValueError, "Wrong number of nodes in this group: %s" % nodeList
+ raise ValueError("Wrong number of nodes in this group: %s" % nodeList)
group = []
while nodeList:
group.append ( SMESH.FreeBorderPart( len(borders), 0, 1, 2 ))
@@ -4605,7 +4758,7 @@ class Mesh:
return self.editor.SewCoincidentFreeBorders( freeBorders, createPolygons, createPolyhedra )
- ## Sews free borders
+ ## Sew free borders
# @return SMESH::Sew_Error
# @ingroup l2_modif_trsf
def SewFreeBorders (self, FirstNodeID1, SecondNodeID1, LastNodeID1,
@@ -4615,7 +4768,7 @@ class Mesh:
FirstNodeID2, SecondNodeID2, LastNodeID2,
CreatePolygons, CreatePolyedrs)
- ## Sews conform free borders
+ ## Sew conform free borders
# @return SMESH::Sew_Error
# @ingroup l2_modif_trsf
def SewConformFreeBorders (self, FirstNodeID1, SecondNodeID1, LastNodeID1,
@@ -4623,7 +4776,7 @@ class Mesh:
return self.editor.SewConformFreeBorders(FirstNodeID1, SecondNodeID1, LastNodeID1,
FirstNodeID2, SecondNodeID2)
- ## Sews border to side
+ ## Sew border to side
# @return SMESH::Sew_Error
# @ingroup l2_modif_trsf
def SewBorderToSide (self, FirstNodeIDOnFreeBorder, SecondNodeIDOnFreeBorder, LastNodeIDOnFreeBorder,
@@ -4631,7 +4784,7 @@ class Mesh:
return self.editor.SewBorderToSide(FirstNodeIDOnFreeBorder, SecondNodeIDOnFreeBorder, LastNodeIDOnFreeBorder,
FirstNodeIDOnSide, LastNodeIDOnSide, CreatePolygons, CreatePolyedrs)
- ## Sews two sides of a mesh. The nodes belonging to Side1 are
+ ## Sew two sides of a mesh. The nodes belonging to Side1 are
# merged with the nodes of elements of Side2.
# The number of elements in theSide1 and in theSide2 must be
# equal and they should have similar nodal connectivity.
@@ -4646,36 +4799,36 @@ class Mesh:
NodeID1OfSide1ToMerge, NodeID1OfSide2ToMerge,
NodeID2OfSide1ToMerge, NodeID2OfSide2ToMerge)
- ## Sets new nodes for the given element.
+ ## Set new nodes for the given element.
# @param ide the element id
# @param newIDs nodes ids
- # @return If the number of nodes does not correspond to the type of element - returns false
+ # @return If the number of nodes does not correspond to the type of element - return false
# @ingroup l2_modif_edit
def ChangeElemNodes(self, ide, newIDs):
return self.editor.ChangeElemNodes(ide, newIDs)
## If during the last operation of MeshEditor some nodes were
- # created, this method returns the list of their IDs, \n
- # if new nodes were not created - returns empty list
+ # created, this method return the list of their IDs, \n
+ # if new nodes were not created - return empty list
# @return the list of integer values (can be empty)
- # @ingroup l1_auxiliary
+ # @ingroup l2_modif_add
def GetLastCreatedNodes(self):
return self.editor.GetLastCreatedNodes()
## If during the last operation of MeshEditor some elements were
- # created this method returns the list of their IDs, \n
- # if new elements were not created - returns empty list
+ # created this method return the list of their IDs, \n
+ # if new elements were not created - return empty list
# @return the list of integer values (can be empty)
- # @ingroup l1_auxiliary
+ # @ingroup l2_modif_add
def GetLastCreatedElems(self):
return self.editor.GetLastCreatedElems()
- ## Clears sequences of nodes and elements created by mesh edition oparations
- # @ingroup l1_auxiliary
+ ## Forget what nodes and elements were created by the last mesh edition operation
+ # @ingroup l2_modif_add
def ClearLastCreated(self):
self.editor.ClearLastCreated()
- ## Creates duplicates of given elements, i.e. creates new elements based on the
+ ## Create duplicates of given elements, i.e. create new elements based on the
# same nodes as the given ones.
# @param theElements - container of elements to duplicate. It can be a Mesh,
# sub-mesh, group, filter or a list of element IDs. If \a theElements is
@@ -4683,10 +4836,10 @@ class Mesh:
# @param theGroupName - a name of group to contain the generated elements.
# If a group with such a name already exists, the new elements
# are added to the existng group, else a new group is created.
- # If \a theGroupName is empty, new elements are not added
+ # If \a theGroupName is empty, new elements are not added
# in any group.
# @return a group where the new elements are added. None if theGroupName == "".
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleElements(self, theElements, theGroupName=""):
unRegister = genObjUnRegister()
if isinstance( theElements, Mesh ):
@@ -4696,62 +4849,62 @@ class Mesh:
unRegister.set( theElements )
return self.editor.DoubleElements(theElements, theGroupName)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# @param theNodes identifiers of nodes to be doubled
# @param theModifiedElems identifiers of elements to be updated by the new (doubled)
# nodes. If list of element identifiers is empty then nodes are doubled but
# they not assigned to elements
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodes(self, theNodes, theModifiedElems):
return self.editor.DoubleNodes(theNodes, theModifiedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theNodeId identifiers of node to be doubled
# @param theModifiedElems identifiers of elements to be updated
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNode(self, theNodeId, theModifiedElems):
return self.editor.DoubleNode(theNodeId, theModifiedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theNodes group of nodes to be doubled
# @param theModifiedElems group of elements to be updated.
# @param theMakeGroup forces the generation of a group containing new nodes.
# @return TRUE or a created group if operation has been completed successfully,
# FALSE or None otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeGroup(self, theNodes, theModifiedElems, theMakeGroup=False):
if theMakeGroup:
return self.editor.DoubleNodeGroupNew(theNodes, theModifiedElems)
return self.editor.DoubleNodeGroup(theNodes, theModifiedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theNodes list of groups of nodes to be doubled
# @param theModifiedElems list of groups of elements to be updated.
# @param theMakeGroup forces the generation of a group containing new nodes.
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeGroups(self, theNodes, theModifiedElems, theMakeGroup=False):
if theMakeGroup:
return self.editor.DoubleNodeGroupsNew(theNodes, theModifiedElems)
return self.editor.DoubleNodeGroups(theNodes, theModifiedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# @param theElems - the list of elements (edges or faces) to be replicated
# The nodes for duplication could be found from these elements
# @param theNodesNot - list of nodes to NOT replicate
# @param theAffectedElems - the list of elements (cells and edges) to which the
# replicated nodes should be associated to.
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElem(self, theElems, theNodesNot, theAffectedElems):
return self.editor.DoubleNodeElem(theElems, theNodesNot, theAffectedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# @param theElems - the list of elements (edges or faces) to be replicated
# The nodes for duplication could be found from these elements
# @param theNodesNot - list of nodes to NOT replicate
@@ -4759,11 +4912,11 @@ class Mesh:
# located on or inside shape).
# The replicated nodes should be associated to affected elements.
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElemInRegion(self, theElems, theNodesNot, theShape):
return self.editor.DoubleNodeElemInRegion(theElems, theNodesNot, theShape)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theElems - group of of elements (edges or faces) to be replicated
# @param theNodesNot - group of nodes not to replicated
@@ -4773,7 +4926,7 @@ class Mesh:
# @param theMakeNodeGroup forces the generation of a group containing new nodes.
# @return TRUE or created groups (one or two) if operation has been completed successfully,
# FALSE or None otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElemGroup(self, theElems, theNodesNot, theAffectedElems,
theMakeGroup=False, theMakeNodeGroup=False):
if theMakeGroup or theMakeNodeGroup:
@@ -4786,18 +4939,18 @@ class Mesh:
return twoGroups[ int(theMakeNodeGroup) ]
return self.editor.DoubleNodeElemGroup(theElems, theNodesNot, theAffectedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theElems - group of of elements (edges or faces) to be replicated
# @param theNodesNot - group of nodes not to replicated
# @param theShape - shape to detect affected elements (element which geometric center
# located on or inside shape).
# The replicated nodes should be associated to affected elements.
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElemGroupInRegion(self, theElems, theNodesNot, theShape):
return self.editor.DoubleNodeElemGroupInRegion(theElems, theNodesNot, theShape)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theElems - list of groups of elements (edges or faces) to be replicated
# @param theNodesNot - list of groups of nodes not to replicated
@@ -4807,7 +4960,7 @@ class Mesh:
# @param theMakeNodeGroup forces the generation of a group containing new nodes.
# @return TRUE or created groups (one or two) if operation has been completed successfully,
# FALSE or None otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElemGroups(self, theElems, theNodesNot, theAffectedElems,
theMakeGroup=False, theMakeNodeGroup=False):
if theMakeGroup or theMakeNodeGroup:
@@ -4820,7 +4973,7 @@ class Mesh:
return twoGroups[ int(theMakeNodeGroup) ]
return self.editor.DoubleNodeElemGroups(theElems, theNodesNot, theAffectedElems)
- ## Creates a hole in a mesh by doubling the nodes of some particular elements
+ ## Create a hole in a mesh by doubling the nodes of some particular elements
# This method provided for convenience works as DoubleNodes() described above.
# @param theElems - list of groups of elements (edges or faces) to be replicated
# @param theNodesNot - list of groups of nodes not to replicated
@@ -4828,7 +4981,7 @@ class Mesh:
# located on or inside shape).
# The replicated nodes should be associated to affected elements.
# @return TRUE if operation has been completed successfully, FALSE otherwise
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def DoubleNodeElemGroupsInRegion(self, theElems, theNodesNot, theShape):
return self.editor.DoubleNodeElemGroupsInRegion(theElems, theNodesNot, theShape)
@@ -4840,52 +4993,55 @@ class Mesh:
# located on or inside shape).
# The replicated nodes should be associated to affected elements.
# @return groups of affected elements
- # @ingroup l2_modif_edit
+ # @ingroup l2_modif_duplicat
def AffectedElemGroupsInRegion(self, theElems, theNodesNot, theShape):
return self.editor.AffectedElemGroupsInRegion(theElems, theNodesNot, theShape)
## Double nodes on shared faces between groups of volumes and create flat elements on demand.
- # The list of groups must describe a partition of the mesh volumes.
- # The nodes of the internal faces at the boundaries of the groups are doubled.
- # In option, the internal faces are replaced by flat elements.
- # Triangles are transformed in prisms, and quadrangles in hexahedrons.
- # @param theDomains - list of groups of volumes
- # @param createJointElems - if TRUE, create the elements
- # @param onAllBoundaries - if TRUE, the nodes and elements are also created on
- # the boundary between \a theDomains and the rest mesh
- # @return TRUE if operation has been completed successfully, FALSE otherwise
+ # The list of groups must describe a partition of the mesh volumes.
+ # The nodes of the internal faces at the boundaries of the groups are doubled.
+ # In option, the internal faces are replaced by flat elements.
+ # Triangles are transformed in prisms, and quadrangles in hexahedrons.
+ # @param theDomains - list of groups of volumes
+ # @param createJointElems - if TRUE, create the elements
+ # @param onAllBoundaries - if TRUE, the nodes and elements are also created on
+ # the boundary between \a theDomains and the rest mesh
+ # @return TRUE if operation has been completed successfully, FALSE otherwise
+ # @ingroup l2_modif_duplicat
def DoubleNodesOnGroupBoundaries(self, theDomains, createJointElems, onAllBoundaries=False ):
- return self.editor.DoubleNodesOnGroupBoundaries( theDomains, createJointElems, onAllBoundaries )
+ return self.editor.DoubleNodesOnGroupBoundaries( theDomains, createJointElems, onAllBoundaries )
## Double nodes on some external faces and create flat elements.
- # Flat elements are mainly used by some types of mechanic calculations.
+ # Flat elements are mainly used by some types of mechanic calculations.
#
- # Each group of the list must be constituted of faces.
- # Triangles are transformed in prisms, and quadrangles in hexahedrons.
- # @param theGroupsOfFaces - list of groups of faces
- # @return TRUE if operation has been completed successfully, FALSE otherwise
+ # Each group of the list must be constituted of faces.
+ # Triangles are transformed in prisms, and quadrangles in hexahedrons.
+ # @param theGroupsOfFaces - list of groups of faces
+ # @return TRUE if operation has been completed successfully, FALSE otherwise
+ # @ingroup l2_modif_duplicat
def CreateFlatElementsOnFacesGroups(self, theGroupsOfFaces ):
return self.editor.CreateFlatElementsOnFacesGroups( theGroupsOfFaces )
-
+
## identify all the elements around a geom shape, get the faces delimiting the hole
#
def CreateHoleSkin(self, radius, theShape, groupName, theNodesCoords):
return self.editor.CreateHoleSkin( radius, theShape, groupName, theNodesCoords )
def _getFunctor(self, funcType ):
- fn = self.functors[ funcType._v ]
+ fn = self.functors[ EnumToLong(funcType) ]
if not fn:
fn = self.smeshpyD.GetFunctor(funcType)
fn.SetMesh(self.mesh)
- self.functors[ funcType._v ] = fn
+ self.functors[ EnumToLong(funcType) ] = fn
return fn
- ## Returns value of a functor for a given element
+ ## Return value of a functor for a given element
# @param funcType an item of SMESH.FunctorType enum
# Type "SMESH.FunctorType._items" in the Python Console to see all items.
# @param elemId element or node ID
# @param isElem @a elemId is ID of element or node
# @return the functor value or zero in case of invalid arguments
+ # @ingroup l1_measurements
def FunctorValue(self, funcType, elemId, isElem=True):
fn = self._getFunctor( funcType )
if fn.GetElementType() == self.GetElementType(elemId, isElem):
@@ -5008,48 +5164,69 @@ class Mesh:
pass # end of Mesh class
-## Class used to compensate change of CORBA API of SMESH_Mesh for backward compatibility
+## Private class used to compensate change of CORBA API of SMESH_Mesh for backward compatibility
# with old dump scripts which call SMESH_Mesh directly and not via smeshBuilder.Mesh
#
class meshProxy(SMESH._objref_SMESH_Mesh):
- def __init__(self):
- SMESH._objref_SMESH_Mesh.__init__(self)
+ def __init__(self, *args):
+ SMESH._objref_SMESH_Mesh.__init__(self, *args)
def __deepcopy__(self, memo=None):
- new = self.__class__()
+ new = self.__class__(self)
return new
def CreateDimGroup(self,*args): # 2 args added: nbCommonNodes, underlyingOnly
if len( args ) == 3:
args += SMESH.ALL_NODES, True
- return SMESH._objref_SMESH_Mesh.CreateDimGroup( self, *args )
+ return SMESH._objref_SMESH_Mesh.CreateDimGroup(self, *args)
+ def ExportToMEDX(self, *args): # function removed
+ print("WARNING: ExportToMEDX() is deprecated, use ExportMED() instead")
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]]
+ SMESH._objref_SMESH_Mesh.ExportMED(self, *args)
+ def ExportToMED(self, *args): # function removed
+ print("WARNING: ExportToMED() is deprecated, use ExportMED() instead")
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]]
+ while len(args) < 4: # !!!! nb of parameters for ExportToMED IDL's method
+ args.append(True)
+ SMESH._objref_SMESH_Mesh.ExportMED(self, *args)
+ def ExportPartToMED(self, *args): # 'version' parameter removed
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]]
+ SMESH._objref_SMESH_Mesh.ExportPartToMED(self, *args)
+ def ExportMED(self, *args): # signature of method changed
+ args = [i for i in args if i not in [SMESH.MED_V2_1, SMESH.MED_V2_2]]
+ while len(args) < 4: # !!!! nb of parameters for ExportToMED IDL's method
+ args.append(True)
+ SMESH._objref_SMESH_Mesh.ExportMED(self, *args)
pass
omniORB.registerObjref(SMESH._objref_SMESH_Mesh._NP_RepositoryId, meshProxy)
-## Class wrapping SMESH_SubMesh in order to add Compute()
+## Private class wrapping SMESH.SMESH_SubMesh in order to add Compute()
#
class submeshProxy(SMESH._objref_SMESH_subMesh):
- def __init__(self):
- SMESH._objref_SMESH_subMesh.__init__(self)
+ def __init__(self, *args):
+ SMESH._objref_SMESH_subMesh.__init__(self, *args)
self.mesh = None
def __deepcopy__(self, memo=None):
- new = self.__class__()
+ new = self.__class__(self)
return new
- ## Computes the sub-mesh and returns the status of the computation
+ ## Compute the sub-mesh and return the status of the computation
# @param refresh if @c True, Object browser is automatically updated (when running in GUI)
# @return True or False
- # @ingroup l2_construct
+ #
+ # This is a method of SMESH.SMESH_submesh that can be obtained via Mesh.GetSubMesh() or
+ # @ref smesh_algorithm.Mesh_Algorithm.GetSubMesh() "Mesh_Algorithm.GetSubMesh()".
+ # @ingroup l2_submeshes
def Compute(self,refresh=False):
if not self.mesh:
self.mesh = Mesh( smeshBuilder(), None, self.GetMesh())
ok = self.mesh.Compute( self.GetSubShape(),refresh=[] )
- if salome.sg.hasDesktop() and self.mesh.GetStudyId() >= 0:
+ if salome.sg.hasDesktop():
smeshgui = salome.ImportComponentGUI("SMESH")
- smeshgui.Init(self.mesh.GetStudyId())
+ smeshgui.Init()
smeshgui.SetMeshIcon( salome.ObjectToID( self ), ok, (self.GetNumberOfElements()==0) )
- if refresh: salome.sg.updateObjBrowser(True)
+ if refresh: salome.sg.updateObjBrowser()
pass
return ok
@@ -5057,12 +5234,13 @@ class submeshProxy(SMESH._objref_SMESH_subMesh):
omniORB.registerObjref(SMESH._objref_SMESH_subMesh._NP_RepositoryId, submeshProxy)
-## Class used to compensate change of CORBA API of SMESH_MeshEditor for backward compatibility
-# with old dump scripts which call SMESH_MeshEditor directly and not via smeshBuilder.Mesh
+## Private class used to compensate change of CORBA API of SMESH_MeshEditor for backward
+# compatibility with old dump scripts which call SMESH_MeshEditor directly and not via
+# smeshBuilder.Mesh
#
class meshEditor(SMESH._objref_SMESH_MeshEditor):
- def __init__(self):
- SMESH._objref_SMESH_MeshEditor.__init__(self)
+ def __init__(self, *args):
+ SMESH._objref_SMESH_MeshEditor.__init__(self, *args)
self.mesh = None
def __getattr__(self, name ): # method called if an attribute not found
if not self.mesh: # look for name() method in Mesh class
@@ -5071,10 +5249,10 @@ class meshEditor(SMESH._objref_SMESH_MeshEditor):
return getattr( self.mesh, name )
if name == "ExtrusionAlongPathObjX":
return getattr( self.mesh, "ExtrusionAlongPathX" ) # other method name
- print "meshEditor: attribute '%s' NOT FOUND" % name
+ print("meshEditor: attribute '%s' NOT FOUND" % name)
return None
def __deepcopy__(self, memo=None):
- new = self.__class__()
+ new = self.__class__(self)
return new
def FindCoincidentNodes(self,*args): # a 2nd arg added (SeparateCornerAndMediumNodes)
if len( args ) == 1: args += False,
@@ -5082,21 +5260,23 @@ class meshEditor(SMESH._objref_SMESH_MeshEditor):
def FindCoincidentNodesOnPart(self,*args): # a 3d arg added (SeparateCornerAndMediumNodes)
if len( args ) == 2: args += False,
return SMESH._objref_SMESH_MeshEditor.FindCoincidentNodesOnPart( self, *args )
- def MergeNodes(self,*args): # a 2nd arg added (NodesToKeep)
+ def MergeNodes(self,*args): # 2 args added (NodesToKeep,AvoidMakingHoles)
if len( args ) == 1:
- return SMESH._objref_SMESH_MeshEditor.MergeNodes( self, args[0], [] )
+ return SMESH._objref_SMESH_MeshEditor.MergeNodes( self, args[0], [], False )
NodesToKeep = args[1]
+ AvoidMakingHoles = args[2] if len( args ) == 3 else False
unRegister = genObjUnRegister()
if NodesToKeep:
if isinstance( NodesToKeep, list ) and isinstance( NodesToKeep[0], int ):
NodesToKeep = self.MakeIDSource( NodesToKeep, SMESH.NODE )
if not isinstance( NodesToKeep, list ):
NodesToKeep = [ NodesToKeep ]
- return SMESH._objref_SMESH_MeshEditor.MergeNodes( self, args[0], NodesToKeep )
+ return SMESH._objref_SMESH_MeshEditor.MergeNodes( self, args[0], NodesToKeep, AvoidMakingHoles )
pass
omniORB.registerObjref(SMESH._objref_SMESH_MeshEditor._NP_RepositoryId, meshEditor)
-## Helper class for wrapping of SMESH.SMESH_Pattern CORBA class
+## Private class wrapping SMESH.SMESH_Pattern CORBA class in order to treat Notebook
+# variables in some methods
#
class Pattern(SMESH._objref_SMESH_Pattern):
@@ -5130,43 +5310,68 @@ omniORB.registerObjref(SMESH._objref_SMESH_Pattern._NP_RepositoryId, Pattern)
## Private class used to bind methods creating algorithms to the class Mesh
#
class algoCreator:
- def __init__(self):
+ def __init__(self, method):
self.mesh = None
self.defaultAlgoType = ""
self.algoTypeToClass = {}
+ self.method = method
- # Stores a python class of algorithm
+ # Store a python class of algorithm
def add(self, algoClass):
- if type( algoClass ).__name__ == 'classobj' and \
- hasattr( algoClass, "algoType"):
+ if inspect.isclass(algoClass) and \
+ hasattr(algoClass, "algoType"):
self.algoTypeToClass[ algoClass.algoType ] = algoClass
if not self.defaultAlgoType and \
hasattr( algoClass, "isDefault") and algoClass.isDefault:
self.defaultAlgoType = algoClass.algoType
#print "Add",algoClass.algoType, "dflt",self.defaultAlgoType
- # creates a copy of self and assign mesh to the copy
+ # Create a copy of self and assign mesh to the copy
def copy(self, mesh):
- other = algoCreator()
+ other = algoCreator( self.method )
other.defaultAlgoType = self.defaultAlgoType
- other.algoTypeToClass = self.algoTypeToClass
+ other.algoTypeToClass = self.algoTypeToClass
other.mesh = mesh
return other
- # creates an instance of algorithm
+ # Create an instance of algorithm
def __call__(self,algo="",geom=0,*args):
- algoType = self.defaultAlgoType
- for arg in args + (algo,geom):
- if isinstance( arg, geomBuilder.GEOM._objref_GEOM_Object ):
- geom = arg
- if isinstance( arg, str ) and arg:
+ algoType = ""
+ shape = 0
+ if isinstance( algo, str ):
+ algoType = algo
+ elif ( isinstance( algo, geomBuilder.GEOM._objref_GEOM_Object ) and \
+ not isinstance( geom, geomBuilder.GEOM._objref_GEOM_Object )):
+ shape = algo
+ elif algo:
+ args += (algo,)
+
+ if isinstance( geom, geomBuilder.GEOM._objref_GEOM_Object ):
+ shape = geom
+ elif not algoType and isinstance( geom, str ):
+ algoType = geom
+ elif geom:
+ args += (geom,)
+ for arg in args:
+ if isinstance( arg, geomBuilder.GEOM._objref_GEOM_Object ) and not shape:
+ shape = arg
+ elif isinstance( arg, str ) and not algoType:
algoType = arg
+ else:
+ import traceback, sys
+ msg = "Warning. Unexpected argument in mesh.%s() ---> %s" % ( self.method, arg )
+ sys.stderr.write( msg + '\n' )
+ tb = traceback.extract_stack(None,2)
+ traceback.print_list( [tb[0]] )
+ if not algoType:
+ algoType = self.defaultAlgoType
if not algoType and self.algoTypeToClass:
- algoType = self.algoTypeToClass.keys()[0]
- if self.algoTypeToClass.has_key( algoType ):
+ algoType = list(self.algoTypeToClass.keys())[0]
+ if algoType in self.algoTypeToClass:
#print "Create algo",algoType
- return self.algoTypeToClass[ algoType ]( self.mesh, geom )
- raise RuntimeError, "No class found for algo type %s" % algoType
+
+ return self.algoTypeToClass[ algoType ]( self.mesh, shape )
+ raise RuntimeError( "No class found for algo type %s" % algoType)
return None
## Private class used to substitute and store variable parameters of hypotheses.
@@ -5191,16 +5396,16 @@ class hypMethodWrapper:
except omniORB.CORBA.BAD_PARAM: # raised by hypothesis method call
# maybe there is a replaced string arg which is not variable
result = self.method( self.hyp, *args )
- except ValueError, detail: # raised by ParseParameters()
+ except ValueError as detail: # raised by ParseParameters()
try:
result = self.method( self.hyp, *args )
except omniORB.CORBA.BAD_PARAM:
- raise ValueError, detail # wrong variable name
+ raise ValueError(detail) # wrong variable name
return result
pass
-## A helper class that call UnRegister() of SALOME.GenericObj'es stored in it
+## A helper class that calls UnRegister() of SALOME.GenericObj'es stored in it
#
class genObjUnRegister:
@@ -5231,9 +5436,9 @@ for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ):
pluginBuilderName = pluginName + "Builder"
try:
exec( "from salome.%s.%s import *" % (pluginName, pluginBuilderName))
- except Exception, e:
- from salome_utils import verbose
- if verbose(): print "Exception while loading %s: %s" % ( pluginBuilderName, e )
+ except Exception as e:
+ from salome_utils import verbose
+ if verbose(): print("Exception while loading %s: %s" % ( pluginBuilderName, e ))
continue
exec( "from salome.%s import %s" % (pluginName, pluginBuilderName))
plugin = eval( pluginBuilderName )
@@ -5244,10 +5449,10 @@ for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ):
if k[0] == '_': continue
algo = getattr( plugin, k )
#print " algo:", str(algo)
- if type( algo ).__name__ == 'classobj' and hasattr( algo, "meshMethod" ):
+ if inspect.isclass(algo) and hasattr(algo, "meshMethod"):
#print " meshMethod:" , str(algo.meshMethod)
if not hasattr( Mesh, algo.meshMethod ):
- setattr( Mesh, algo.meshMethod, algoCreator() )
+ setattr( Mesh, algo.meshMethod, algoCreator( algo.meshMethod ))
pass
getattr( Mesh, algo.meshMethod ).add( algo )
pass