Skip to content
Snippets Groups Projects
Commit 8f74391a authored by Amaury Johnen's avatar Amaury Johnen
Browse files

refactor

parent c746707a
No related branches found
No related tags found
No related merge requests found
...@@ -699,7 +699,7 @@ namespace ClosureGen { ...@@ -699,7 +699,7 @@ namespace ClosureGen {
} }
} }
else { else {
Msg::Error("FaceClosureFull not implemented for prisms of order %d", Msg::Warning("FaceClosureFull not implemented for prisms of order %d",
order); order);
} }
} }
...@@ -746,6 +746,13 @@ namespace ClosureGen { ...@@ -746,6 +746,13 @@ namespace ClosureGen {
} }
} }
void generateFaceClosurePyrFull(nodalBasis::clCont &closureFull,
std::vector<int> &closureRef, int order)
{
Msg::Warning("FaceClosureFull not implemented for pyramids of order %d",
order);
}
void generate2dEdgeClosure(nodalBasis::clCont &closure, int order, void generate2dEdgeClosure(nodalBasis::clCont &closure, int order,
int nNod = 3) int nNod = 3)
{ {
...@@ -859,6 +866,7 @@ nodalBasis::nodalBasis(int tag) ...@@ -859,6 +866,7 @@ nodalBasis::nodalBasis(int tag)
numFaces = 5; numFaces = 5;
points = gmshGeneratePointsPyramid(order, serendip); points = gmshGeneratePointsPyramid(order, serendip);
generateFaceClosurePyr(closures, order, serendip, points); generateFaceClosurePyr(closures, order, serendip, points);
generateFaceClosurePyrFull(fullClosures, closureRef, order);
break; break;
} }
} }
...@@ -942,3 +950,17 @@ bool nodalBasis::forwardRenumbering(const fullMatrix<double> &nodes, int *renum, ...@@ -942,3 +950,17 @@ bool nodalBasis::forwardRenumbering(const fullMatrix<double> &nodes, int *renum,
return renum; return renum;
} }
inline int nodalBasis::getClosureId(int iFace, int iSign, int iRot) const
{
return iFace + numFaces * (iSign == 1 ? 0 : 1) + 2 * numFaces * iRot;
}
inline void nodalBasis::breakClosureId(int i, int &iFace, int &iSign,
int &iRot) const
{
iFace = i % numFaces;
i = (i - iFace) / numFaces;
iSign = i % 2;
iRot = (i - iSign) / 2;
}
...@@ -81,18 +81,4 @@ public: ...@@ -81,18 +81,4 @@ public:
inline void breakClosureId(int i, int &iFace, int &iSign, int &iRot) const; inline void breakClosureId(int i, int &iFace, int &iSign, int &iRot) const;
}; };
inline int nodalBasis::getClosureId(int iFace, int iSign, int iRot) const
{
return iFace + numFaces * (iSign == 1 ? 0 : 1) + 2 * numFaces * iRot;
}
inline void nodalBasis::breakClosureId(int i, int &iFace, int &iSign,
int &iRot) const
{
iFace = i % numFaces;
i = (i - iFace) / numFaces;
iSign = i % 2;
iRot = (i - iSign) / 2;
}
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment