Skip to content
Snippets Groups Projects
Commit d27f6c2f authored by Éric Béchet's avatar Éric Béchet
Browse files

Thinlayerfismeshplugin needs mesh to compile

parent d555d9ed
No related branches found
No related tags found
No related merge requests found
...@@ -9,10 +9,49 @@ ...@@ -9,10 +9,49 @@
#include "GModel.h" #include "GModel.h"
#include "robustPredicates.h" #include "robustPredicates.h"
#include "GRegion.h" #include "GRegion.h"
#if defined(HAVE_MESH)
#include "meshGFaceDelaunayInsertion.h" #include "meshGFaceDelaunayInsertion.h"
#endif
//#include "meshGFace.h" //#include "meshGFace.h"
extern "C"
{
GMSH_Plugin *GMSH_RegisterThinLayerFixMeshPlugin()
{
return new GMSH_ThinLayerFixMeshPlugin();
}
}
StringXNumber ThingLayerFixMeshOptions_Number[] = {
// {GMSH_FULLRC, "Dimension", NULL, 1.},
// {GMSH_FULLRC, "PhysicalGroup", NULL, 1.},
// {GMSH_FULLRC, "OpenBoundaryPhysicalGroup", NULL, 0.},
};
//GMSH_ThinLayerFixMeshPlugin::GMSH_ThinLayerFixMeshPlugin(){}
//GMSH_ThinLayerFixMeshPlugin::~GMSH_ThinLayerFixMeshPlugin(){}
std::string GMSH_ThinLayerFixMeshPlugin::getHelp() const
{
return "Fix the mesh in thin parts";
}
int GMSH_ThinLayerFixMeshPlugin::getNbOptions() const
{
return sizeof(ThingLayerFixMeshOptions_Number) / sizeof(StringXNumber);
}
StringXNumber *GMSH_ThinLayerFixMeshPlugin::getOption(int iopt)
{
return &ThingLayerFixMeshOptions_Number[iopt];
}
#if defined(HAVE_MESH)
CorrespVerticesFixMesh::CorrespVerticesFixMesh(){ CorrespVerticesFixMesh::CorrespVerticesFixMesh(){
// std::cout<<"started init CorrespVerticesFixMesh"<<std::endl; // std::cout<<"started init CorrespVerticesFixMesh"<<std::endl;
...@@ -115,38 +154,7 @@ int CorrespVerticesFixMesh::getTagMaster(){ ...@@ -115,38 +154,7 @@ int CorrespVerticesFixMesh::getTagMaster(){
return tagMaster; return tagMaster;
} }
StringXNumber ThingLayerFixMeshOptions_Number[] = {
// {GMSH_FULLRC, "Dimension", NULL, 1.},
// {GMSH_FULLRC, "PhysicalGroup", NULL, 1.},
// {GMSH_FULLRC, "OpenBoundaryPhysicalGroup", NULL, 0.},
};
extern "C"
{
GMSH_Plugin *GMSH_RegisterThinLayerFixMeshPlugin()
{
return new GMSH_ThinLayerFixMeshPlugin();
}
}
//GMSH_ThinLayerFixMeshPlugin::GMSH_ThinLayerFixMeshPlugin(){}
//GMSH_ThinLayerFixMeshPlugin::~GMSH_ThinLayerFixMeshPlugin(){}
std::string GMSH_ThinLayerFixMeshPlugin::getHelp() const
{
return "Fix the mesh in thin parts";
}
int GMSH_ThinLayerFixMeshPlugin::getNbOptions() const
{
return sizeof(ThingLayerFixMeshOptions_Number) / sizeof(StringXNumber);
}
StringXNumber *GMSH_ThinLayerFixMeshPlugin::getOption(int iopt)
{
return &ThingLayerFixMeshOptions_Number[iopt];
}
PView *GMSH_ThinLayerFixMeshPlugin::execute(PView *view) PView *GMSH_ThinLayerFixMeshPlugin::execute(PView *view)
{ {
...@@ -1160,3 +1168,13 @@ std::map<MTetrahedron*,MTet4*> GMSH_ThinLayerFixMeshPlugin::TetToTet4; ...@@ -1160,3 +1168,13 @@ std::map<MTetrahedron*,MTet4*> GMSH_ThinLayerFixMeshPlugin::TetToTet4;
std::map<MVertex*,std::vector<CorrespVerticesFixMesh*> > GMSH_ThinLayerFixMeshPlugin::VertexToCorresp; std::map<MVertex*,std::vector<CorrespVerticesFixMesh*> > GMSH_ThinLayerFixMeshPlugin::VertexToCorresp;
std::vector<std::vector<CorrespVerticesFixMesh*> > GMSH_ThinLayerFixMeshPlugin::vecOfThinSheets; std::vector<std::vector<CorrespVerticesFixMesh*> > GMSH_ThinLayerFixMeshPlugin::vecOfThinSheets;
#else
PView *GMSH_ThinLayerFixMeshPlugin::execute(PView *view)
{
Msg::Error("Plugin(ThinLayerFixMesh requires mesh module");
return view;
}
#endif
\ No newline at end of file
...@@ -11,13 +11,17 @@ ...@@ -11,13 +11,17 @@
#include "Plugin.h" #include "Plugin.h"
#include "MVertex.h" #include "MVertex.h"
#include "MTriangle.h" #include "MTriangle.h"
#if defined(HAVE_MESH)
#include "meshGRegionDelaunayInsertion.h" #include "meshGRegionDelaunayInsertion.h"
#endif
extern "C" extern "C"
{ {
GMSH_Plugin *GMSH_RegisterThinLayerFixMeshPlugin(); GMSH_Plugin *GMSH_RegisterThinLayerFixMeshPlugin();
} }
#if defined(HAVE_MESH)
static int faces[4][3] = {{0,1,2}, {0,2,3}, {0,3,1}, {1,3,2}}; static int faces[4][3] = {{0,1,2}, {0,2,3}, {0,3,1}, {1,3,2}};
struct faceXtetFM{ struct faceXtetFM{
...@@ -134,6 +138,7 @@ public: ...@@ -134,6 +138,7 @@ public:
bool getIsMaster(); bool getIsMaster();
int getTagMaster(); int getTagMaster();
}; };
#endif
class GMSH_ThinLayerFixMeshPlugin : public GMSH_PostPlugin class GMSH_ThinLayerFixMeshPlugin : public GMSH_PostPlugin
{ {
...@@ -150,6 +155,7 @@ public: ...@@ -150,6 +155,7 @@ public:
int getNbOptions() const; int getNbOptions() const;
StringXNumber* getOption(int iopt); StringXNumber* getOption(int iopt);
PView *execute(PView *); PView *execute(PView *);
#if defined(HAVE_MESH)
static void perform(); static void perform();
static void checkOppositeTriangles(); static void checkOppositeTriangles();
static void fillvecOfThinSheets(); static void fillvecOfThinSheets();
...@@ -170,6 +176,7 @@ public: ...@@ -170,6 +176,7 @@ public:
static const double distP2PMax = 5.0; static const double distP2PMax = 5.0;
static void fillVertexToTets(); static void fillVertexToTets();
static void fillTetToTet4(); static void fillTetToTet4();
#endif
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment