From 3060959817887165eed54fdf85035ae1bf82f59f Mon Sep 17 00:00:00 2001
From: Thomas Toulorge <thomas.toulorge@mines-paristech.fr>
Date: Wed, 22 May 2013 16:52:54 +0000
Subject: [PATCH] Various stuff for workshop by Jon
---
Solver/eigenSolver.h | 1 -
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 16 +++++++++++-----
wrappers/gmshpy/CMakeLists.txt | 1 +
wrappers/gmshpy/gmshSolver.i | 3 +++
wrappers/gmshpy/setup.py.in | 2 +-
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Solver/eigenSolver.h b/Solver/eigenSolver.h
index 1610d8274a..ae995791d0 100644
--- a/Solver/eigenSolver.h
+++ b/Solver/eigenSolver.h
@@ -15,7 +15,6 @@
#if defined(HAVE_SLEPC)
#include "linearSystemPETSc.h"
-#include <slepc.h>
class eigenSolver{
private:
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
index 7efd16762b..4bf9c0b058 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
@@ -221,7 +221,7 @@ static void calcVertex2Elements(int dim, GEntity *entity, std::map<MVertex*, std
static std::vector<std::pair<std::set<MElement*>, std::set<MVertex*> > > getConnectedBlobs(
const std::map<MVertex*, std::vector<MElement *> > &vertex2elements,
- const std::set<MElement*> &badElements, int depth, const double distFactor)
+ const std::set<MElement*> &badElements, int depth, const double distFactor, bool weakMerge = false)
{
OptHomMessage("Starting blob generation from %i bad elements...",badElements.size());
@@ -242,7 +242,7 @@ static std::vector<std::pair<std::set<MElement*>, std::set<MVertex*> > > getConn
std::set<MElement*> &blob = primBlobs[iB];
for(std::set<MElement*>::iterator itEl = blob.begin(); itEl != blob.end(); ++itEl) {
std::set<int> &blobInd = tags[*itEl];
- if (!blobInd.empty()) {
+ if (!blobInd.empty() && (badElements.find(*itEl) != badElements.end() || !weakMerge)) {
for (std::set<int>::iterator itBS = blobInd.begin(); itBS != blobInd.end(); ++itBS) blobConnect[*itBS].insert(iB);
blobConnect[iB].insert(blobInd.begin(), blobInd.end());
}
@@ -288,7 +288,7 @@ static std::vector<std::pair<std::set<MElement*>, std::set<MVertex*> > > getConn
static void optimizeConnectedBlobs(const std::map<MVertex*, std::vector<MElement *> > &vertex2elements,
std::set<MElement*> &badasses,
- OptHomParameters &p, int samples)
+ OptHomParameters &p, int samples, bool weakMerge = false)
{
p.SUCCESS = 1;
@@ -296,7 +296,7 @@ static void optimizeConnectedBlobs(const std::map<MVertex*, std::vector<MElement
p.maxJac = -1.e100;
std::vector<std::pair<std::set<MElement*>, std::set<MVertex*> > > toOptimize =
- getConnectedBlobs(vertex2elements, badasses, p.nbLayers, p.distanceFactor);
+ getConnectedBlobs(vertex2elements, badasses, p.nbLayers, p.distanceFactor, weakMerge);
//#pragma omp parallel for schedule(dynamic, 1)
for (int i = 0; i < toOptimize.size(); ++i) {
@@ -515,6 +515,11 @@ static void optimizeOneByOne(const std::map<MVertex*, std::vector<MElement *> >
//opt->mesh.writeMSH(ossI1.str().c_str());
success = opt->optimize(p.weightFixed, p.weightFree, p.BARRIER_MIN, p.BARRIER_MAX,
false, samples, p.itMax, p.optPassMax);
+ if (success >= 0 && p.BARRIER_MIN_METRIC > 0) {
+ OptHomMessage("Jacobian optimization succeed, starting svd optimization");
+ success = opt->optimize(p.weightFixed, p.weightFree, p.BARRIER_MIN_METRIC, p.BARRIER_MAX,
+ true, samples, p.itMax, p.optPassMax);
+ }
}
else {
OptHomMessage("Primary blob %i did not break new elements, no correction needed", iBadEl);
@@ -775,7 +780,8 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
}
}
- if (p.strategy == 0) optimizeConnectedBlobs(vertex2elements, badasses, p, samples);
+ if (p.strategy == 0) optimizeConnectedBlobs(vertex2elements, badasses, p, samples, false);
+ else if (p.strategy == 2) optimizeConnectedBlobs(vertex2elements, badasses, p, samples, true);
else optimizeOneByOne(vertex2elements, badasses, p, samples);
double DTF = Cpu()-tf1;
diff --git a/wrappers/gmshpy/CMakeLists.txt b/wrappers/gmshpy/CMakeLists.txt
index 56e3aa4f69..69c11df7fe 100644
--- a/wrappers/gmshpy/CMakeLists.txt
+++ b/wrappers/gmshpy/CMakeLists.txt
@@ -127,6 +127,7 @@ set (GMSH_PYTHON_EXTRA_INCLUDE
Fltk/FlGui.h
Solver/frameSolver.h
Solver/functionSpace.h
+ Solver/eigenSolver.h
Mesh/Generator.h
Geo/GeomMeshMatcher.h
Geo/GFaceCompound.h
diff --git a/wrappers/gmshpy/gmshSolver.i b/wrappers/gmshpy/gmshSolver.i
index 61e1a2da18..cff31d8144 100644
--- a/wrappers/gmshpy/gmshSolver.i
+++ b/wrappers/gmshpy/gmshSolver.i
@@ -2,6 +2,7 @@
%module gmshSolver
%include std_string.i
%include std_vector.i
+%include std_complex.i
%{
#include "GmshConfig.h"
@@ -13,6 +14,7 @@
#include "linearSystemCSR.h"
#include "linearSystemFull.h"
#include "linearSystemPETSc.h"
+ #include "eigenSolver.h"
#endif
%}
@@ -34,4 +36,5 @@
%include "linearSystemPETSc.h"
%template(linearSystemPETScDouble) linearSystemPETSc<double>;
#endif
+%include "eigenSolver.h"
#endif
diff --git a/wrappers/gmshpy/setup.py.in b/wrappers/gmshpy/setup.py.in
index 1fc75ea0c8..5e286e45ea 100644
--- a/wrappers/gmshpy/setup.py.in
+++ b/wrappers/gmshpy/setup.py.in
@@ -1,5 +1,5 @@
from distutils.core import setup, Extension
-gmshroot = "."
+gmshroot = ".."
gmshmodules = [${GMSH_PYTHON_MODULES}]
setup(
name = 'gmshpy',
--
GitLab