Removing hard coded meshname from Mesh import

This commit is contained in:
Yoann Audouin 2022-09-21 15:15:31 +02:00
parent f6eaf8534d
commit a99d4c8ed2
4 changed files with 7 additions and 10 deletions

View File

@ -324,8 +324,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);

View File

@ -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);

View File

@ -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;

View File

@ -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;
};