From b0fed15261faf1f5525494de5b7f92775cb7b80d Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 15 Apr 2013 10:48:46 +0000 Subject: [PATCH] Regression of already fixed 0021406: EDF 1975 NETGENPLUGIN: Submesh hypothesis not taken into account Correct the patch for 0021556: EDF 2222 SMESH: 3D mesh after projection impossible - smWithAlgoSupportingSubmeshes[0].push_back( shDim2smIt->second ); + smWithAlgoSupportingSubmeshes[3].push_back( shDim2smIt->second ); --- src/SMESH/SMESH_Gen.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index cc7d38707..c5acd7f67 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -204,7 +204,9 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, list< SMESH_subMesh* > smWithAlgoSupportingSubmeshes[4]; // for each dim // map to sort sm with same dim algos according to dim of - // the shape the algo assigned to (issue 0021217) + // the shape the algo assigned to (issue 0021217). + // Other issues influenced the algo applying order: + // 21406, 21556, 21893, 20206 multimap< int, SMESH_subMesh* > shDim2sm; multimap< int, SMESH_subMesh* >::reverse_iterator shDim2smIt; TopoDS_Shape algoShape; @@ -273,7 +275,7 @@ bool SMESH_Gen::Compute(SMESH_Mesh & aMesh, // reload sub-meshes from shDim2sm into smWithAlgoSupportingSubmeshes for ( shDim2smIt = shDim2sm.rbegin(); shDim2smIt != shDim2sm.rend(); ++shDim2smIt ) if ( shDim2smIt->first == globalAlgoDim ) - smWithAlgoSupportingSubmeshes[0].push_back( shDim2smIt->second ); + smWithAlgoSupportingSubmeshes[3].push_back( shDim2smIt->second ); else smWithAlgoSupportingSubmeshes[0].push_front( shDim2smIt->second );