mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-26 01:10:35 +05:00
Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh
This commit is contained in:
commit
8385b9256f
@ -39,11 +39,12 @@
|
|||||||
#include "SMESH_MesherHelper.hxx"
|
#include "SMESH_MesherHelper.hxx"
|
||||||
#include "SMESH_subMesh.hxx"
|
#include "SMESH_subMesh.hxx"
|
||||||
|
|
||||||
#include "utilities.h"
|
#include <utilities.h>
|
||||||
#include "Utils_ExceptHandlers.hxx"
|
#include <Utils_ExceptHandlers.hxx>
|
||||||
|
|
||||||
#include <TopoDS_Iterator.hxx>
|
#include <TopExp_Explorer.hxx>
|
||||||
#include <TopoDS.hxx>
|
#include <TopoDS.hxx>
|
||||||
|
#include <TopoDS_Iterator.hxx>
|
||||||
|
|
||||||
#include "memoire.h"
|
#include "memoire.h"
|
||||||
|
|
||||||
@ -247,7 +248,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
|||||||
// ================================================================
|
// ================================================================
|
||||||
// Apply algos that do NOT require discreteized boundaries
|
// Apply algos that do NOT require discreteized boundaries
|
||||||
// ("all-dimensional") and do NOT support sub-meshes, starting from
|
// ("all-dimensional") and do NOT support sub-meshes, starting from
|
||||||
// the most complex shapes and collect sub-meshes with algos that
|
// the most complex shapes and collect sub-meshes with algos that
|
||||||
// DO support sub-meshes
|
// DO support sub-meshes
|
||||||
// ================================================================
|
// ================================================================
|
||||||
|
|
||||||
@ -272,7 +273,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
|||||||
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
|
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
|
||||||
aShapeDim = GetShapeDim( aSubShape );
|
aShapeDim = GetShapeDim( aSubShape );
|
||||||
if ( aShapeDim < 1 ) break;
|
if ( aShapeDim < 1 ) break;
|
||||||
|
|
||||||
// check for preview dimension limitations
|
// check for preview dimension limitations
|
||||||
if ( aShapesId && aShapeDim > (int)aDim )
|
if ( aShapesId && aShapeDim > (int)aDim )
|
||||||
continue;
|
continue;
|
||||||
@ -340,6 +341,36 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
|||||||
smVec.insert( smVec.end(),
|
smVec.insert( smVec.end(),
|
||||||
smWithAlgoSupportingSubmeshes[aShapeDim].begin(),
|
smWithAlgoSupportingSubmeshes[aShapeDim].begin(),
|
||||||
smWithAlgoSupportingSubmeshes[aShapeDim].end() );
|
smWithAlgoSupportingSubmeshes[aShapeDim].end() );
|
||||||
|
|
||||||
|
// gather sub-shapes with local uni-dimensional algos (bos #29143)
|
||||||
|
// ----------------------------------------------------------------
|
||||||
|
TopTools_MapOfShape uniDimAlgoShapes;
|
||||||
|
if ( !smVec.empty() )
|
||||||
|
{
|
||||||
|
ShapeToHypothesis::Iterator s2hyps( aMesh.GetMeshDS()->GetHypotheses() );
|
||||||
|
for ( ; s2hyps.More(); s2hyps.Next() )
|
||||||
|
{
|
||||||
|
const TopoDS_Shape& s = s2hyps.Key();
|
||||||
|
if ( s.IsSame( aMesh.GetShapeToMesh() ))
|
||||||
|
continue;
|
||||||
|
for ( auto & hyp : s2hyps.Value() )
|
||||||
|
{
|
||||||
|
if ( const SMESH_Algo* algo = dynamic_cast< const SMESH_Algo*>( hyp ))
|
||||||
|
if ( algo->NeedDiscreteBoundary() )
|
||||||
|
{
|
||||||
|
TopAbs_ShapeEnum sType;
|
||||||
|
switch ( algo->GetDim() ) {
|
||||||
|
case 3: sType = TopAbs_SOLID; break;
|
||||||
|
case 2: sType = TopAbs_FACE; break;
|
||||||
|
default: sType = TopAbs_EDGE; break;
|
||||||
|
}
|
||||||
|
for ( TopExp_Explorer ex( s2hyps.Key(), sType ); ex.More(); ex.Next() )
|
||||||
|
uniDimAlgoShapes.Add( ex.Current() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
// ------------------------------------------------
|
// ------------------------------------------------
|
||||||
// sort list of sub-meshes according to mesh order
|
// sort list of sub-meshes according to mesh order
|
||||||
@ -359,45 +390,50 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
|
|||||||
|
|
||||||
const TopAbs_ShapeEnum shapeType = sm->GetSubShape().ShapeType();
|
const TopAbs_ShapeEnum shapeType = sm->GetSubShape().ShapeType();
|
||||||
|
|
||||||
// get a shape the algo is assigned to
|
if ( !uniDimAlgoShapes.IsEmpty() )
|
||||||
if ( !GetAlgo( sm, & algoShape ))
|
|
||||||
continue; // strange...
|
|
||||||
|
|
||||||
// look for more local algos
|
|
||||||
if ( SMESH_subMesh* algoSM = aMesh.GetSubMesh( algoShape ))
|
|
||||||
smIt = algoSM->getDependsOnIterator(!includeSelf, !complexShapeFirst);
|
|
||||||
else
|
|
||||||
smIt = sm->getDependsOnIterator(!includeSelf, !complexShapeFirst);
|
|
||||||
|
|
||||||
while ( smIt->more() )
|
|
||||||
{
|
{
|
||||||
SMESH_subMesh* smToCompute = smIt->next();
|
// get a shape the algo is assigned to
|
||||||
|
if ( !GetAlgo( sm, & algoShape ))
|
||||||
|
continue; // strange...
|
||||||
|
|
||||||
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
|
// look for more local algos
|
||||||
const int aShapeDim = GetShapeDim( aSubShape );
|
if ( SMESH_subMesh* algoSM = aMesh.GetSubMesh( algoShape ))
|
||||||
if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType )
|
smIt = algoSM->getDependsOnIterator(!includeSelf, !complexShapeFirst);
|
||||||
continue;
|
else
|
||||||
|
smIt = sm->getDependsOnIterator(!includeSelf, !complexShapeFirst);
|
||||||
|
|
||||||
// check for preview dimension limitations
|
while ( smIt->more() )
|
||||||
if ( aShapesId && GetShapeDim( aSubShape.ShapeType() ) > (int)aDim )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() );
|
|
||||||
filter
|
|
||||||
.And( SMESH_HypoFilter::IsApplicableTo( aSubShape ))
|
|
||||||
.And( SMESH_HypoFilter::IsMoreLocalThan( algoShape, aMesh ));
|
|
||||||
|
|
||||||
if ( SMESH_Algo* subAlgo = (SMESH_Algo*) aMesh.GetHypothesis( smToCompute, filter, true))
|
|
||||||
{
|
{
|
||||||
if ( ! subAlgo->NeedDiscreteBoundary() ) continue;
|
SMESH_subMesh* smToCompute = smIt->next();
|
||||||
TopTools_IndexedMapOfShape* localAllowed = allowedSubShapes;
|
|
||||||
if ( localAllowed && localAllowed->IsEmpty() )
|
|
||||||
localAllowed = 0; // prevent fillAllowed() with aSubShape
|
|
||||||
|
|
||||||
SMESH_Hypothesis::Hypothesis_Status status;
|
const TopoDS_Shape& aSubShape = smToCompute->GetSubShape();
|
||||||
if ( subAlgo->CheckHypothesis( aMesh, aSubShape, status ))
|
const int aShapeDim = GetShapeDim( aSubShape );
|
||||||
// mesh a lower smToCompute starting from vertices
|
if ( aShapeDim < 1 || aSubShape.ShapeType() <= shapeType )
|
||||||
Compute( aMesh, aSubShape, aFlags | SHAPE_ONLY_UPWARD, aDim, aShapesId, localAllowed );
|
continue;
|
||||||
|
if ( !uniDimAlgoShapes.Contains( aSubShape ))
|
||||||
|
continue; // [bos #29143] aMesh.GetHypothesis() is too long
|
||||||
|
|
||||||
|
// check for preview dimension limitations
|
||||||
|
if ( aShapesId && GetShapeDim( aSubShape.ShapeType() ) > (int)aDim )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() );
|
||||||
|
filter
|
||||||
|
.And( SMESH_HypoFilter::IsApplicableTo( aSubShape ))
|
||||||
|
.And( SMESH_HypoFilter::IsMoreLocalThan( algoShape, aMesh ));
|
||||||
|
|
||||||
|
if ( SMESH_Algo* subAlgo = (SMESH_Algo*) aMesh.GetHypothesis( smToCompute, filter, true))
|
||||||
|
{
|
||||||
|
if ( ! subAlgo->NeedDiscreteBoundary() ) continue;
|
||||||
|
TopTools_IndexedMapOfShape* localAllowed = allowedSubShapes;
|
||||||
|
if ( localAllowed && localAllowed->IsEmpty() )
|
||||||
|
localAllowed = 0; // prevent fillAllowed() with aSubShape
|
||||||
|
|
||||||
|
SMESH_Hypothesis::Hypothesis_Status status;
|
||||||
|
if ( subAlgo->CheckHypothesis( aMesh, aSubShape, status ))
|
||||||
|
// mesh a lower smToCompute starting from vertices
|
||||||
|
Compute( aMesh, aSubShape, aFlags | SHAPE_ONLY_UPWARD, aDim, aShapesId, localAllowed );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// --------------------------------
|
// --------------------------------
|
||||||
@ -1222,6 +1258,26 @@ int SMESH_Gen::GetShapeDim(const TopAbs_ShapeEnum & aShapeType)
|
|||||||
return dim[ aShapeType ];
|
return dim[ aShapeType ];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//================================================================================
|
||||||
|
/*!
|
||||||
|
* \brief Return shape dimension by exploding compounds
|
||||||
|
*/
|
||||||
|
//================================================================================
|
||||||
|
|
||||||
|
int SMESH_Gen::GetFlatShapeDim(const TopoDS_Shape &aShape)
|
||||||
|
{
|
||||||
|
int aShapeDim;
|
||||||
|
if ( aShape.ShapeType() == TopAbs_COMPOUND ||
|
||||||
|
aShape.ShapeType() == TopAbs_COMPSOLID )
|
||||||
|
{
|
||||||
|
TopoDS_Iterator it( aShape );
|
||||||
|
aShapeDim = GetFlatShapeDim( it.Value() );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
aShapeDim = GetShapeDim( aShape );
|
||||||
|
return aShapeDim;
|
||||||
|
}
|
||||||
|
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
/*!
|
/*!
|
||||||
* Generate a new id unique within this Gen
|
* Generate a new id unique within this Gen
|
||||||
|
@ -154,6 +154,7 @@ public:
|
|||||||
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
|
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
|
||||||
static int GetShapeDim(const TopoDS_Shape & aShape)
|
static int GetShapeDim(const TopoDS_Shape & aShape)
|
||||||
{ return GetShapeDim( aShape.ShapeType() ); }
|
{ return GetShapeDim( aShape.ShapeType() ); }
|
||||||
|
static int GetFlatShapeDim(const TopoDS_Shape &aShape);
|
||||||
|
|
||||||
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
|
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
|
||||||
SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0);
|
SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0);
|
||||||
|
@ -237,6 +237,6 @@ private:
|
|||||||
int _MessInfo;
|
int _MessInfo;
|
||||||
};
|
};
|
||||||
|
|
||||||
}; // namespace SMESHHOMARDImpl
|
} // namespace SMESHHOMARDImpl
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user