From b3018b01b0b5f866fd63faf93cb74627cee29d83 Mon Sep 17 00:00:00 2001
From: Yoann Audouin <yoann.audouin@edf.fr>
Date: Wed, 21 Sep 2022 15:15:31 +0200
Subject: [PATCH] Removing hard coded meshname from Mesh import

---
 src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx   | 2 --
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx | 2 +-
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx     | 8 ++++----
 src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx     | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index a32f9fd..1d17270 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -323,8 +323,6 @@ bool NETGENPlugin_NETGEN_2D_ONLY::RemoteCompute(SMESH_Mesh&         aMesh,
   fs::path shape_file=tmp_folder / fs::path("shape.step");
   fs::path param_file=tmp_folder / fs::path("netgen2d_param.txt");
   fs::path log_file=tmp_folder / fs::path("run.log");
-  //TODO: Handle variable mesh_name
-  std::string mesh_name = "Maillage_1";
 
   //Writing Shape
   exportShape(shape_file.string(), aShape);
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx
index 3b5d61c..3729fc5 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_Remote.cxx
@@ -219,7 +219,7 @@ bool NETGENPlugin_NETGEN_3D_Remote::Compute(SMESH_Mesh&         aMesh,
   fs::path log_file=tmp_folder / fs::path("run.log");
   fs::path cmd_file=tmp_folder / fs::path("cmd.log");
   //TODO: Handle variable mesh_name
-  std::string mesh_name = "Maillage_1";
+  std::string mesh_name = "MESH";
 
   //Writing Shape
   exportShape(shape_file.string(), aShape);
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
index 0ea8a20..da00345 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
@@ -80,7 +80,7 @@ using namespace nglib;
 //=============================================================================
 
 NETGENPlugin_NETGEN_3D_SA::NETGENPlugin_NETGEN_3D_SA()
-  : NETGENPlugin_NETGEN_3D(0, new SMESH_Gen())
+  : NETGENPlugin_NETGEN_3D(0, _gen=new SMESH_Gen())
 {
   _name = "NETGEN_3D_SA";
 }
@@ -93,6 +93,8 @@ NETGENPlugin_NETGEN_3D_SA::NETGENPlugin_NETGEN_3D_SA()
 
 NETGENPlugin_NETGEN_3D_SA::~NETGENPlugin_NETGEN_3D_SA()
 {
+  if(_gen)
+    delete _gen;
 }
 
 
@@ -198,10 +200,8 @@ int NETGENPlugin_NETGEN_3D_SA::run(const std::string input_mesh_file,
   SMESH_Gen gen;
 
   std::unique_ptr<SMESH_Mesh> myMesh(gen.CreateMesh(false));
-  //TODO: To define
-  std::string mesh_name = "Maillage_1";
 
-  importMesh(input_mesh_file, *myMesh, mesh_name);
+  importMesh(input_mesh_file, *myMesh);
 
   // Importing shape
   TopoDS_Shape myShape;
diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
index 818060a..6c10fb0 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.hxx
@@ -35,12 +35,10 @@
 #include <vector>
 #include <map>
 
-class StdMeshers_ViscousLayers;
-class StdMeshers_MaxElementVolume;
-class NETGENPlugin_Hypothesis;
 class NETGENPlugin_NetgenLibWrapper;
 class netgen_params;
 class SMDS_MeshNode;
+class SMESH_Gen;
 
 using namespace std;
 
@@ -83,6 +81,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
     );
 
    std::string _element_orientation_file="";
+   SMESH_Gen *_gen=nullptr;
 
 };
 
-- 
2.39.2