Skip to content
Snippets Groups Projects
Commit 9103d97b authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

no need for getCoordinates: just getVertex is OK :-)

parent e7c0a867
Branches
Tags
No related merge requests found
...@@ -82,10 +82,6 @@ class MElement ...@@ -82,10 +82,6 @@ class MElement
// get the vertices // get the vertices
virtual int getNumVertices() const = 0; virtual int getNumVertices() const = 0;
virtual MVertex *getVertex(int num) = 0; virtual MVertex *getVertex(int num) = 0;
virtual void getCoordinates(int num, double c[3]) const
{
c[0] = 0.; c[1] = 0.; c[2] = 0.;
}
// get the vertex using the I-deas UNV ordering // get the vertex using the I-deas UNV ordering
virtual MVertex *getVertexUNV(int num){ return getVertex(num); } virtual MVertex *getVertexUNV(int num){ return getVertex(num); }
......
...@@ -357,7 +357,8 @@ void MTriangleBorder::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) c ...@@ -357,7 +357,8 @@ void MTriangleBorder::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) c
{ {
double uvw[3][3]; double uvw[3][3];
for(int j = 0; j < 3; j++) { for(int j = 0; j < 3; j++) {
double xyz[3]; getCoordinates(j, xyz); MVertex *v = getVertex(j);
double xyz[3] = {v->x(), v->y(), v->z()};
getParent()->xyz2uvw(xyz, uvw[j]); getParent()->xyz2uvw(xyz, uvw[j]);
} }
MVertex v0(uvw[0][0], uvw[0][1], uvw[0][2]); MVertex v0(uvw[0][0], uvw[0][1], uvw[0][2]);
...@@ -386,7 +387,8 @@ void MLineBorder::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) const ...@@ -386,7 +387,8 @@ void MLineBorder::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) const
{ {
double uvw[2][3]; double uvw[2][3];
for(int j = 0; j < 2; j++) { for(int j = 0; j < 2; j++) {
double xyz[3]; getCoordinates(j, xyz); MVertex *v = getVertex(j);
double xyz[3] = {v->x(), v->y(), v->z()};
getParent()->xyz2uvw(xyz, uvw[j]); getParent()->xyz2uvw(xyz, uvw[j]);
} }
MVertex v0(uvw[0][0], uvw[0][1], uvw[0][2]); MVertex v0(uvw[0][0], uvw[0][1], uvw[0][2]);
......
...@@ -37,11 +37,6 @@ class MLine : public MElement { ...@@ -37,11 +37,6 @@ class MLine : public MElement {
virtual int getDim(){ return 1; } virtual int getDim(){ return 1; }
virtual int getNumVertices() const { return 2; } virtual int getNumVertices() const { return 2; }
virtual MVertex *getVertex(int num){ return _v[num]; } virtual MVertex *getVertex(int num){ return _v[num]; }
virtual void getCoordinates (int num, double c[3]) const {
c[0] = _v[num]->x();
c[1] = _v[num]->y();
c[2] = _v[num]->z();
}
virtual int getNumEdges(){ return 1; } virtual int getNumEdges(){ return 1; }
virtual MEdge getEdge(int num){ return MEdge(_v[0], _v[1]); } virtual MEdge getEdge(int num){ return MEdge(_v[0], _v[1]); }
virtual int getNumEdgesRep(){ return 1; } virtual int getNumEdgesRep(){ return 1; }
......
...@@ -54,11 +54,6 @@ class MTriangle : public MElement { ...@@ -54,11 +54,6 @@ class MTriangle : public MElement {
virtual double distoShapeMeasure(); virtual double distoShapeMeasure();
virtual int getNumVertices() const { return 3; } virtual int getNumVertices() const { return 3; }
virtual MVertex *getVertex(int num){ return _v[num]; } virtual MVertex *getVertex(int num){ return _v[num]; }
virtual void getCoordinates (int num, double c[3]) const {
c[0] = _v[num]->x();
c[1] = _v[num]->y();
c[2] = _v[num]->z();
}
virtual MVertex *getVertexMED(int num) virtual MVertex *getVertexMED(int num)
{ {
static const int map[3] = {0, 2, 1}; static const int map[3] = {0, 2, 1};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment