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

diff --git a/src/NETGENPlugin/NETGENPluginBuilder.py b/src/NETGENPlugin/NETGENPluginBuilder.py
index 1035553d20363b809fed3bc2fb220f49b411ecb3..1a44269b17b03e6a82d210ff6b2043c9e91ff73a 100644 (file)
--- a/src/NETGENPlugin/NETGENPluginBuilder.py
+++ b/src/NETGENPlugin/NETGENPluginBuilder.py
@@ -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
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 3a853a65b58ebf88113e220d9ecfd870ee57d0b5..a8b57bea551d4689d786e2d23d6e2c63b2c98fa1 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -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 )
           {