From a23f2fa68a176e31d60a8c742b3efebf4957096b Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 13 Jul 2013 18:58:12 +0000
Subject: [PATCH] cleanup
---
Fltk/highOrderToolsWindow.cpp | 2 +-
Mesh/HighOrder.cpp | 2 --
contrib/HighOrderMeshOptimizer/OptHOM.h | 3 +--
.../HighOrderMeshOptimizer/OptHomElastic.cpp | 20 +++----------------
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 3 +--
5 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/Fltk/highOrderToolsWindow.cpp b/Fltk/highOrderToolsWindow.cpp
index c3348d7ec5..ce19a49adf 100644
--- a/Fltk/highOrderToolsWindow.cpp
+++ b/Fltk/highOrderToolsWindow.cpp
@@ -137,7 +137,7 @@ static void highordertools_runopti_cb(Fl_Widget *w, void *data)
p.maxAdaptBlob = o->value[9]->value();
p.adaptBlobLayerFact = (int) o->value[10]->value();
p.adaptBlobDistFact = o->value[11]->value();
- HighOrderMeshOptimizer (GModel::current(),p);
+ HighOrderMeshOptimizer(GModel::current(), p);
}
#else
Msg::Error("High-order mesh optimization requires the OPTHOM module");
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index f75ee9cb8d..cc21c76958 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -22,8 +22,6 @@
#include "fullMatrix.h"
#include "BasisFactory.h"
-#define SQU(a) ((a)*(a))
-
// The aim here is to build a polynomial representation that consist
// in polynomial segments of equal length
diff --git a/contrib/HighOrderMeshOptimizer/OptHOM.h b/contrib/HighOrderMeshOptimizer/OptHOM.h
index e7bb8d4aca..cc2ef1c101 100644
--- a/contrib/HighOrderMeshOptimizer/OptHOM.h
+++ b/contrib/HighOrderMeshOptimizer/OptHOM.h
@@ -4,13 +4,12 @@
#include <string>
#include <math.h>
#include "GmshConfig.h"
+#include "OptHomMesh.h"
#if defined(HAVE_BFGS)
#include "ap.h"
-class Mesh;
-
class OptHOM
{
public:
diff --git a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
index bdd3064b75..42fdd93daf 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomElastic.cpp
@@ -253,14 +253,6 @@ void highOrderTools::computeMetricInfo(GFace *gf,
D(XJ) = (gp.x() - ss.x());
D(YJ) = (gp.y() - ss.y());
D(ZJ) = (gp.z() - ss.z());
- /*
- printf("point %d on %d %d dx = %g %g %g --> %g %g %g --> %g %g %g \n",e->getVertex(j)->getIndex(),
- e->getVertex(j)->onWhat()->dim(),e->getVertex(j)->onWhat()->tag(),
- D(XJ),D(YJ),D(ZJ),
- ss.x(),ss.y(),ss.z(),
- e->getVertex(j)->x(),e->getVertex(j)->y(),e->getVertex(j)->z());
- */
-
}
}
@@ -367,11 +359,9 @@ double highOrderTools::smooth_metric_(std::vector<MElement*> & v,
std::set<MVertex*>::iterator it;
double dx = 0.0;
- // printf("size %d\n",myAssembler.sizeOfR());
-
if (myAssembler.sizeOfR()){
- // while convergence -------------------------------------------------------
+ // while convergence
for (unsigned int i = 0; i < v.size(); i++){
MElement *e = v[i];
int nbNodes = e->getNumVertices();
@@ -391,10 +381,7 @@ double highOrderTools::smooth_metric_(std::vector<MElement*> & v,
computeMetricInfo(gf, e, J32, J23, D3);
J23K33.gemm(J23, K33, 1, 0);
K22.gemm(J23K33, J32, 1, 0);
- // K33.print("K33");
- // K22.print("K22");
J23K33.mult(D3, R2);
- // R2.print("hopla");
for (int j = 0; j < n2; j++){
Dof RDOF = El.getLocalDofR(&se, j);
myAssembler.assemble(RDOF, -R2(j));
@@ -405,8 +392,8 @@ double highOrderTools::smooth_metric_(std::vector<MElement*> & v,
}
}
myAssembler.systemSolve();
- // for all element, compute detJ at integration points --> material law
- // end while convergence -------------------------------------------------------
+ // for all element, compute detJ at integration points --> material law end
+ // while convergence
for (it = verticesToMove.begin(); it != verticesToMove.end(); ++it){
if ((*it)->onWhat()->dim() == 2){
@@ -415,7 +402,6 @@ double highOrderTools::smooth_metric_(std::vector<MElement*> & v,
SPoint2 dparam;
myAssembler.getDofValue((*it), 0, _tag, dparam[0]);
myAssembler.getDofValue((*it), 1, _tag, dparam[1]);
- // printf("%g %g -- %g %g\n",dparam[0],dparam[1],param[0],param[1]);
SPoint2 newp = param+dparam;
dx += newp.x() * newp.x() + newp.y() * newp.y();
(*it)->setParameter(0, newp.x());
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
index 940dfd3b4c..762544ca85 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
@@ -2,6 +2,7 @@
#include <sstream>
#include <iterator>
#include <string.h>
+#include "OptHOM.h"
#include "OptHomRun.h"
#include "GModel.h"
#include "Gmsh.h"
@@ -11,8 +12,6 @@
#include "MHexahedron.h"
#include "MPrism.h"
#include "MLine.h"
-#include "OptHomMesh.h"
-#include "OptHOM.h"
#include "OS.h"
#include <stack>
--
GitLab