From 6ca8c64326f8a0debc75d33c038745d80b2b9fe2 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 29 Jul 2014 18:33:08 +0400 Subject: [PATCH] 22658: EDF 8542 SMESH: GHS3D computation randomly fails let proxyMesh live till readGMFFile() --- src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx index 3ca6bb6..b72f09c 100644 --- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx +++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx @@ -3469,7 +3469,10 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, std::vector aFaceByGhs3dId; std::map aNodeToGhs3dIdMap; std::vector aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId; - { + + // proxyMesh must live till readGMFFile() as a proxy face can be used by + // ghs3d for domain indication + //{ SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); // make prisms on quadrangles @@ -3512,7 +3515,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId, enforcedNodes, enforcedEdges, enforcedTriangles, /*enforcedQuadrangles,*/ enfVerticesWithGroup, coordsSizeMap); - } + //} // Write aSmdsToGhs3dIdMap to temp file TCollection_AsciiString aSmdsToGhs3dIdMapFileName; @@ -3792,7 +3795,10 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, std::vector aFaceByGhs3dId; std::map aNodeToGhs3dIdMap; std::vector aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId; - { + + // proxyMesh must live till readGMFFile() as a proxy face can be used by + // ghs3d for domain indication + //{ SMESH_ProxyMesh::Ptr proxyMesh( new SMESH_ProxyMesh( theMesh )); if ( theMesh.NbQuadrangles() > 0 ) { @@ -3807,7 +3813,7 @@ bool GHS3DPlugin_GHS3D::Compute(SMESH_Mesh& theMesh, aNodeGroupByGhs3dId, anEdgeGroupByGhs3dId, aFaceGroupByGhs3dId, enforcedNodes, enforcedEdges, enforcedTriangles, enfVerticesWithGroup, coordsSizeMap); - } + //} // ----------------- // run ghs3d mesher -- 2.39.2