From af7cb3dda7cf8d5ab0b6e8e68d10e69dd820ca5e Mon Sep 17 00:00:00 2001
From: Amaury Johnen <amaury.johnen@uclouvain.be>
Date: Mon, 12 Jun 2017 17:01:52 +0200
Subject: [PATCH] cleanup
---
Mesh/meshGRegionRelocateVertex.cpp | 1 -
Mesh/qualityMeasuresJacobian.cpp | 31 ++----------------------------
Mesh/qualityMeasuresJacobian.h | 8 ++------
3 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/Mesh/meshGRegionRelocateVertex.cpp b/Mesh/meshGRegionRelocateVertex.cpp
index b4711b3f5a..4f5330e5bf 100644
--- a/Mesh/meshGRegionRelocateVertex.cpp
+++ b/Mesh/meshGRegionRelocateVertex.cpp
@@ -27,7 +27,6 @@ static double objective_function (double xi, MVertex *ver,
else
// minQual = std::min((lt[i]->specialQuality()), minQual);
minQual = std::min(fabs(lt[i]->minSICNShapeMeasure())*.2, minQual);
-// minQual = std::min(lt[i]->minAnisotropyMeasure(), minQual);
}
ver->x() = x;
ver->y() = y;
diff --git a/Mesh/qualityMeasuresJacobian.cpp b/Mesh/qualityMeasuresJacobian.cpp
index 1ad2692f92..06b5307b1b 100644
--- a/Mesh/qualityMeasuresJacobian.cpp
+++ b/Mesh/qualityMeasuresJacobian.cpp
@@ -15,15 +15,6 @@
#include <iomanip>
#include "pointsGenerators.h"
#include "OS.h"
-#define TMBEG(n, what) static int I##n = 0, IND##n = _CoeffDataAnisotropy::mytimes.size(); \
-if (++I##n == 1) { \
- Msg::Info("Time%d = "#what, IND##n); \
- _CoeffDataAnisotropy::mytimes.push_back(0); \
- _CoeffDataAnisotropy::mynumbers.push_back(0); \
-} \
-_CoeffDataAnisotropy::mynumbers[IND##n] += 1; \
-double TM##n = Cpu();
-#define TMEND(n) _CoeffDataAnisotropy::mytimes[IND##n] += Cpu() - TM##n;
namespace jacobianBasedQuality {
@@ -263,25 +254,7 @@ double minICNMeasure(MElement *el,
return min;
}
-//double minSampledAnisotropyMeasure(MElement *el, int deg, bool writeInFile)//fordebug
-//{
-// fullMatrix<double> samplingPoints;
-// bool serendip = false;
-// gmshGeneratePoints(FuncSpaceData(el, deg, &serendip), samplingPoints);
-//
-// double values[3];
-// double min = std::numeric_limits<double>::infinity();
-// for (int i = 0; i < samplingPoints.size1(); ++i) {
-// min = std::min(min, el->getEigenvaluesMetric(samplingPoints(i, 0),
-// samplingPoints(i, 1),
-// samplingPoints(i, 2),
-// values));
-// }
-//
-// return min;
-//}
-
-double minSampledICNMeasure(MElement *el, int deg, bool writeInFile)//fordebug
+double minSampledICNMeasure(MElement *el, int deg)//fordebug
{
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
el->getNodesCoord(nodesXYZ);
@@ -340,7 +313,7 @@ double minSampledICNMeasure(MElement *el, int deg, bool writeInFile)//fordebug
return min;
}
-double minSampledIGEMeasure(MElement *el, int deg, bool writeInFile)//fordebug
+double minSampledIGEMeasure(MElement *el, int deg)//fordebug
{
fullMatrix<double> nodesXYZ(el->getNumVertices(), 3);
el->getNodesCoord(nodesXYZ);
diff --git a/Mesh/qualityMeasuresJacobian.h b/Mesh/qualityMeasuresJacobian.h
index 5169c8e2d7..ab83afda9a 100644
--- a/Mesh/qualityMeasuresJacobian.h
+++ b/Mesh/qualityMeasuresJacobian.h
@@ -23,12 +23,8 @@ double minIGEMeasure(MElement *el,
double minICNMeasure(MElement *el,
bool knownValid = false,
bool reversedOk = false);
-//double minSampledAnisotropyMeasure(MElement *el, int order,//fordebug
-// bool writeInFile = false);
-double minSampledICNMeasure(MElement *el, int order,//fordebug
- bool writeInFile = false);
-double minSampledIGEMeasure(MElement *el, int order,//fordebug
- bool writeInFile = false);
+double minSampledICNMeasure(MElement *el, int order);//fordebug
+double minSampledIGEMeasure(MElement *el, int order);//fordebug
class _CoeffData
{
--
GitLab