ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 12:40:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

52548: Set filter on standalone group of edges does't work

Browse Source 
2) Allow passing a geom group as faces arg of ViscousLayers()
3) Prevent crash of Adaptive hyp when only degenerated EDGEs leave not meshed
This commit is contained in:
eap 2014-10-23 12:21:14 +04:00
parent 5b6af39e27
commit 3ba242025d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SMESH_I/SMESH_Filter_i.cxx
View File

@ -3020,7 +3020,8 @@ CORBA::Boolean Filter_i::SetCriteria( const SMESH::Filter::Criteria& theCriteria
SMESH::Predicate_ptr aPrevPredicate = SMESH::Predicate::_nil(); SMESH::Predicate_ptr aPrevPredicate = SMESH::Predicate::_nil();
int aPrevBinary = SMESH::FT_Undefined; int aPrevBinary = SMESH::FT_Undefined;
aBinaries.back() = SMESH::FT_Undefined; if ( !aBinaries.empty() )
aBinaries.back() = SMESH::FT_Undefined;
for ( aPredIter = aPredicates.begin(), aBinaryIter = aBinaries.begin(); for ( aPredIter = aPredicates.begin(), aBinaryIter = aBinaries.begin();
aPredIter != aPredicates.end() && aBinaryIter != aBinaries.end(); aPredIter != aPredicates.end() && aBinaryIter != aBinaries.end();

9
src/SMESH_SWIG/smesh_algorithm.py
View File

@ -274,7 +274,14 @@ class Mesh_Algorithm:
if not "ViscousLayers" in self.GetCompatibleHypothesis(): if not "ViscousLayers" in self.GetCompatibleHypothesis():
raise TypeError, "ViscousLayers are not supported by %s"%self.algo.GetName() raise TypeError, "ViscousLayers are not supported by %s"%self.algo.GetName()
if faces and isinstance( faces[0], geomBuilder.GEOM._objref_GEOM_Object ): if faces and isinstance( faces[0], geomBuilder.GEOM._objref_GEOM_Object ):
faces = [ self.mesh.geompyD.GetSubShapeID(self.mesh.geom, f) for f in faces ] import GEOM
faceIDs = []
for f in faces:
if self.mesh.geompyD.ShapeIdToType( f.GetType() ) == "GROUP":
faceIDs += f.GetSubShapeIndices()
else:
faceIDs += [self.mesh.geompyD.GetSubShapeID(self.mesh.geom, f)]
faces = faceIDs
hyp = self.Hypothesis("ViscousLayers", hyp = self.Hypothesis("ViscousLayers",
[thickness, numberOfLayers, stretchFactor, faces, isFacesToIgnore], [thickness, numberOfLayers, stretchFactor, faces, isFacesToIgnore],
toAdd=False) toAdd=False)

1
src/StdMeshers/StdMeshers_Adaptive1D.cxx
View File

@ -1179,6 +1179,7 @@ bool AdaptiveAlgo::Compute(SMESH_Mesh & theMesh,
eData.AddPoint( eData.myPoints.end(), eData.myC3d.LastParameter() ); eData.AddPoint( eData.myPoints.end(), eData.myC3d.LastParameter() );
} }
} }
if ( myEdges.empty() ) return true;
if ( _computeCanceled ) return false; if ( _computeCanceled ) return false;
// Take into account size of already existing segments // Take into account size of already existing segments