ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021336: EDF 1717 SMESH: New algorithm "body fitting" cartesian unstructured

Browse Source 
1) catch SMESH_ComputeError thrown by algo->Compute()
2)
+  SMESH_Algo* GetAlgo() const;
This commit is contained in:
eap 2011-10-28 12:48:56 +00:00
parent 07f1cc8292
commit 41d7b89b3b
2 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/SMESH/SMESH_subMesh.cxx
View File

@ -174,6 +174,17 @@ SMESH_subMesh *SMESH_subMesh::GetFirstToCompute()
return 0; // nothing to compute return 0; // nothing to compute
} }
//================================================================================
/*!
* \brief Returns a current algorithm
*/
//================================================================================
SMESH_Algo* SMESH_subMesh::GetAlgo() const
{
return _father->GetGen()->GetAlgo(*_father, _subShape);
}
//================================================================================ //================================================================================
/*! /*!
* \brief Allow algo->Compute() if a subshape of lower dim is meshed but * \brief Allow algo->Compute() if a subshape of lower dim is meshed but
@ -586,7 +597,7 @@ SMESH_Hypothesis::Hypothesis_Status
SMESH_Hypothesis::Hypothesis_Status aux_ret, ret = SMESH_Hypothesis::HYP_OK; SMESH_Hypothesis::Hypothesis_Status aux_ret, ret = SMESH_Hypothesis::HYP_OK;
SMESHDS_Mesh* meshDS =_father->GetMeshDS(); SMESHDS_Mesh* meshDS =_father->GetMeshDS();
SMESH_Gen* gen =_father->GetGen(); //SMESH_Gen* gen =_father->GetGen();
SMESH_Algo* algo = 0; SMESH_Algo* algo = 0;
if (_subShape.ShapeType() == TopAbs_VERTEX ) if (_subShape.ShapeType() == TopAbs_VERTEX )
@ -603,7 +614,7 @@ SMESH_Hypothesis::Hypothesis_Status
if ( event != REMOVE_FATHER_ALGO ) if ( event != REMOVE_FATHER_ALGO )
{ {
_algoState = NO_ALGO; _algoState = NO_ALGO;
algo = gen->GetAlgo(*_father, _subShape); algo = GetAlgo();
if ( algo ) { if ( algo ) {
_algoState = MISSING_HYP; _algoState = MISSING_HYP;
if ( event == REMOVE_FATHER_HYP || if ( event == REMOVE_FATHER_HYP ||
@ -696,7 +707,7 @@ SMESH_Hypothesis::Hypothesis_Status
case ADD_HYP: case ADD_HYP:
break; break;
case ADD_ALGO: { case ADD_ALGO: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if (algo->CheckHypothesis((*_father),_subShape, aux_ret)) if (algo->CheckHypothesis((*_father),_subShape, aux_ret))
SetAlgoState(HYP_OK); SetAlgoState(HYP_OK);
@ -713,7 +724,7 @@ SMESH_Hypothesis::Hypothesis_Status
case ADD_FATHER_HYP: case ADD_FATHER_HYP:
break; break;
case ADD_FATHER_ALGO: { // Algo just added in father case ADD_FATHER_ALGO: { // Algo just added in father
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo == anHyp ) { if ( algo == anHyp ) {
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret)) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret))
@ -726,7 +737,7 @@ SMESH_Hypothesis::Hypothesis_Status
case REMOVE_FATHER_HYP: case REMOVE_FATHER_HYP:
break; break;
case REMOVE_FATHER_ALGO: { case REMOVE_FATHER_ALGO: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo) if (algo)
{ {
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))
@ -749,7 +760,7 @@ SMESH_Hypothesis::Hypothesis_Status
switch (event) switch (event)
{ {
case ADD_HYP: { case ADD_HYP: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, ret )) if ( algo->CheckHypothesis((*_father),_subShape, ret ))
SetAlgoState(HYP_OK); SetAlgoState(HYP_OK);
@ -763,7 +774,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case ADD_ALGO: { //already existing algo : on father ? case ADD_ALGO: { //already existing algo : on father ?
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))// ignore hyp status if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))// ignore hyp status
SetAlgoState(HYP_OK); SetAlgoState(HYP_OK);
@ -778,7 +789,7 @@ SMESH_Hypothesis::Hypothesis_Status
case REMOVE_HYP: case REMOVE_HYP:
break; break;
case REMOVE_ALGO: { // perhaps a father algo applies ? case REMOVE_ALGO: { // perhaps a father algo applies ?
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo == NULL) // no more algo applying on subShape... if (algo == NULL) // no more algo applying on subShape...
{ {
SetAlgoState(NO_ALGO); SetAlgoState(NO_ALGO);
@ -794,7 +805,7 @@ SMESH_Hypothesis::Hypothesis_Status
} }
case MODIF_HYP: // assigned hypothesis value may become good case MODIF_HYP: // assigned hypothesis value may become good
case ADD_FATHER_HYP: { case ADD_FATHER_HYP: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))
SetAlgoState(HYP_OK); SetAlgoState(HYP_OK);
@ -803,7 +814,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case ADD_FATHER_ALGO: { // new father algo case ADD_FATHER_ALGO: { // new father algo
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT( algo ); ASSERT( algo );
if ( algo == anHyp ) { if ( algo == anHyp ) {
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))
@ -816,7 +827,7 @@ SMESH_Hypothesis::Hypothesis_Status
case REMOVE_FATHER_HYP: // nothing to do case REMOVE_FATHER_HYP: // nothing to do
break; break;
case REMOVE_FATHER_ALGO: { case REMOVE_FATHER_ALGO: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo == NULL) // no more applying algo on father if (algo == NULL) // no more applying algo on father
{ {
SetAlgoState(NO_ALGO); SetAlgoState(NO_ALGO);
@ -842,7 +853,7 @@ SMESH_Hypothesis::Hypothesis_Status
switch (event) switch (event)
{ {
case ADD_HYP: { case ADD_HYP: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if (!algo->CheckHypothesis((*_father),_subShape, ret )) if (!algo->CheckHypothesis((*_father),_subShape, ret ))
{ {
@ -865,7 +876,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case ADD_ALGO: { //already existing algo : on father ? case ADD_ALGO: { //already existing algo : on father ?
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) { if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) {
// check if algo changes // check if algo changes
SMESH_HypoFilter f; SMESH_HypoFilter f;
@ -882,7 +893,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case REMOVE_HYP: { case REMOVE_HYP: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))
SetAlgoState(HYP_OK); SetAlgoState(HYP_OK);
@ -892,7 +903,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case REMOVE_ALGO: { // perhaps a father algo applies ? case REMOVE_ALGO: { // perhaps a father algo applies ?
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo == NULL) // no more algo applying on subShape... if (algo == NULL) // no more algo applying on subShape...
{ {
SetAlgoState(NO_ALGO); SetAlgoState(NO_ALGO);
@ -911,7 +922,7 @@ SMESH_Hypothesis::Hypothesis_Status
} }
case MODIF_HYP: // hypothesis value may become bad case MODIF_HYP: // hypothesis value may become bad
case ADD_FATHER_HYP: { // new father hypothesis ? case ADD_FATHER_HYP: { // new father hypothesis ?
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) if ( algo->CheckHypothesis((*_father),_subShape, aux_ret ))
{ {
@ -923,7 +934,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case ADD_FATHER_ALGO: { case ADD_FATHER_ALGO: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if ( algo == anHyp ) { // a new algo on father if ( algo == anHyp ) { // a new algo on father
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) { if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) {
// check if algo changes // check if algo changes
@ -942,7 +953,7 @@ SMESH_Hypothesis::Hypothesis_Status
break; break;
} }
case REMOVE_FATHER_HYP: { case REMOVE_FATHER_HYP: {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) { if ( algo->CheckHypothesis((*_father),_subShape, aux_ret )) {
// is there the same local hyp or maybe a new father algo applied? // is there the same local hyp or maybe a new father algo applied?
@ -960,7 +971,7 @@ SMESH_Hypothesis::Hypothesis_Status
if (!algo->NeedDescretBoundary()) if (!algo->NeedDescretBoundary())
needFullClean = true; needFullClean = true;
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo == NULL) // no more applying algo on father if (algo == NULL) // no more applying algo on father
{ {
SetAlgoState(NO_ALGO); SetAlgoState(NO_ALGO);
@ -1288,7 +1299,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
switch (event) switch (event)
{ {
case MODIF_ALGO_STATE: case MODIF_ALGO_STATE:
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo && !algo->NeedDescretBoundary()) if (algo && !algo->NeedDescretBoundary())
CleanDependsOn(); // clean sub-meshes with event CLEAN CleanDependsOn(); // clean sub-meshes with event CLEAN
if ( _algoState == HYP_OK ) if ( _algoState == HYP_OK )
@ -1328,7 +1339,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
{ {
case MODIF_ALGO_STATE: case MODIF_ALGO_STATE:
_computeState = NOT_READY; _computeState = NOT_READY;
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo) if (algo)
{ {
if (!algo->NeedDescretBoundary()) if (!algo->NeedDescretBoundary())
@ -1339,7 +1350,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
break; break;
case COMPUTE: case COMPUTE:
{ {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
ASSERT(algo); ASSERT(algo);
ret = algo->CheckHypothesis((*_father), _subShape, hyp_status); ret = algo->CheckHypothesis((*_father), _subShape, hyp_status);
if (!ret) if (!ret)
@ -1397,6 +1408,11 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
if ( !_computeError || ( !ret && _computeError->IsOK() ) ) // algo can set _computeError of submesh if ( !_computeError || ( !ret && _computeError->IsOK() ) ) // algo can set _computeError of submesh
_computeError = algo->GetComputeError(); _computeError = algo->GetComputeError();
} }
catch ( ::SMESH_ComputeError& comperr ) {
cout << " SMESH_ComputeError caught" << endl;
if ( !_computeError ) _computeError = SMESH_ComputeError::New();
*_computeError = comperr;
}
catch ( std::bad_alloc& exc ) { catch ( std::bad_alloc& exc ) {
MESSAGE("std::bad_alloc thrown inside algo->Compute()"); MESSAGE("std::bad_alloc thrown inside algo->Compute()");
if ( _computeError ) { if ( _computeError ) {
@ -1479,7 +1495,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
CleanDependants(); CleanDependants();
RemoveSubMeshElementsAndNodes(); RemoveSubMeshElementsAndNodes();
_computeState = NOT_READY; _computeState = NOT_READY;
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo) if (algo)
{ {
ret = algo->CheckHypothesis((*_father), _subShape, hyp_status); ret = algo->CheckHypothesis((*_father), _subShape, hyp_status);
@ -1496,7 +1512,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
// happen after retrieval from a file // happen after retrieval from a file
ComputeStateEngine( CHECK_COMPUTE_STATE ); ComputeStateEngine( CHECK_COMPUTE_STATE );
ComputeSubMeshStateEngine( SUBMESH_RESTORED ); ComputeSubMeshStateEngine( SUBMESH_RESTORED );
algo = gen->GetAlgo(*_father, _subShape); algo = GetAlgo();
if (algo) algo->SubmeshRestored( this ); if (algo) algo->SubmeshRestored( this );
break; break;
case MESH_ENTITY_REMOVED: case MESH_ENTITY_REMOVED:
@ -1518,7 +1534,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
{ {
case MODIF_ALGO_STATE: case MODIF_ALGO_STATE:
ComputeStateEngine( CLEAN ); ComputeStateEngine( CLEAN );
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo && !algo->NeedDescretBoundary()) if (algo && !algo->NeedDescretBoundary())
CleanDependsOn(); // clean sub-meshes with event CLEAN CleanDependsOn(); // clean sub-meshes with event CLEAN
break; break;
@ -1540,7 +1556,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
case SUBMESH_RESTORED: case SUBMESH_RESTORED:
ComputeStateEngine( CHECK_COMPUTE_STATE ); ComputeStateEngine( CHECK_COMPUTE_STATE );
ComputeSubMeshStateEngine( SUBMESH_RESTORED ); ComputeSubMeshStateEngine( SUBMESH_RESTORED );
algo = gen->GetAlgo(*_father, _subShape); algo = GetAlgo();
if (algo) algo->SubmeshRestored( this ); if (algo) algo->SubmeshRestored( this );
break; break;
case MESH_ENTITY_REMOVED: case MESH_ENTITY_REMOVED:
@ -1570,7 +1586,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
case MODIF_ALGO_STATE: case MODIF_ALGO_STATE:
if ( !IsEmpty() ) if ( !IsEmpty() )
ComputeStateEngine( CLEAN ); ComputeStateEngine( CLEAN );
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if (algo && !algo->NeedDescretBoundary()) if (algo && !algo->NeedDescretBoundary())
CleanDependsOn(); // clean sub-meshes with event CLEAN CleanDependsOn(); // clean sub-meshes with event CLEAN
if (_algoState == HYP_OK) if (_algoState == HYP_OK)
@ -1583,7 +1599,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
#ifdef WITH_SMESH_CANCEL_COMPUTE #ifdef WITH_SMESH_CANCEL_COMPUTE
case COMPUTE_CANCELED: case COMPUTE_CANCELED:
{ {
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
algo->CancelCompute(); algo->CancelCompute();
} }
break; break;
@ -1649,11 +1665,11 @@ bool SMESH_subMesh::Evaluate(MapShapeNbElems& aResMap)
return ret; return ret;
} }
SMESH_Gen *gen = _father->GetGen(); //SMESH_Gen *gen = _father->GetGen();
SMESH_Algo *algo = 0; SMESH_Algo *algo = 0;
SMESH_Hypothesis::Hypothesis_Status hyp_status; SMESH_Hypothesis::Hypothesis_Status hyp_status;
algo = gen->GetAlgo((*_father), _subShape); algo = GetAlgo();
if(algo && !aResMap.count(this) ) if(algo && !aResMap.count(this) )
{ {
ret = algo->CheckHypothesis((*_father), _subShape, hyp_status); ret = algo->CheckHypothesis((*_father), _subShape, hyp_status);

4
src/SMESH/SMESH_subMesh.hxx
View File

@ -20,11 +20,9 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : SMESH_subMesh.hxx // File : SMESH_subMesh.hxx
// Author : Paul RASCLE, EDF // Author : Paul RASCLE, EDF
// Module : SMESH // Module : SMESH
// $Header$
// //
#ifndef _SMESH_SUBMESH_HXX_ #ifndef _SMESH_SUBMESH_HXX_
#define _SMESH_SUBMESH_HXX_ #define _SMESH_SUBMESH_HXX_
@ -76,6 +74,8 @@ class SMESH_EXPORT SMESH_subMesh
SMESH_subMesh *GetFirstToCompute(); SMESH_subMesh *GetFirstToCompute();
SMESH_Algo* GetAlgo() const;
const std::map < int, SMESH_subMesh * >& DependsOn(); const std::map < int, SMESH_subMesh * >& DependsOn();
//const map < int, SMESH_subMesh * >&Dependants(); //const map < int, SMESH_subMesh * >&Dependants();
/*! /*!