From 9468f0e9859d0e45360e1ef48cb536ce000aa45f Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sat, 2 Mar 2013 13:12:58 +0000 Subject: [PATCH] missing setVertex --- Geo/MHexahedron.h | 1 + Geo/MLine.h | 1 + Geo/MPoint.h | 1 + Geo/MPrism.h | 2 +- Geo/MPyramid.h | 5 +++-- Geo/MQuadrangle.h | 2 +- Geo/MTetrahedron.h | 1 + Geo/MTriangle.h | 2 +- 8 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h index 1d4ba71992..7abda6995d 100644 --- a/Geo/MHexahedron.h +++ b/Geo/MHexahedron.h @@ -57,6 +57,7 @@ class MHexahedron : public MElement { virtual int getDim() const { return 3; } virtual int getNumVertices() const { return 8; } virtual MVertex *getVertex(int num){ return _v[num]; } + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual const nodalBasis* getFunctionSpace(int o=-1) const; virtual const JacobianBasis* getJacobianFuncSpace(int o=-1) const; virtual MVertex *getVertexDIFF(int num) diff --git a/Geo/MLine.h b/Geo/MLine.h index 568528919e..d548a13882 100644 --- a/Geo/MLine.h +++ b/Geo/MLine.h @@ -38,6 +38,7 @@ class MLine : public MElement { virtual int getDim() const { return 1; } virtual int getNumVertices() const { return 2; } virtual MVertex *getVertex(int num){ return _v[num]; } + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual double getInnerRadius(); // half-length of segment line virtual double getLength(); // length of segment line virtual double getVolume(); diff --git a/Geo/MPoint.h b/Geo/MPoint.h index 8c8a43f89c..75a6dfa20d 100644 --- a/Geo/MPoint.h +++ b/Geo/MPoint.h @@ -31,6 +31,7 @@ class MPoint : public MElement { virtual int getDim() const { return 0; } virtual int getNumVertices() const { return 1; } virtual MVertex *getVertex(int num){ return _v[0]; } + virtual void setVertex(int num, MVertex *v){ _v[0] = v; } virtual int getNumEdges(){ return 0; } virtual MEdge getEdge(int num){ return MEdge(); } virtual int getNumEdgesRep(){ return 0; } diff --git a/Geo/MPrism.h b/Geo/MPrism.h index fd668d2b13..ad0a5ee529 100644 --- a/Geo/MPrism.h +++ b/Geo/MPrism.h @@ -64,7 +64,7 @@ class MPrism : public MElement { virtual int getNumVertices() const { return 6; } virtual double getInnerRadius(); virtual MVertex *getVertex(int num){ return _v[num]; } - virtual void setVertex(int num, MVertex *v){_v[num]=v;} + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual int getNumEdges(){ return 9; } virtual MEdge getEdge(int num) { diff --git a/Geo/MPyramid.h b/Geo/MPyramid.h index 60fe3e0716..c5111ea20f 100644 --- a/Geo/MPyramid.h +++ b/Geo/MPyramid.h @@ -67,6 +67,7 @@ class MPyramid : public MElement { virtual int getDim() const { return 3; } virtual int getNumVertices() const { return 5; } virtual MVertex *getVertex(int num){ return _v[num]; } + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual const nodalBasis* getFunctionSpace(int o=-1) const; virtual const JacobianBasis* getJacobianFuncSpace(int o=-1) const; virtual int getNumEdges(){ return 8; } @@ -244,7 +245,7 @@ class MPyramidN : public MPyramid { virtual int getNumVertices() const { return 5 + _vs.size(); } virtual MVertex *getVertex(int num){ return num < 5 ? _v[num] : _vs[num - 5]; } virtual int getNumEdgeVertices() const { return 8 * (_order - 1); } - virtual int getNumFaceVertices() const + virtual int getNumFaceVertices() const { return (_order-1)*(_order-1) + 4 * ((_order - 1) * (_order - 2)) / 2; } @@ -260,7 +261,7 @@ class MPyramidN : public MPyramid { { int j = 3; if (num == 4) { - j = 4; + j = 4; v.resize(_order * _order); } else { diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h index e4502d62e8..bd6ee6056c 100644 --- a/Geo/MQuadrangle.h +++ b/Geo/MQuadrangle.h @@ -56,7 +56,7 @@ class MQuadrangle : public MElement { virtual int getDim() const { return 2; } virtual int getNumVertices() const { return 4; } virtual MVertex *getVertex(int num){ return _v[num]; } - virtual void setVertex(int num, MVertex *v){_v[num]=v;} + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual MVertex *getVertexDIFF(int num) { static const int map[4] = {0, 1, 3, 2}; diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h index d5d88250ce..2dbb91c39a 100644 --- a/Geo/MTetrahedron.h +++ b/Geo/MTetrahedron.h @@ -60,6 +60,7 @@ class MTetrahedron : public MElement { virtual int getDim() const { return 3; } virtual int getNumVertices() const { return 4; } virtual MVertex *getVertex(int num){ return _v[num]; } + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual int getNumEdges(){ return 6; } virtual MEdge getEdge(int num) { diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h index 15ec802c85..0adf7c219c 100644 --- a/Geo/MTriangle.h +++ b/Geo/MTriangle.h @@ -57,7 +57,7 @@ class MTriangle : public MElement { virtual double angleShapeMeasure(); virtual int getNumVertices() const { return 3; } virtual MVertex *getVertex(int num){ return _v[num]; } - virtual void setVertex(int num, MVertex *v){_v[num]=v;} + virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual void xyz2uvw(double xyz[3], double uvw[3]); virtual MVertex *getOtherVertex(MVertex *v1, MVertex *v2) { -- GitLab