ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Corrections for parallel smesh"

Browse Source 
This reverts commit 1aecb09c15.
This commit is contained in:
Yoann Audouin 2022-11-02 10:56:44 +01:00
parent 1aecb09c15
commit 58f15d2720
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -599,8 +599,6 @@ void NETGENPlugin_Mesher::SetDefaultParameters()
_fineness = NETGENPlugin_Hypothesis::GetDefaultFineness(); _fineness = NETGENPlugin_Hypothesis::GetDefaultFineness();
mparams.uselocalh = NETGENPlugin_Hypothesis::GetDefaultSurfaceCurvature(); mparams.uselocalh = NETGENPlugin_Hypothesis::GetDefaultSurfaceCurvature();
netgen::merge_solids = NETGENPlugin_Hypothesis::GetDefaultFuseEdges(); netgen::merge_solids = NETGENPlugin_Hypothesis::GetDefaultFuseEdges();
// Unused argument but set 0 to initialise it
mparams.elementorder = 0;
#ifdef NETGEN_V6 #ifdef NETGEN_V6
@ -614,7 +612,6 @@ void NETGENPlugin_Mesher::SetDefaultParameters()
#endif #endif
} }
//============================================================================= //=============================================================================
/*! /*!
* Pass parameters to NETGEN * Pass parameters to NETGEN
@ -4499,9 +4496,6 @@ int NETGENPlugin_NetgenLibWrapper::GenerateMesh( netgen::OCCGeometry& occgeo,
if ( !ngMesh ) if ( !ngMesh )
ngMesh = new netgen::Mesh; ngMesh = new netgen::Mesh;
// To dump mparam
// netgen::mparam.Print(std::cerr);
#ifdef NETGEN_V6 #ifdef NETGEN_V6
ngMesh->SetGeometry( shared_ptr<netgen::NetgenGeometry>( &occgeo, &NOOP_Deleter )); ngMesh->SetGeometry( shared_ptr<netgen::NetgenGeometry>( &occgeo, &NOOP_Deleter ));

8
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -218,7 +218,7 @@ bool NETGENPlugin_NETGEN_3D::getSurfaceElements(
SMESH_ProxyMesh::Ptr proxyMesh, SMESH_ProxyMesh::Ptr proxyMesh,
NETGENPlugin_Internals &internals, NETGENPlugin_Internals &internals,
SMESH_MesherHelper &helper, SMESH_MesherHelper &helper,
std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
) )
{ {
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS(); SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
@ -309,8 +309,6 @@ bool NETGENPlugin_NETGEN_3D::computeFillNgMesh(
SMESH::Controls::TSequenceOfXYZ nodesCoords; SMESH::Controls::TSequenceOfXYZ nodesCoords;
// maps nodes to ng ID // maps nodes to ng ID
// map must be sorted by ID to ensure that we will have the same number of
// 3D element if we recompute
typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap; typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap;
typedef TNodeToIDMap::value_type TN2ID; typedef TNodeToIDMap::value_type TN2ID;
TNodeToIDMap nodeToNetgenID; TNodeToIDMap nodeToNetgenID;
@ -340,9 +338,7 @@ bool NETGENPlugin_NETGEN_3D::computeFillNgMesh(
proxyMesh.reset( Adaptor ); proxyMesh.reset( Adaptor );
} }
// map must be sorted by ID to ensure that we will have the same number of std::map<const SMDS_MeshElement*, tuple<bool, bool>> listElements;
// 3D element if we recompute
std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare> listElements;
bool ret = getSurfaceElements(aMesh, aShape, proxyMesh, internals, helper, listElements); bool ret = getSurfaceElements(aMesh, aShape, proxyMesh, internals, helper, listElements);
if(ret) if(ret)
return ret; return ret;

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
View File

@ -107,7 +107,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
SMESH_ProxyMesh::Ptr proxyMesh, SMESH_ProxyMesh::Ptr proxyMesh,
NETGENPlugin_Internals &internals, NETGENPlugin_Internals &internals,
SMESH_MesherHelper &helper, SMESH_MesherHelper &helper,
std::map<const SMDS_MeshElement*, std::tuple<bool, bool>, TIDCompare>& listElements); std::map<const SMDS_MeshElement*, std::tuple<bool, bool>>& listElements);
bool compute(SMESH_Mesh& mesh, bool compute(SMESH_Mesh& mesh,
SMESH_MesherHelper& helper, SMESH_MesherHelper& helper,

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
View File

@ -322,7 +322,7 @@ bool NETGENPlugin_NETGEN_3D_SA::getSurfaceElements(
SMESH_ProxyMesh::Ptr proxyMesh, SMESH_ProxyMesh::Ptr proxyMesh,
NETGENPlugin_Internals &internals, NETGENPlugin_Internals &internals,
SMESH_MesherHelper &helper, SMESH_MesherHelper &helper,
std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
) )
{ {
// To remove compilation warnings // To remove compilation warnings

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
View File

@ -72,7 +72,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
SMESH_ProxyMesh::Ptr proxyMesh, SMESH_ProxyMesh::Ptr proxyMesh,
NETGENPlugin_Internals &internals, NETGENPlugin_Internals &internals,
SMESH_MesherHelper &helper, SMESH_MesherHelper &helper,
std::map<const SMDS_MeshElement*, tuple<bool, bool>, TIDCompare>& listElements std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
) override; ) override;
std::string _element_orientation_file=""; std::string _element_orientation_file="";