diff --git a/Geo/MTetrahedron.cpp b/Geo/MTetrahedron.cpp index f112e6806500017fb86775902e3741615af9758a..1bbfd050a803c435df74061510f6a244a64314e9 100644 --- a/Geo/MTetrahedron.cpp +++ b/Geo/MTetrahedron.cpp @@ -121,11 +121,13 @@ void MTetrahedron::xyz2uvw(double xyz[3], double uvw[3]) const sys3x3(mat, b, uvw, &det); } -int MTetrahedron10::getNumEdgesRep(bool curved){ +int MTetrahedron10::getNumEdgesRep(bool curved) +{ return curved ? 6 * CTX::instance()->mesh.numSubEdges : 6; } -int MTetrahedronN::getNumEdgesRep(bool curved){ +int MTetrahedronN::getNumEdgesRep(bool curved) +{ return curved ? 6 * CTX::instance()->mesh.numSubEdges : 6; } @@ -175,11 +177,13 @@ void MTetrahedronN::getEdgeRep(bool curved, int num, else MTetrahedron::getEdgeRep(false, num, x, y, z, n); } -int MTetrahedronN::getNumFacesRep(bool curved) { +int MTetrahedronN::getNumFacesRep(bool curved) +{ return curved ? 4 * SQU(CTX::instance()->mesh.numSubEdges) : 4; } -int MTetrahedron10::getNumFacesRep(bool curved) { +int MTetrahedron10::getNumFacesRep(bool curved) +{ return curved ? 4 * SQU(CTX::instance()->mesh.numSubEdges) : 4; } diff --git a/Geo/MTriangle.cpp b/Geo/MTriangle.cpp index 534d60006c0c39da72417ba535d2237ec6ce72c8..36ab88f843f0d9782722015ec90d908ad0c31aa7 100644 --- a/Geo/MTriangle.cpp +++ b/Geo/MTriangle.cpp @@ -21,6 +21,8 @@ void MTriangle::getEdgeRep(bool curved, int num, double *x, double *y, double *z SVector3 *n) { // don't use MElement::_getEdgeRep: it's slow due to the creation of MFace + // could speed this up by computing and storing the normal only if num==0; we + // always call getEdgeRep in sequence MVertex *v0 = _v[edges_tri(num, 0)]; MVertex *v1 = _v[edges_tri(num, 1)]; x[0] = v0->x(); y[0] = v0->y(); z[0] = v0->z();