ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-22 18:52:51 +05:00
Code Issues Packages Projects Releases Wiki Activity

IMP23369: [CEA 1513] compute a mesh using an already existing mesh with MG-CADSurf

Browse Source 
Enable computing a mesh w/o geom with 2 algos
This commit is contained in:
eap 2016-12-16 19:17:51 +03:00
parent d2c9aaf03a
commit cf7328b78f
8 changed files with 490 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/salome/gui/SMESH/input/about_meshes.doc
View File

@ -3,8 +3,7 @@
\page about_meshes_page About meshes
\n \b MESH represents a discrete approximation of a subset of the
three-dimensional space by \ref mesh_entities "elementary geometrical
elements".
three-dimensional space by \ref mesh_entities "elementary geometrical elements".
A SALOME study can contain multiple meshes, but they do not
implicitly compose one super-mesh, and finally each of them

5
src/SMESH/SMESH_Gen.cxx
View File

@ -148,6 +148,8 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh,
// one face only.
SMESH_subMesh::compute_event computeEvent =
aShapeOnly ? SMESH_subMesh::COMPUTE_SUBMESH : SMESH_subMesh::COMPUTE;
if ( !aMesh.HasShapeToMesh() )
computeEvent = SMESH_subMesh::COMPUTE_NOGEOM; // if several algos and no geometry
if ( anUpward ) // is called from the below code in this method
{
@ -1058,7 +1060,8 @@ SMESH_Algo *SMESH_Gen::GetAlgo(SMESH_subMesh * aSubMesh,
SMESH_Mesh& aMesh = *aSubMesh->GetFather();
SMESH_HypoFilter filter( SMESH_HypoFilter::IsAlgo() );
filter.And( filter.IsApplicableTo( aShape ));
if ( aMesh.HasShapeToMesh() )
filter.And( filter.IsApplicableTo( aShape ));
typedef SMESH_Algo::Features AlgoData;

64
src/SMESH/SMESH_subMesh.cxx
View File

@ -63,6 +63,11 @@
using namespace std;
#ifdef _DEBUG_
// enable printing algo + shape id + hypo used while meshing
//#define PRINT_WHO_COMPUTE_WHAT
#endif
//=============================================================================
/*!
* \brief Allocate some memory at construction and release it at destruction.
@ -510,7 +515,20 @@ bool SMESH_subMesh::CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) cons
//=======================================================================
//function : IsApplicableHypotesis
//purpose :
//purpose : check if this sub-mesh can be computed using a hypothesis
//=======================================================================
bool SMESH_subMesh::IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis) const
{
if ( !_father->HasShapeToMesh() && _subShape.ShapeType() == TopAbs_SOLID )
return true; // true for the PseudoShape
return IsApplicableHypotesis( theHypothesis, _subShape.ShapeType() );
}
//=======================================================================
//function : IsApplicableHypotesis
//purpose : compare shape type and hypothesis type
//=======================================================================
bool SMESH_subMesh::IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis,
@ -1436,6 +1454,31 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event)
_computeState = READY_TO_COMPUTE;
}
break;
case COMPUTE_NOGEOM: // no geometry; can be several algos
if ( !_father->HasShapeToMesh() )
{
algo = GetAlgo(); // current algo
if ( algo )
{
// apply algos in the order of increasing dimension
std::list< const SMESHDS_Hypothesis * > algos = _father->GetHypothesisList( _subShape );
for ( int t = SMESHDS_Hypothesis::ALGO_1D; t <= SMESHDS_Hypothesis::ALGO_3D; ++t )
{
std::list<const SMESHDS_Hypothesis *>::iterator al = algos.begin();
for ( ; al != algos.end(); ++al )
if ( (*al)->GetType() == t )
{
_algo = (SMESH_Algo*) *al;
_computeState = READY_TO_COMPUTE;
if ( !ComputeStateEngine( COMPUTE ))
break;
}
}
_algo = algo; // restore
}
break;
}
case COMPUTE:
case COMPUTE_SUBMESH:
{
@ -1575,6 +1618,23 @@ bool SMESH_subMesh::ComputeStateEngine(compute_event event)
!algo->isDegenerated( TopoDS::Edge( subS.Current() ))))
ret = false;
}
#ifdef PRINT_WHO_COMPUTE_WHAT
for (subS.ReInit(); subS.More(); subS.Next())
{
const std::list <const SMESHDS_Hypothesis *> & hyps =
_algo->GetUsedHypothesis( *_father, _subShape );
SMESH_Comment hypStr;
if ( !hyps.empty() )
{
hypStr << hyps.front()->GetName() << " ";
((SMESHDS_Hypothesis*)hyps.front())->SaveTo( hypStr.Stream() );
hypStr << " ";
}
cout << _algo->GetName()
<< " " << _father->GetSubMesh( subS.Current() )->GetId()
<< " " << hypStr << endl;
}
#endif
// Set _computeError
if ( !ret && !isComputeErrorSet )
{
@ -2157,8 +2217,6 @@ const SMESH_Hypothesis* SMESH_subMesh::getSimilarAttached(const TopoDS_Shape&
SMESH_Hypothesis::Hypothesis_Status
SMESH_subMesh::CheckConcurentHypothesis (const int theHypType)
{
MESSAGE ("SMESH_subMesh::CheckConcurentHypothesis");
// is there local hypothesis on me?
if ( getSimilarAttached( _subShape, 0, theHypType ) )
return SMESH_Hypothesis::HYP_OK;

5
src/SMESH/SMESH_subMesh.hxx
View File

@ -112,7 +112,7 @@ class SMESH_EXPORT SMESH_subMesh
};
enum compute_event
{
MODIF_ALGO_STATE, COMPUTE, COMPUTE_SUBMESH, COMPUTE_CANCELED,
MODIF_ALGO_STATE, COMPUTE, COMPUTE_SUBMESH, COMPUTE_NOGEOM, COMPUTE_CANCELED,
CLEAN, SUBMESH_COMPUTED, SUBMESH_RESTORED, SUBMESH_LOADED,
MESH_ENTITY_REMOVED, CHECK_COMPUTE_STATE
};
@ -241,8 +241,7 @@ public:
static bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis,
const TopAbs_ShapeEnum theShapeType);
bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis) const
{ return IsApplicableHypotesis( theHypothesis, _subShape.ShapeType() ); }
bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis) const;
// return true if theHypothesis can be used to mesh me:
// its shape type is checked

36
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -709,15 +709,14 @@ void SMESHGUI_MeshOp::selectionDone()
}
}
else { // no geometry defined
myDlg->enableTab( SMESH::DIM_3D );
QStringList hypList;
availableHyps( SMESH::DIM_3D, Algo, hypList,
myAvailableHypData[SMESH::DIM_3D][Algo]);
SMESHGUI_MeshTab* aTab = myDlg->tab( SMESH::DIM_3D );
aTab->setAvailableHyps( Algo, hypList );
for (int i = SMESH::DIM_0D;i < SMESH::DIM_3D; ++i) {
myDlg->disableTab(i);
QStringList hypList;
for ( int dim = SMESH::DIM_0D; dim <= SMESH::DIM_3D; dim++ )
{
availableHyps( dim, Algo, hypList, myAvailableHypData[dim][Algo]);
myDlg->tab( dim )->setAvailableHyps( Algo, hypList );
if ( hypList.empty() ) myDlg->disableTab( dim );
else myDlg->enableTab( dim );
}
myMaxShapeDim = -1;
//Hide labels and fields (Mesh and Geometry)
@ -1505,7 +1504,8 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
if ( myIgnoreAlgoSelection )
return;
int aDim = theDim < 0 ? getTabDim( sender(), myDlg ): theDim;
int curDim = getTabDim( sender(), myDlg );
int aDim = theDim < 0 ? curDim : theDim;
if (aDim == -1)
return;
@ -1587,7 +1587,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
myDlg->tab( dim )->setAvailableHyps( Algo, anAvailable );
noCompatible = anAvailable.isEmpty();
algoIndex = myAvailableHypData[dim][Algo].indexOf( curAlgo );
if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim != SMESH::DIM_0D) {
if ( !isSubmesh && algoIndex < 0 && soleCompatible && !forward && dim == curDim ) {
// select the sole compatible algo
algoIndex = 0;
}
@ -1682,7 +1682,8 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex,
hypIndex = this->find( curHyp, myExistingHyps[ dim ][ type ]);
else
hypIndex = -1;
if ( !isSubmesh && myToCreate && hypIndex < 0 && anExisting.count() == 1 ) {
if ( !isSubmesh && myToCreate && hypIndex < 0 && anExisting.count() == 1 && dim == curDim )
{
// none is yet selected => select the sole existing if it is not optional
CORBA::String_var hypTypeName = myExistingHyps[ dim ][ type ].first().first->GetName();
bool isOptional = true;
@ -2184,7 +2185,7 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim )
{
// Call hypothesis creation server method (without GUI)
SMESH::SMESH_Hypothesis_var aHyp =
SMESH::CreateHypothesis(aHypName, aHypName, true);
SMESH::CreateHypothesis(aHypName, aHypData->Label, true);
aHyp.out();
}
else
@ -2197,7 +2198,7 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim )
aCreator->create( true, aHypName, myDlg, 0, QString::null );
else {
SMESH::SMESH_Hypothesis_var aHyp =
SMESH::CreateHypothesis(aHypName, aHypName, true);
SMESH::CreateHypothesis(aHypName, aHypData->Label, true);
aHyp.out();
}
delete aCreator;
@ -2260,7 +2261,7 @@ void SMESHGUI_MeshOp::readMesh()
// Get hypotheses and algorithms assigned to the mesh/sub-mesh
QStringList anExisting;
const int lastDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_3D;
const int lastDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_2D;
bool algoFound = false;
for ( int dim = SMESH::DIM_3D; dim >= lastDim; --dim )
{
@ -2407,7 +2408,7 @@ bool SMESHGUI_MeshOp::editMeshOrSubMesh( QString& theMess )
// Set new name
QString aName = myDlg->objectText( SMESHGUI_MeshDlg::Obj );
SMESH::SetName( pObj, aName );
int aDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_3D;
int aDim = ( myIsOnGeometry ) ? SMESH::DIM_0D : SMESH::DIM_2D;
// First, remove old algos in order to avoid messages on algorithm hiding
for ( int dim = aDim; dim <= SMESH::DIM_3D; dim++ )
@ -2743,8 +2744,9 @@ void SMESHGUI_MeshOp::setFilteredAlgoData( const int theTabIndex, const int theI
}
if ( !myIsOnGeometry )
for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) {
if ( i < SMESH::DIM_3D ) myDlg->disableTab( i );
else myDlg->enableTab( i );
bool disable = myAvailableHypData[i][Algo].isEmpty();
if ( disable ) myDlg->disableTab( i );
else myDlg->enableTab( i );
}
else
for ( int i = SMESH::DIM_0D; i <= SMESH::DIM_3D; i++ ) {

2
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -322,7 +322,7 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy,
{
// define the next tag after given one in the data tree to insert SObject
SALOMEDS::SObject_wrap curObj, objAfter;
if ( theFatherObject->GetLastChildTag() > theTag )
if ( theFatherObject->GetLastChildTag() > theTag && theTag > 0 )
{
SALOMEDS::UseCaseIterator_wrap
anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject);

753
src/SMESH_SWIG/smeshBuilder.py
View File

File diff suppressed because it is too large Load Diff

7
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -95,7 +95,7 @@
#include <string>
#ifdef _DEBUG_
//#define __myDEBUG
#define __myDEBUG
//#define __NOT_INVALIDATE_BAD_SMOOTH
//#define __NODES_AT_POS
#endif
@ -7546,7 +7546,7 @@ bool _LayerEdge::SegTriaInter( const gp_Ax1& lastSegment,
const gp_Dir& dir = lastSegment.Direction();
/* calculate distance from vert0 to ray origin */
gp_XYZ tvec = orig.XYZ() - vert0;
//gp_XYZ tvec = orig.XYZ() - vert0;
//if ( tvec * dir > EPSILON )
// intersected face is at back side of the temporary face this _LayerEdge belongs to
@ -7565,6 +7565,9 @@ bool _LayerEdge::SegTriaInter( const gp_Ax1& lastSegment,
if ( det > -ANGL_EPSILON && det < ANGL_EPSILON )
return false;
/* calculate distance from vert0 to ray origin */
gp_XYZ tvec = orig.XYZ() - vert0;
/* calculate U parameter and test bounds */
double u = ( tvec * pvec ) / det;
//if (u < 0.0 || u > 1.0)