Commit fd4bf71d by Anthony Royer

- Fix CreatePartitionTopology

- Fix hidden function in discreteFace
parent 63bcad0f
Pipeline #1191 passed with stage
in 15 minutes 52 seconds
......@@ -30,7 +30,8 @@ class discreteFace : public GFace {
void updateTopology(std::vector<triangulation*>&);
void split(triangulation*,std::vector<triangulation*>&,int);
void fillHoles(triangulation*);
void addTriangle(triangulation*,MTriangle*);
virtual void addTriangle(triangulation*,MTriangle*);
using GFace::addTriangle;
void complex_crossField();
void crossField();
using GFace::point;
......
......@@ -37,10 +37,6 @@ class ghostEdge : public discreteEdge {
bool haveMesh() const { return _haveMesh; }
void haveMesh(bool haveMesh) { _haveMesh = haveMesh; }
virtual std::map<MElement*, unsigned int> &getGhostCells() { return _ghostCells; }
// To make the hidden function visible in ghostEdge
using GEdge::addLine;
using GEdge::addElement;
void addLine(MLine *l, unsigned int onWhichPartition)
{
......@@ -54,6 +50,10 @@ class ghostEdge : public discreteEdge {
_ghostCells.insert(std::pair<MElement*, unsigned int>(e,onWhichPartition));
model()->addGhostCells(e,onWhichPartition);
}
// To make the hidden function visible in ghostEdge
using discreteEdge::addLine;
using discreteEdge::addElement;
};
#endif
......@@ -41,36 +41,36 @@ class ghostFace : public discreteFace {
bool haveMesh() const { return _haveMesh; }
void haveMesh(bool haveMesh) { _haveMesh = haveMesh; }
virtual std::map<MElement*, unsigned int> &getGhostCells() { return _ghostCells; }
// To make the hidden function visible in ghostFace
using GFace::addTriangle;
using GFace::addQuadrangle;
using GFace::addElement;
void addTriangle(MTriangle *t, unsigned int onWhichPartition)
virtual void addTriangle(MTriangle *t, unsigned int onWhichPartition)
{
GFace::addTriangle(t);
_ghostCells.insert(std::pair<MElement*, unsigned int>(t,onWhichPartition));
model()->addGhostCells(t,onWhichPartition);
}
void addQuadrangle(MQuadrangle *q, unsigned int onWhichPartition)
virtual void addQuadrangle(MQuadrangle *q, unsigned int onWhichPartition)
{
GFace::addQuadrangle(q);
_ghostCells.insert(std::pair<MElement*, unsigned int>(q,onWhichPartition));
model()->addGhostCells(q,onWhichPartition);
}
void addPolygon(MPolygon *p, unsigned int onWhichPartition)
virtual void addPolygon(MPolygon *p, unsigned int onWhichPartition)
{
GFace::addPolygon(p);
_ghostCells.insert(std::pair<MElement*, unsigned int>(p,onWhichPartition));
model()->addGhostCells(p,onWhichPartition);
}
void addElement(int type, MElement *e, unsigned int onWhichPartition)
virtual void addElement(int type, MElement *e, unsigned int onWhichPartition)
{
GFace::addElement(type, e);
_ghostCells.insert(std::pair<MElement*, unsigned int>(e,onWhichPartition));
model()->addGhostCells(e,onWhichPartition);
}
// To make the hidden function visible in ghostFace
using discreteFace::addTriangle;
using discreteFace::addQuadrangle;
using discreteFace::addElement;
};
#endif
......@@ -46,15 +46,6 @@ class ghostRegion : public discreteRegion {
void haveMesh(bool haveMesh) { _haveMesh = haveMesh; }
virtual std::map<MElement*, unsigned int> &getGhostCells() { return _ghostCells; }
// To make the hidden function visible in ghostRegion
using GRegion::addTetrahedron;
using GRegion::addHexahedron;
using GRegion::addPrism;
using GRegion::addPyramid;
using GRegion::addPolyhedron;
using GRegion::addTrihedron;
using GRegion::addElement;
void addTetrahedron(MTetrahedron *t, unsigned int onWhichPartition)
{
GRegion::addTetrahedron(t);
......@@ -97,6 +88,15 @@ class ghostRegion : public discreteRegion {
_ghostCells.insert(std::pair<MElement*, unsigned int>(e,onWhichPartition));
model()->addGhostCells(e,onWhichPartition);
}
// To make the hidden function visible in ghostRegion
using discreteRegion::addTetrahedron;
using discreteRegion::addHexahedron;
using discreteRegion::addPrism;
using discreteRegion::addPyramid;
using discreteRegion::addPolyhedron;
using discreteRegion::addTrihedron;
using discreteRegion::addElement;
};
#endif
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