ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 08:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021845: EDF 1855 SMESH : A no-regression test fails on RadialQuadrangle meshing

Browse Source 
1) fix getAlgoData()
2) correct detection of concurrent algos in GetAlgo()
This commit is contained in:
eap 2012-09-11 09:24:28 +00:00
parent 8d6f13f41e
commit 68b41560cb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/SMESH/SMESH_Gen.cxx
View File

@ -1020,9 +1020,9 @@ namespace // Access to type of input and output of an algorithm
// Read Plugin.xml files // Read Plugin.xml files
vector< string > xmlPaths = SMESH_Gen::GetPluginXMLPaths(); vector< string > xmlPaths = SMESH_Gen::GetPluginXMLPaths();
LDOMParser xmlParser; LDOMParser xmlParser;
for ( size_t i = 0; i < xmlPaths.size(); ++i ) for ( size_t iXML = 0; iXML < xmlPaths.size(); ++iXML )
{ {
bool error = xmlParser.parse( xmlPaths[i].c_str() ); bool error = xmlParser.parse( xmlPaths[iXML].c_str() );
if ( error ) if ( error )
{ {
TCollection_AsciiString data; TCollection_AsciiString data;
@ -1044,6 +1044,7 @@ namespace // Access to type of input and output of an algorithm
TCollection_AsciiString input = algoElem.getAttribute("input"); TCollection_AsciiString input = algoElem.getAttribute("input");
TCollection_AsciiString output = algoElem.getAttribute("output"); TCollection_AsciiString output = algoElem.getAttribute("output");
TCollection_AsciiString dim = algoElem.getAttribute("dim"); TCollection_AsciiString dim = algoElem.getAttribute("dim");
if ( algoType.IsEmpty() ) continue;
AlgoData & data = theDataByName[ algoType.ToCString() ]; AlgoData & data = theDataByName[ algoType.ToCString() ];
data._dim = dim.IntegerValue(); data._dim = dim.IntegerValue();
for ( int isInput = 0; isInput < 2; ++isInput ) for ( int isInput = 0; isInput < 2; ++isInput )
@ -1106,9 +1107,11 @@ SMESH_Algo *SMESH_Gen::GetAlgo(SMESH_Mesh & aMesh,
TopoDS_Shape assignedToShape2; TopoDS_Shape assignedToShape2;
SMESH_Algo* algo2 = SMESH_Algo* algo2 =
(SMESH_Algo*) aMesh.GetHypothesis( aShape, filter, true, &assignedToShape2 ); (SMESH_Algo*) aMesh.GetHypothesis( aShape, filter, true, &assignedToShape2 );
if ( algo2 && if ( algo2 && // algo found
assignedToShape2.ShapeType() == assignedToShape.ShapeType() && !assignedToShape2.IsSame( aMesh.GetShapeToMesh() ) && // algo is local
aMesh.IsOrderOK( aMesh.GetSubMesh( assignedToShape2 ), ( SMESH_MesherHelper::GetGroupType( assignedToShape2 ) == // algo of the same level
SMESH_MesherHelper::GetGroupType( assignedToShape )) &&
aMesh.IsOrderOK( aMesh.GetSubMesh( assignedToShape2 ), // no forced order
aMesh.GetSubMesh( assignedToShape ))) aMesh.GetSubMesh( assignedToShape )))
{ {
// get algos on the adjacent SOLIDs // get algos on the adjacent SOLIDs