Removing hard coded meshname from Mesh import
This commit is contained in:
parent
f6eaf8534d
commit
a99d4c8ed2
@ -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 shape_file=tmp_folder / fs::path("shape.step");
|
||||||
fs::path param_file=tmp_folder / fs::path("netgen2d_param.txt");
|
fs::path param_file=tmp_folder / fs::path("netgen2d_param.txt");
|
||||||
fs::path log_file=tmp_folder / fs::path("run.log");
|
fs::path log_file=tmp_folder / fs::path("run.log");
|
||||||
//TODO: Handle variable mesh_name
|
|
||||||
std::string mesh_name = "Maillage_1";
|
|
||||||
|
|
||||||
//Writing Shape
|
//Writing Shape
|
||||||
exportShape(shape_file.string(), aShape);
|
exportShape(shape_file.string(), aShape);
|
||||||
|
@ -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 log_file=tmp_folder / fs::path("run.log");
|
||||||
fs::path cmd_file=tmp_folder / fs::path("cmd.log");
|
fs::path cmd_file=tmp_folder / fs::path("cmd.log");
|
||||||
//TODO: Handle variable mesh_name
|
//TODO: Handle variable mesh_name
|
||||||
std::string mesh_name = "Maillage_1";
|
std::string mesh_name = "MESH";
|
||||||
|
|
||||||
//Writing Shape
|
//Writing Shape
|
||||||
exportShape(shape_file.string(), aShape);
|
exportShape(shape_file.string(), aShape);
|
||||||
|
@ -80,7 +80,7 @@ using namespace nglib;
|
|||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
NETGENPlugin_NETGEN_3D_SA::NETGENPlugin_NETGEN_3D_SA()
|
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";
|
_name = "NETGEN_3D_SA";
|
||||||
}
|
}
|
||||||
@ -93,6 +93,8 @@ NETGENPlugin_NETGEN_3D_SA::NETGENPlugin_NETGEN_3D_SA()
|
|||||||
|
|
||||||
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;
|
SMESH_Gen gen;
|
||||||
|
|
||||||
std::unique_ptr<SMESH_Mesh> myMesh(gen.CreateMesh(false));
|
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
|
// Importing shape
|
||||||
TopoDS_Shape myShape;
|
TopoDS_Shape myShape;
|
||||||
|
@ -35,12 +35,10 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
class StdMeshers_ViscousLayers;
|
|
||||||
class StdMeshers_MaxElementVolume;
|
|
||||||
class NETGENPlugin_Hypothesis;
|
|
||||||
class NETGENPlugin_NetgenLibWrapper;
|
class NETGENPlugin_NetgenLibWrapper;
|
||||||
class netgen_params;
|
class netgen_params;
|
||||||
class SMDS_MeshNode;
|
class SMDS_MeshNode;
|
||||||
|
class SMESH_Gen;
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
@ -83,6 +81,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_SA: public NETGENPlugin_NETGEN_
|
|||||||
);
|
);
|
||||||
|
|
||||||
std::string _element_orientation_file="";
|
std::string _element_orientation_file="";
|
||||||
|
SMESH_Gen *_gen=nullptr;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user