diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp index f5d8b9c5c75444e8712612af76f2d0c261600508..3f16f02dc3e90208ca5ebaebb9ec865fbc73ee4e 100644 --- a/Geo/MElement.cpp +++ b/Geo/MElement.cpp @@ -166,7 +166,7 @@ double MElement::getVolume() double vol = 0.; for (int i = 0; i < npts; i++){ vol += getJacobianDeterminant(pts[i].pt[0], pts[i].pt[1], pts[i].pt[2]) - * pts[i].weight; + * pts[i].weight; } return vol; } @@ -547,19 +547,19 @@ double MElement::integrateCirc(double val[], int edge, int pOrder, int order) Msg::Error("No edge %d for this element", edge); return 0; } - + std::vector<MVertex*> v; getEdgeVertices(edge, v); MElementFactory f; int type = getLineType(getPolynomialOrder()); MElement* ee = f.create(type, v); - + double intv[3]; for(int i = 0; i < 3; i++){ intv[i] = ee->integrate(&val[i], pOrder, 3, order); - } + } delete ee; - + double t[3] = {v[1]->x() - v[0]->x(), v[1]->y() - v[0]->y(), v[1]->z() - v[0]->z()}; norme(t); double result; @@ -582,7 +582,7 @@ double MElement::integrateFlux(double val[], int face, int pOrder, int order) case TYPE_TET : type = getTriangleType(getPolynomialOrder()); break; case TYPE_QUA : type = getQuadType(getPolynomialOrder()); break; case TYPE_HEX : type = getQuadType(getPolynomialOrder()); break; - case TYPE_PYR : + case TYPE_PYR : if(face < 4) type = getTriangleType(getPolynomialOrder()); else type = getQuadType(getPolynomialOrder()); break; @@ -1131,7 +1131,7 @@ MElement *MElement::copy(std::map<int, MVertex*> &vertexMap, newParent = it->second; parent = newParent; } - + MElementFactory factory; MElement *newEl = factory.create(eType, vmv, getNum(), _partition, ownsParent(), parent); diff --git a/Geo/MElement.h b/Geo/MElement.h index 2a901bb434be4d1d61a87e9ff383fbeee747e744..f4711dc1ba87d6d6e855bdd9e085083f82ebd106 100644 --- a/Geo/MElement.h +++ b/Geo/MElement.h @@ -80,13 +80,13 @@ class MElement verts.resize(N); for(int i = 0; i < N; i++) verts[i] = getVertex(i); } - virtual void setVertex(int num, MVertex *v) + virtual void setVertex(int num, MVertex *v) { Msg::Error("Vertex set not supported for this element"); } // give an MVertex as input and get its local number - virtual void getVertexInfo(const MVertex *vertex, int &ithVertex) const + virtual void getVertexInfo(const MVertex *vertex, int &ithVertex) const { Msg::Error("Vertex information not available for this element"); } @@ -188,7 +188,7 @@ class MElement // otherwise get the minimum radius of all the circles/spheres // tangent to the most boundaries of the element. virtual double getInnerRadius(){ return 0.; } - + // get the radius of the circumscribed circle/sphere if it exists, // otherwise get the maximum radius of all the circles/spheres // tangent to the most boundaries of the element.