23068: [CEA 1505] Be able to keep meshing in 2D after having merged the nodes in 1D

This commit is contained in:
eap 2015-07-09 12:46:41 +03:00
parent 44d27b16d7
commit e7d8354cb4
2 changed files with 6 additions and 2 deletions

View File

@ -32,6 +32,8 @@ except ImportError:
noNETGENPlugin = 1
pass
LIBRARY = "libNETGENEngine.so"
#----------------------------
# Mesh algo type identifiers
#----------------------------
@ -104,7 +106,7 @@ class NETGEN_Algorithm(Mesh_Algorithm):
def __init__(self, mesh, geom=0):
Mesh_Algorithm.__init__(self)
if noNETGENPlugin: print "Warning: NETGENPlugin module unavailable"
self.Create(mesh, geom, self.algoType, "libNETGENEngine.so")
self.Create(mesh, geom, self.algoType, LIBRARY)
self.params = None
pass
@ -163,7 +165,7 @@ class NETGEN_Algorithm(Mesh_Algorithm):
self.mesh.RemoveHypothesis( self.params, self.geom )
self.params = None
if not self.params:
self.params = self.Hypothesis(hypType, [],"libNETGENEngine.so",UseExisting=0)
self.params = self.Hypothesis(hypType, [], LIBRARY, UseExisting=0)
return self.params

View File

@ -391,6 +391,8 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
for ( int iW = 0; iW < nbWires; ++iW )
{
const UVPtStructVec& points = wires[ iW ]->GetUVPtStruct();
if ( points.empty() )
return error( COMPERR_BAD_INPUT_MESH );
gp_Pnt pPrev = SMESH_TNodeXYZ( points[0].node );
for ( size_t i = 1; i < points.size(); ++i )
{