From eb4988992318504cc78f6505ab8a93851f588a95 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 14 Nov 2014 06:52:35 +0000
Subject: [PATCH] fix compile
---
Geo/MHexahedron.cpp | 35 ++++++++++++------
Geo/MLine.cpp | 9 +++--
Geo/MPrism.cpp | 85 +++++++++++++++++++++++++-------------------
Geo/MPyramid.cpp | 12 ++++---
Geo/MQuadrangle.cpp | 48 +++++++++++++++++--------
Geo/MTetrahedron.cpp | 12 ++++---
Geo/MTriangle.cpp | 19 ++++++----
7 files changed, 140 insertions(+), 80 deletions(-)
diff --git a/Geo/MHexahedron.cpp b/Geo/MHexahedron.cpp
index b8c8c91163..fa846bc2a6 100644
--- a/Geo/MHexahedron.cpp
+++ b/Geo/MHexahedron.cpp
@@ -43,7 +43,7 @@ double MHexahedron::angleShapeMeasure()
#if defined(HAVE_MESH)
return qmHexahedron::angles(this);
#else
- return 1.;
+ return 0.;
#endif
}
@@ -52,7 +52,8 @@ double MHexahedron::getInnerRadius()
//Only for vertically aligned elements (not inclined)
double innerRadius=std::numeric_limits<double>::max();
for (int i=0; i<getNumFaces(); i++){
- MQuadrangle quad(getFace(i).getVertex(0), getFace(i).getVertex(1), getFace(i).getVertex(2), getFace(i).getVertex(3));
+ MQuadrangle quad(getFace(i).getVertex(0), getFace(i).getVertex(1),
+ getFace(i).getVertex(2), getFace(i).getVertex(3));
innerRadius=std::min(innerRadius,quad.getInnerRadius());
}
return innerRadius;
@@ -141,17 +142,23 @@ static void _myGetEdgeRep(MHexahedron *hex, int num, double *x, double *y, doubl
n[0] = n[1] = 1 ;
}
-void MHexahedron20::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MHexahedron20::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getEdgeRep(false, num, x, y, z, n);
}
-void MHexahedron27::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MHexahedron27::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getEdgeRep(false, num, x, y, z, n);
}
-void MHexahedronN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MHexahedronN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getEdgeRep(false, num, x, y, z, n);
}
@@ -346,19 +353,22 @@ void _myGetFaceRep(MHexahedron *hex, int num, double *x, double *y, double *z,
}
-void MHexahedron20::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MHexahedron20::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getFaceRep(false, num, x, y, z, n);
}
-void MHexahedron27::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MHexahedron27::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getFaceRep(false, num, x, y, z, n);
}
-void MHexahedronN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MHexahedronN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MHexahedron::getFaceRep(false, num, x, y, z, n);
@@ -366,16 +376,19 @@ void MHexahedronN::getFaceRep(bool curved, int num, double *x, double *y, double
int MHexahedron20::getNumFacesRep(bool curved)
{
- return curved ? 6 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 12;
+ return curved ? 6 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 12;
}
int MHexahedron27::getNumFacesRep(bool curved)
{
- return curved ? 6 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 12;
+ return curved ? 6 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 12;
}
int MHexahedronN::getNumFacesRep(bool curved)
{
- return curved ? 6 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 12;
+ return curved ? 6 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 12;
}
diff --git a/Geo/MLine.cpp b/Geo/MLine.cpp
index 1299cb4dc6..75dd2fa99a 100644
--- a/Geo/MLine.cpp
+++ b/Geo/MLine.cpp
@@ -46,7 +46,8 @@ int MLine3::getNumEdgesRep(bool curved)
return curved ? CTX::instance()->mesh.numSubEdges : 1;
}
-void MLine3::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MLine3::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) {
int numSubEdges = CTX::instance()->mesh.numSubEdges;
@@ -107,8 +108,10 @@ void MLineN::discretize(double tol, std::vector<SPoint3> &dpts, std::vector<doub
if (order == 3) {
SPoint3 p0 = getVertex(0)->point();
SPoint3 p3 = getVertex(1)->point();
- SPoint3 p1 = p0 * (-5./6) + p3 * (1./3) + getVertex(2)->point() * 3. - getVertex(3)->point() * 1.5;
- SPoint3 p2 = p0 * (1./3) + p3 * (-5./6) - getVertex(2)->point() * 1.5 + getVertex(3)->point() * 3.;
+ SPoint3 p1 = p0 * (-5./6) + p3 * (1./3) + getVertex(2)->point() * 3. -
+ getVertex(3)->point() * 1.5;
+ SPoint3 p2 = p0 * (1./3) + p3 * (-5./6) - getVertex(2)->point() * 1.5 +
+ getVertex(3)->point() * 3.;
decasteljau(tol, p0, p1, p2, p3, dpts, ts);
for (size_t i = 0; i < ts.size(); ++i)
ts[i] = -1 + 2 * ts[i];
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index e1dcf182b6..2123be85e2 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -126,8 +126,8 @@ void MPrism::getFaceInfo(const MFace &face, int &ithFace, int &sign, int &rot) c
}
static void _myGetEdgeRep(MPrism *pri, int num, double *x, double *y, double *z,
- SVector3 *n, int numSubEdges) {
-
+ SVector3 *n, int numSubEdges)
+{
//const int numSubEdges = CTX::instance()->mesh.numSubEdges;
static double pp[6][3] = {
{0,0,-1},{1,0,-1},{0,1,-1},
@@ -163,36 +163,43 @@ static void _myGetEdgeRep(MPrism *pri, int num, double *x, double *y, double *z,
n[0] = n[1] = 1 ;
}
-
-void MPrism15::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MPrism15::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getEdgeRep(false, num, x, y, z, n);
}
-void MPrism18::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MPrism18::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getEdgeRep(false, num, x, y, z, n);
}
-void MPrismN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n) {
+void MPrismN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
+{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getEdgeRep(false, num, x, y, z, n);
}
-int MPrism15::getNumEdgesRep(bool curved) {
+int MPrism15::getNumEdgesRep(bool curved)
+{
return curved ? 9 * CTX::instance()->mesh.numSubEdges : 9;
}
-int MPrism18::getNumEdgesRep(bool curved) {
+int MPrism18::getNumEdgesRep(bool curved)
+{
return curved ? 9 * CTX::instance()->mesh.numSubEdges : 9;
}
-int MPrismN::getNumEdgesRep(bool curved) {
+int MPrismN::getNumEdgesRep(bool curved)
+{
return curved ? 9 * CTX::instance()->mesh.numSubEdges : 9;
}
-
-void _myGetFaceRep(MPrism *pri, int num, double *x, double *y, double *z,
+static void _myGetFaceRep(MPrism *pri, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
static double pp[6][3] = {
@@ -352,7 +359,8 @@ void _myGetFaceRep(MPrism *pri, int num, double *x, double *y, double *z,
pri->pnt(U3, V3, W3, pnt3);
}
- } else {
+ }
+ else {
int ix = 0, iy = 0;
int nbt = 0;
for (int i = 0; i < numSubEdges; i++){
@@ -410,55 +418,60 @@ void _myGetFaceRep(MPrism *pri, int num, double *x, double *y, double *z,
n[2] = n[0];
}
-void MPrism15::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MPrism15::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getFaceRep(false, num, x, y, z, n);
}
-void MPrism18::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MPrism18::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getFaceRep(false, num, x, y, z, n);
}
-void MPrismN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MPrismN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPrism::getFaceRep(false, num, x, y, z, n);
}
-int MPrism15::getNumFacesRep(bool curved) {
- return curved ? 4 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 8;
+int MPrism15::getNumFacesRep(bool curved)
+{
+ return curved ? 4 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 8;
}
-int MPrism18::getNumFacesRep(bool curved) {
- return curved ? 4 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 8;
+int MPrism18::getNumFacesRep(bool curved)
+{
+ return curved ? 4 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 8;
}
-int MPrismN::getNumFacesRep(bool curved) {
- return curved ? 4 * (CTX::instance()->mesh.numSubEdges * CTX::instance()->mesh.numSubEdges * 2) : 8;
+int MPrismN::getNumFacesRep(bool curved)
+{
+ return curved ? 4 * (CTX::instance()->mesh.numSubEdges *
+ CTX::instance()->mesh.numSubEdges * 2) : 8;
}
-namespace {
-
-void _addEdgeNodes(int num, bool reverse, int order, const std::vector<MVertex*> &vs,
- int &ind, std::vector<MVertex*> &v)
+static void _addEdgeNodes(int num, bool reverse, int order,
+ const std::vector<MVertex*> &vs,
+ int &ind, std::vector<MVertex*> &v)
{
-
const int nNode = order-1, startNode = num*nNode, endNode = startNode+nNode-1;
if (reverse)
for (int i=endNode; i>=startNode; i--, ind++) v[ind] = vs[i];
else
for (int i=startNode; i<=endNode; i++, ind++) v[ind] = vs[i];
-
}
-void _addFaceNodes(int num, int order, const std::vector<MVertex*> &vs,
- int &ind, std::vector<MVertex*> &v)
+static void _addFaceNodes(int num, int order, const std::vector<MVertex*> &vs,
+ int &ind, std::vector<MVertex*> &v)
{
-
const int nNodeEd = order-1, nNodeTri = (order-2)*(order-1)/2;
int startNode, endNode;
@@ -473,9 +486,6 @@ void _addFaceNodes(int num, int order, const std::vector<MVertex*> &vs,
}
for (int i=startNode; i<endNode; i++, ind++) v[ind] = vs[i];
-
-}
-
}
// To be tested
@@ -514,15 +524,18 @@ void MPrismN::getFaceVertices(const int num, std::vector<MVertex*> &v) const
int ind = nEdge;
// Add edge nodes
- for (int iE=0; iE<nEdge; iE++) _addEdgeNodes(edge[num][iE],reverse[num][iE],_order,_vs,ind,v);
+ for (int iE=0; iE<nEdge; iE++)
+ _addEdgeNodes(edge[num][iE],reverse[num][iE],_order,_vs,ind,v);
// Add face nodes
_addFaceNodes(num,_order,_vs,ind,v);
-
}
double MPrism::gammaShapeMeasure()
{
+#if defined(HAVE_MESH)
return qmPrism::minNCJ(this);
+#else
+ return 0.;
+#endif
}
-
diff --git a/Geo/MPyramid.cpp b/Geo/MPyramid.cpp
index 968efb6302..650a2b6557 100644
--- a/Geo/MPyramid.cpp
+++ b/Geo/MPyramid.cpp
@@ -43,11 +43,13 @@ const JacobianBasis* MPyramid::getJacobianFuncSpace(int order) const
MPyramidN::~MPyramidN() {}
-int MPyramidN::getNumEdgesRep(bool curved) {
+int MPyramidN::getNumEdgesRep(bool curved)
+{
return curved ? 8 * CTX::instance()->mesh.numSubEdges : 8;
}
-void MPyramidN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MPyramidN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) {
int numSubEdges = CTX::instance()->mesh.numSubEdges;
@@ -83,7 +85,8 @@ void MPyramidN::getEdgeRep(bool curved, int num, double *x, double *y, double *z
}
-int MPyramidN::getNumFacesRep(bool curved) {
+int MPyramidN::getNumFacesRep(bool curved)
+{
return curved ? 6 * SQU(CTX::instance()->mesh.numSubEdges) : 6;
}
@@ -323,7 +326,8 @@ static void _myGetFaceRep(MPyramid *pyr, int num, double *x, double *y, double *
}
}
-void MPyramidN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MPyramidN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MPyramid::getFaceRep(false, num, x, y, z, n);
diff --git a/Geo/MQuadrangle.cpp b/Geo/MQuadrangle.cpp
index 6d5e98e26c..23627056d9 100644
--- a/Geo/MQuadrangle.cpp
+++ b/Geo/MQuadrangle.cpp
@@ -24,15 +24,18 @@ const JacobianBasis* MQuadrangle::getJacobianFuncSpace(int order) const
return tag ? BasisFactory::getJacobianBasis(tag) : NULL;
}
-int MQuadrangleN::getNumEdgesRep(bool curved){
+int MQuadrangleN::getNumEdgesRep(bool curved)
+{
return curved ? 4 * CTX::instance()->mesh.numSubEdges : 4;
}
-int MQuadrangle8::getNumEdgesRep(bool curved){
+int MQuadrangle8::getNumEdgesRep(bool curved)
+{
return curved ? 4 * CTX::instance()->mesh.numSubEdges : 4;
}
-int MQuadrangle9::getNumEdgesRep(bool curved){
+int MQuadrangle9::getNumEdgesRep(bool curved)
+{
return curved ? 4 * CTX::instance()->mesh.numSubEdges : 4;
}
@@ -83,30 +86,39 @@ static void _myGetEdgeRep(MQuadrangle *q, int num, double *x, double *y, double
z[0] = pnt1.z(); z[1] = pnt2.z();
}
-void MQuadrangleN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MQuadrangleN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getEdgeRep(false, num, x, y, z, n);
}
-void MQuadrangle8::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+
+void MQuadrangle8::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getEdgeRep(false, num, x, y, z, n);
}
-void MQuadrangle9::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+
+void MQuadrangle9::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getEdgeRep(false, num, x, y, z, n);
}
-
-int MQuadrangleN::getNumFacesRep(bool curved){
+int MQuadrangleN::getNumFacesRep(bool curved)
+{
return curved ? 2*SQU(CTX::instance()->mesh.numSubEdges) : 2;
}
-int MQuadrangle8::getNumFacesRep(bool curved){
+
+int MQuadrangle8::getNumFacesRep(bool curved)
+{
return curved ? 2*SQU(CTX::instance()->mesh.numSubEdges) : 2;
}
-int MQuadrangle9::getNumFacesRep(bool curved){
+
+int MQuadrangle9::getNumFacesRep(bool curved)
+{
return curved ? 2*SQU(CTX::instance()->mesh.numSubEdges) : 2;
}
@@ -162,17 +174,22 @@ static void _myGetFaceRep(MQuadrangle *t, int num, double *x, double *y, double
z[0] = pnt1.z(); z[1] = pnt2.z(); z[2] = pnt3.z();
}
-void MQuadrangleN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MQuadrangleN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getFaceRep(false, num, x, y, z, n);
}
-void MQuadrangle8::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+
+void MQuadrangle8::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getFaceRep(false, num, x, y, z, n);
}
-void MQuadrangle9::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+
+void MQuadrangle9::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MQuadrangle::getFaceRep(false, num, x, y, z, n);
@@ -201,7 +218,6 @@ double MQuadrangle::gammaShapeMeasure(){
#endif
}
-
double MQuadrangle::angleShapeMeasure()
{
#if defined(HAVE_MESH)
@@ -210,11 +226,13 @@ double MQuadrangle::angleShapeMeasure()
return 1.;
#endif
}
+
double MQuadrangle::getOuterRadius()
{
- // TO DO!!!!!!!!!!!!! (BRUNO SENY)
+ // FIXME: TODO! (BRUNO SENY)
return 1.0;
}
+
double MQuadrangle::getInnerRadius()
{
#if defined(HAVE_LAPACK)
diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp
index ea2c49892c..3f7b1dfdb1 100644
--- a/Geo/MTetrahedron.cpp
+++ b/Geo/MTetrahedron.cpp
@@ -148,13 +148,15 @@ static void _myGetEdgeRep(MTetrahedron *tet, int num, double *x, double *y, doub
n[0] = n[1] = tet->getFace(f[iEdge]).normal();
}
-void MTetrahedron10::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTetrahedron10::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTetrahedron::getEdgeRep(false, num, x, y, z, n);
}
-void MTetrahedronN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTetrahedronN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTetrahedron::getEdgeRep(false, num, x, y, z, n);
@@ -247,13 +249,15 @@ static void _myGetFaceRep(MTetrahedron *tet, int num, double *x, double *y, doub
n[2] = n[0];
}
-void MTetrahedronN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTetrahedronN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTetrahedron::getFaceRep(false, num, x, y, z, n);
}
-void MTetrahedron10::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTetrahedron10::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTetrahedron::getFaceRep(false, num, x, y, z, n);
diff --git a/Geo/MTriangle.cpp b/Geo/MTriangle.cpp
index 5c21e2e540..136aefa50f 100644
--- a/Geo/MTriangle.cpp
+++ b/Geo/MTriangle.cpp
@@ -165,29 +165,32 @@ static void _myGetEdgeRep(MTriangle *t, int num, double *x, double *y, double *z
}
}
-void MTriangleN::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTriangleN::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTriangle::getEdgeRep(false, num, x, y, z, n);
}
-void MTriangle6::getEdgeRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTriangle6::getEdgeRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetEdgeRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTriangle::getEdgeRep(false, num, x, y, z, n);
}
-int MTriangle6::getNumFacesRep(bool curved) {
+int MTriangle6::getNumFacesRep(bool curved)
+{
return curved ? SQU(CTX::instance()->mesh.numSubEdges) : 1;
}
-int MTriangleN::getNumFacesRep(bool curved) {
+int MTriangleN::getNumFacesRep(bool curved)
+{
return curved ? SQU(CTX::instance()->mesh.numSubEdges) : 1;
}
static void _myGetFaceRep(MTriangle *t, int num, double *x, double *y, double *z,
SVector3 *n, int numSubEdges)
{
-
// on the first layer, we have (numSubEdges-1) * 2 + 1 triangles
// on the second layer, we have (numSubEdges-2) * 2 + 1 triangles
// on the ith layer, we have (numSubEdges-1-i) * 2 + 1 triangles
@@ -247,12 +250,14 @@ static void _myGetFaceRep(MTriangle *t, int num, double *x, double *y, double *z
z[0] = pnt1.z(); z[1] = pnt2.z(); z[2] = pnt3.z();
}
-void MTriangleN::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTriangleN::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTriangle::getFaceRep(false, num, x, y, z, n);
}
-void MTriangle6::getFaceRep(bool curved, int num, double *x, double *y, double *z, SVector3 *n)
+void MTriangle6::getFaceRep(bool curved, int num,
+ double *x, double *y, double *z, SVector3 *n)
{
if (curved) _myGetFaceRep(this, num, x, y, z, n, CTX::instance()->mesh.numSubEdges);
else MTriangle::getFaceRep(false, num, x, y, z, n);
--
GitLab