Commit 7338fe7b by Amaury Johnen

fix compile

parent a33783d4
Pipeline #331 passed with stage
in 9 minutes 4 seconds
......@@ -16,7 +16,7 @@
#include "qualityMeasures.h"
#endif
std::map<int, indicesReversed> MHexahedronN::_order2indicesReversed;
std::map<int, indicesReversed> MHexahedronN::_order2indicesReversedHex;
void MHexahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
......@@ -411,7 +411,7 @@ int MHexahedronN::getNumFacesRep(bool curved)
CTX::instance()->mesh.numSubEdges * 2) : 12;
}
void _getIndicesReversed(int order, indicesReversed &indices)
void _getIndicesReversedHex(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsHexahedron(order);
......@@ -432,12 +432,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MHexahedronN::reverse()
{
std::map<int, indicesReversed>::iterator it;
it = _order2indicesReversed.find(_order);
if (it == _order2indicesReversed.end()) {
it = _order2indicesReversedHex.find(_order);
if (it == _order2indicesReversedHex.end()) {
indicesReversed indices;
_getIndicesReversed(_order, indices);
_order2indicesReversed[_order] = indices;
it = _order2indicesReversed.find(_order);
_getIndicesReversedHex(_order, indices);
_order2indicesReversedHex[_order] = indices;
it = _order2indicesReversedHex.find(_order);
}
indicesReversed &indices = it->second;
......
......@@ -476,7 +476,7 @@ class MHexahedron27 : public MHexahedron {
typedef std::vector<int> indicesReversed;
class MHexahedronN : public MHexahedron {
static std::map<int, indicesReversed> _order2indicesReversed;
static std::map<int, indicesReversed> _order2indicesReversedHex;
protected:
const char _order;
......
......@@ -13,7 +13,7 @@
#include "qualityMeasures.h"
#endif
std::map<int, indicesReversed> MPrismN::_order2indicesReversed;
std::map<int, indicesReversed> MPrismN::_order2indicesReversedPri;
void MPrism::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
......@@ -550,7 +550,7 @@ double MPrism::gammaShapeMeasure()
#endif
}
void _getIndicesReversed(int order, indicesReversed &indices)
void _getIndicesReversedPri(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsPrism(order);
......@@ -571,12 +571,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MPrismN::reverse()
{
std::map<int, indicesReversed>::iterator it;
it = _order2indicesReversed.find(_order);
if (it == _order2indicesReversed.end()) {
it = _order2indicesReversedPri.find(_order);
if (it == _order2indicesReversedPri.end()) {
indicesReversed indices;
_getIndicesReversed(_order, indices);
_order2indicesReversed[_order] = indices;
it = _order2indicesReversed.find(_order);
_getIndicesReversedPri(_order, indices);
_order2indicesReversedPri[_order] = indices;
it = _order2indicesReversedPri.find(_order);
}
indicesReversed &indices = it->second;
......
......@@ -401,7 +401,7 @@ class MPrism18 : public MPrism {
typedef std::vector<int> indicesReversed;
class MPrismN : public MPrism {
static std::map<int, indicesReversed> _order2indicesReversed;
static std::map<int, indicesReversed> _order2indicesReversedPri;
protected:
std::vector<MVertex *> _vs;
......
......@@ -10,7 +10,7 @@
#include "BasisFactory.h"
#include "pointsGenerators.h"
std::map<int, indicesReversed> MPyramidN::_order2indicesReversed;
std::map<int, indicesReversed> MPyramidN::_order2indicesReversedPyr;
int MPyramid::getVolumeSign()
{
......@@ -335,7 +335,7 @@ void MPyramidN::getFaceRep(bool curved, int num,
else MPyramid::getFaceRep(false, num, x, y, z, n);
}
void _getIndicesReversed(int order, indicesReversed &indices)
void _getIndicesReversedPyr(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsPyramid(order);
......@@ -356,12 +356,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MPyramidN::reverse()
{
std::map<int, indicesReversed>::iterator it;
it = _order2indicesReversed.find(_order);
if (it == _order2indicesReversed.end()) {
it = _order2indicesReversedPyr.find(_order);
if (it == _order2indicesReversedPyr.end()) {
indicesReversed indices;
_getIndicesReversed(_order, indices);
_order2indicesReversed[_order] = indices;
it = _order2indicesReversed.find(_order);
_getIndicesReversedPyr(_order, indices);
_order2indicesReversedPyr[_order] = indices;
it = _order2indicesReversedPyr.find(_order);
}
indicesReversed &indices = it->second;
......
......@@ -222,7 +222,7 @@ class MPyramid : public MElement {
typedef std::vector<int> indicesReversed;
class MPyramidN : public MPyramid {
static std::map<int, indicesReversed> _order2indicesReversed;
static std::map<int, indicesReversed> _order2indicesReversedPyr;
protected:
std::vector<MVertex*> _vs;
......
......@@ -18,7 +18,7 @@
#define SQU(a) ((a)*(a))
std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversed;
std::map<int, indicesReversed> MTetrahedronN::_order2indicesReversedTet;
void MTetrahedron::getEdgeRep(bool curved, int num, double *x, double *y, double *z,
SVector3 *n)
......@@ -318,7 +318,7 @@ void MTetrahedron::getFaceInfo(const MFace &face, int &ithFace, int &sign, int &
Msg::Error("Could not get face information for tetrahedron %d", getNum());
}
void _getIndicesReversed(int order, indicesReversed &indices)
void _getIndicesReversedTet(int order, indicesReversed &indices)
{
fullMatrix<double> ref = gmshGenerateMonomialsTetrahedron(order);
......@@ -339,12 +339,12 @@ void _getIndicesReversed(int order, indicesReversed &indices)
void MTetrahedronN::reverse()
{
std::map<int, indicesReversed>::iterator it;
it = _order2indicesReversed.find(_order);
if (it == _order2indicesReversed.end()) {
it = _order2indicesReversedTet.find(_order);
if (it == _order2indicesReversedTet.end()) {
indicesReversed indices;
_getIndicesReversed(_order, indices);
_order2indicesReversed[_order] = indices;
it = _order2indicesReversed.find(_order);
_getIndicesReversedTet(_order, indices);
_order2indicesReversedTet[_order] = indices;
it = _order2indicesReversedTet.find(_order);
}
indicesReversed &indices = it->second;
......
......@@ -312,7 +312,7 @@ class MTetrahedron10 : public MTetrahedron {
typedef std::vector<int> indicesReversed;
class MTetrahedronN : public MTetrahedron {
static std::map<int, indicesReversed> _order2indicesReversed;
static std::map<int, indicesReversed> _order2indicesReversedTet;
protected:
std::vector<MVertex *> _vs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment