ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 01:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

bos #30222 EDF 25368 - warning when computing

Browse Source
This commit is contained in:
eap 2022-07-13 19:40:43 +03:00
parent bdf698e60b
commit dad744364c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESH/SMESH_Mesh.cxx
View File

@ -705,7 +705,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
while ( smIt->more() ) { while ( smIt->more() ) {
SMESH_subMesh* sm = smIt->next(); SMESH_subMesh* sm = smIt->next();
if ( sm->IsApplicableHypothesis( anHyp )) { if ( sm->IsApplicableHypothesis( anHyp )) {
ret2 = sm->CheckConcurrentHypothesis( anHyp->GetType() ); ret2 = sm->CheckConcurrentHypothesis( anHyp );
if (ret2 > ret) { if (ret2 > ret) {
ret = ret2; ret = ret2;
break; break;
@ -753,7 +753,7 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
// there may appear concurrent hyps that were covered by the removed hyp // there may appear concurrent hyps that were covered by the removed hyp
if (ret < SMESH_Hypothesis::HYP_CONCURRENT && if (ret < SMESH_Hypothesis::HYP_CONCURRENT &&
subMesh->IsApplicableHypothesis( anHyp ) && subMesh->IsApplicableHypothesis( anHyp ) &&
subMesh->CheckConcurrentHypothesis( anHyp->GetType() ) != SMESH_Hypothesis::HYP_OK) subMesh->CheckConcurrentHypothesis( anHyp ) != SMESH_Hypothesis::HYP_OK)
ret = SMESH_Hypothesis::HYP_CONCURRENT; ret = SMESH_Hypothesis::HYP_CONCURRENT;
// sub-shapes // sub-shapes
@ -774,7 +774,7 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
while ( smIt->more() ) { while ( smIt->more() ) {
SMESH_subMesh* sm = smIt->next(); SMESH_subMesh* sm = smIt->next();
if ( sm->IsApplicableHypothesis( anHyp )) { if ( sm->IsApplicableHypothesis( anHyp )) {
ret2 = sm->CheckConcurrentHypothesis( anHyp->GetType() ); ret2 = sm->CheckConcurrentHypothesis( anHyp );
if (ret2 > ret) { if (ret2 > ret) {
ret = ret2; ret = ret2;
break; break;

6
src/SMESH/SMESH_subMesh.cxx
View File

@ -2247,10 +2247,10 @@ const SMESH_Hypothesis* SMESH_subMesh::getSimilarAttached(const TopoDS_Shape&
//======================================================================= //=======================================================================
SMESH_Hypothesis::Hypothesis_Status SMESH_Hypothesis::Hypothesis_Status
SMESH_subMesh::CheckConcurrentHypothesis (const int theHypType) SMESH_subMesh::CheckConcurrentHypothesis( SMESH_Hypothesis* theHypothesis)
{ {
// is there local hypothesis on me? // is there local hypothesis on me?
if ( getSimilarAttached( _subShape, 0, theHypType ) ) if ( getSimilarAttached( _subShape, theHypothesis ) )
return SMESH_Hypothesis::HYP_OK; return SMESH_Hypothesis::HYP_OK;
@ -2260,7 +2260,7 @@ SMESH_Hypothesis::Hypothesis_Status
for (; it.More(); it.Next()) for (; it.More(); it.Next())
{ {
const TopoDS_Shape& ancestor = it.Value(); const TopoDS_Shape& ancestor = it.Value();
const SMESH_Hypothesis* hyp = getSimilarAttached( ancestor, 0, theHypType ); const SMESH_Hypothesis* hyp = getSimilarAttached( ancestor, theHypothesis );
if ( hyp ) if ( hyp )
{ {
if ( aPrevWithHyp.IsNull() || aPrevWithHyp.IsSame( ancestor )) if ( aPrevWithHyp.IsNull() || aPrevWithHyp.IsSame( ancestor ))

2
src/SMESH/SMESH_subMesh.hxx
View File

@ -246,7 +246,7 @@ public:
// return true if theHypothesis can be used to mesh me: // return true if theHypothesis can be used to mesh me:
// its shape type is checked // its shape type is checked
SMESH_Hypothesis::Hypothesis_Status CheckConcurrentHypothesis (const int theHypType); SMESH_Hypothesis::Hypothesis_Status CheckConcurrentHypothesis (SMESH_Hypothesis* theHypothesis);
// check if there are several applicable hypothesis on fathers // check if there are several applicable hypothesis on fathers
/*! /*!