Merge branch 'yan/parallel_mesh2'

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

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index 03df7fe55a67751fafd655f8ccceaf5257ca9cb2..af987461f5b3908dd9bd02dc37f469e942195be2 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@@ -38,6 +38,7 @@
 #include "Utils_SALOME_Exception.hxx"
 
 #include <vector>
+#include <tuple>
 
 class StdMeshers_ViscousLayers;
 class StdMeshers_MaxElementVolume;
@@ -70,32 +71,29 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
                         const TopoDS_Shape& aShape,
                         MapShapeNbElems& aResMap);
 
-  static bool computeFillNgMesh(
+  bool computeFillNgMesh(
     SMESH_Mesh&         aMesh,
     const TopoDS_Shape& aShape,
     std::vector< const SMDS_MeshNode* > &nodeVec,
     NETGENPlugin_NetgenLibWrapper &ngLib,
     SMESH_MesherHelper &helper,
-    netgen_params &aParams,
     int &Netgen_NbOfNodes);
 
-  static bool computePrepareParam(
+  bool computePrepareParam(
     SMESH_Mesh&         aMesh,
     NETGENPlugin_NetgenLibWrapper &ngLib,
     netgen::OCCGeometry &occgeo,
     SMESH_MesherHelper &helper,
-    netgen_params &aParams,
     int &endWith);
 
-  static bool computeRunMesher(
+  bool computeRunMesher(
     netgen::OCCGeometry &occgeo,
     std::vector< const SMDS_MeshNode* > &nodeVec,
     netgen::Mesh* ngMesh,
     NETGENPlugin_NetgenLibWrapper &ngLib,
-    netgen_params &aParams,
     int &startWith, int &endWith);
 
-  static bool computeFillMesh(
+  bool computeFillMesh(
     std::vector< const SMDS_MeshNode* > &nodeVec,
     NETGENPlugin_NetgenLibWrapper &ngLib,
     SMESH_MesherHelper &helper,
@@ -103,18 +101,13 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 
  protected:
 
-  void exportElementOrientation(SMESH_Mesh& aMesh,
-                                const TopoDS_Shape& aShape,
-                                netgen_params& aParams,
-                                const std::string output_file);
-
-  void fillParameters(const NETGENPlugin_Hypothesis* hyp,
-                      netgen_params &aParams);
-
-  int RemoteCompute(SMESH_Mesh&         aMesh,
-                    const TopoDS_Shape& aShape);
-
-
+  virtual bool getSurfaceElements(
+    SMESH_Mesh&         aMesh,
+    const TopoDS_Shape& aShape,
+    SMESH_ProxyMesh::Ptr proxyMesh,
+    NETGENPlugin_Internals &internals,
+    SMESH_MesherHelper &helper,
+    std::map<const SMDS_MeshElement*, std::tuple<bool, bool>>& listElements);
 
   bool compute(SMESH_Mesh&                          mesh,
                SMESH_MesherHelper&                  helper,