Salome HOME
projects
/
plugins
/
netgenplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright message
[plugins/netgenplugin.git]
/
src
/
NETGENPlugin
/
NETGENPlugin_NETGEN_3D_SA.cxx
diff --git
a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
index 39b809bd8ae6085f686f18f19b6d8214aae9768a..b12edb756f0cffecbe1d29095544dfd006cfcfca 100644
(file)
--- a/
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
+++ b/
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_SA.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
2 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
3 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-42,8
+42,13
@@
#include <SMESHDS_Mesh.hxx>
#include <SMESHDS_Mesh.hxx>
+#ifdef WIN32
+#include <filesystem>
+namespace fs = std::filesystem;
+#else
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
+#endif
/*
Netgen include files
/*
Netgen include files
@@
-106,8
+111,6
@@
NETGENPlugin_NETGEN_3D_SA::~NETGENPlugin_NETGEN_3D_SA()
*/
void NETGENPlugin_NETGEN_3D_SA::fillHyp(netgen_params aParams)
{
*/
void NETGENPlugin_NETGEN_3D_SA::fillHyp(netgen_params aParams)
{
- if(_gen)
- std::cout << "_gen is set" << std::endl;
if(aParams.has_netgen_param){
NETGENPlugin_Hypothesis * hypParameters = new NETGENPlugin_Hypothesis(0, GetGen());
if(aParams.has_netgen_param){
NETGENPlugin_Hypothesis * hypParameters = new NETGENPlugin_Hypothesis(0, GetGen());
@@
-272,11
+275,11
@@
int NETGENPlugin_NETGEN_3D_SA::run(const std::string input_mesh_file,
std::unique_ptr<SMESH_Mesh> myMesh(_gen->CreateMesh(false));
std::unique_ptr<SMESH_Mesh> myMesh(_gen->CreateMesh(false));
- importMesh(input_mesh_file, *myMesh);
+
SMESH_DriverMesh::
importMesh(input_mesh_file, *myMesh);
// Importing shape
TopoDS_Shape myShape;
// Importing shape
TopoDS_Shape myShape;
- importShape(shape_file, myShape);
+
SMESH_DriverShape::
importShape(shape_file, myShape);
// Importing hypothesis
netgen_params myParams;
// Importing hypothesis
netgen_params myParams;
@@
-297,7
+300,7
@@
int NETGENPlugin_NETGEN_3D_SA::run(const std::string input_mesh_file,
if(!output_mesh_file.empty()){
std::string meshName = "MESH";
if(!output_mesh_file.empty()){
std::string meshName = "MESH";
- exportMesh(output_mesh_file, *myMesh, meshName);
+
SMESH_DriverMesh::
exportMesh(output_mesh_file, *myMesh, meshName);
}
return ret;
}
return ret;