From ecd7ff333615bac5c51ab7c322113920e3f3b2ee Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Thu, 21 Apr 2011 10:10:45 +0000
Subject: [PATCH] gmsh : bindings for mesh optimizations
---
Common/gmshpy.i | 4 ++++
Mesh/meshGFaceOptimize.h | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Common/gmshpy.i b/Common/gmshpy.i
index 0c87dfb7f1..f47e2c126e 100644
--- a/Common/gmshpy.i
+++ b/Common/gmshpy.i
@@ -31,6 +31,8 @@
#include "polynomialBasis.h"
#include "Gauss.h"
#include "meshPartitionOptions.h"
+ #include "meshGFaceOptimize.h"
+ #include "Generator.h"
#include "linearSystemCSR.h"
#include "elasticitySolver.h"
#include "meshGFaceLloyd.h"
@@ -133,6 +135,8 @@ namespace std {
%include "functionPython.h"
%include "meshGFaceLloyd.h"
%include "DefaultOptions.h"
+%include "meshGFaceOptimize.h"
+%include "Generator.h"
#if defined(HAVE_FLTK)
%include "FlGui.h"
#endif
diff --git a/Mesh/meshGFaceOptimize.h b/Mesh/meshGFaceOptimize.h
index 988d82a96a..55b2d34e37 100644
--- a/Mesh/meshGFaceOptimize.h
+++ b/Mesh/meshGFaceOptimize.h
@@ -57,7 +57,9 @@ void buildListOfEdgeAngle(e2t_cont adj, std::vector<edge_angle> &edges_detected,
void buildEdgeToElements(std::vector<MElement*> &tris, e2t_cont &adj);
void laplaceSmoothing(GFace *gf, int niter=1);
+/*
void edgeSwappingLawson(GFace *gf);
+*/
enum swapCriterion {SWCR_DEL, SWCR_QUAL, SWCR_NORM, SWCR_CLOSE};
enum splitCriterion {SPCR_CLOSE, SPCR_QUAL, SPCR_ALLWAYS};
@@ -69,20 +71,20 @@ int edgeSwapPass(GFace *gf,
const std::vector<double> &Vs,
const std::vector<double> &vSizes,
const std::vector<double> &vSizesBGM);
-int edgeSplitPass(double maxLC, GFace *gf,
+/*int edgeSplitPass(double maxLC, GFace *gf,
std::set<MTri3*, compareTri3Ptr> &allTris,
const splitCriterion &cr,
std::vector<double> &Us,
std::vector<double> &Vs,
std::vector<double> &vSizes ,
std::vector<double> &vSizesBGM);
-void removeFourTrianglesNodes(GFace *gf, bool replace_by_quads);
int edgeCollapsePass(double minLC, GFace *gf,
std::set<MTri3*, compareTri3Ptr> &allTris,
std::vector<double> &Us,
std::vector<double> &Vs,
std::vector<double> &vSizes ,
- std::vector<double> &vSizesBGM);
+ std::vector<double> &vSizesBGM);*/
+void removeFourTrianglesNodes(GFace *gf, bool replace_by_quads);
void buildMeshGenerationDataStructures(GFace *gf,
std::set<MTri3*, compareTri3Ptr> &AllTris,
std::vector<double> &vSizes,
--
GitLab