Merge branch 'yan/parallel_mesh2'

[plugins/netgenplugin.git] / src / NETGENPlugin / NETGENPlugin_NETGEN_3D_SA.hxx

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
index b3ebe1a0a3b6698fda21629bbe94c1f672dfd052..0a6a6fc7b342af180e2f695a9ed46b24e0dc84cf 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
@@ -38,7 +38,6 @@
 class NETGENPlugin_NetgenLibWrapper;
 class netgen_params;
 class SMDS_MeshNode;
-class SMESH_Gen;
 
 using namespace std;
 
@@ -48,19 +47,16 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
   NETGENPlugin_NETGEN_3D_SA();
   virtual ~NETGENPlugin_NETGEN_3D_SA();
 
+  void fillHyp(netgen_params aParams);
   bool Compute(TopoDS_Shape &aShape, SMESH_Mesh& aMesh, netgen_params& aParams,
-                       std::string new_element_file, std::string element_orientation_file,
-                       bool output_mesh);
+                       std::string new_element_file, bool output_mesh);
 
   int run(const std::string input_mesh_file,
           const std::string shape_file,
           const std::string hypo_file,
           const std::string element_orientation_file,
           const std::string new_element_file,
-          const std::string output_mesh_file,
-          int nbThreads);
-
-
+          const std::string output_mesh_file);
 
  protected:
 
@@ -76,13 +72,10 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
     SMESH_ProxyMesh::Ptr proxyMesh,
     NETGENPlugin_Internals &internals,
     SMESH_MesherHelper &helper,
-    netgen_params &aParams,
     std::map<const SMDS_MeshElement*, tuple<bool, bool>>& listElements
     ) override;
 
    std::string _element_orientation_file="";
-   SMESH_Gen *_gen=nullptr;
-
 };
 
 #endif