From aabbb504f3a615f3c5af34c0cd5c475071a2e146 Mon Sep 17 00:00:00 2001 From: Koen Hillewaert <koen.hillewaert@cenaero.be> Date: Fri, 27 Jun 2008 08:33:36 +0000 Subject: [PATCH] mistakenly reintroduced getEdgeNumRep and getEdgeRep ... sorry --- Geo/MElement.cpp | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp index c7bf66940e..92c620ddb3 100644 --- a/Geo/MElement.cpp +++ b/Geo/MElement.cpp @@ -1,4 +1,4 @@ -// $Id: MElement.cpp,v 1.75 2008-06-27 08:23:43 koen Exp $ +// $Id: MElement.cpp,v 1.76 2008-06-27 08:33:36 koen Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -874,42 +874,6 @@ void MTetrahedron::jac( double uu, double vv, double ww, double j[3][3]) { return jac(1,0,uu,vv,ww,j); } -int MTriangle6::getNumEdgesRep(){ return 3 * 6; } - -void MTriangle6::getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n) -{ - n[0] = n[1] = getFace(0).normal(); - int N = getNumEdgesRep() / 3; - if (num < N){ - SPoint3 pnt1, pnt2; - pnt((double)num / N, 0., 0,pnt1); - pnt((double)(num + 1) / N, 0., 0,pnt2); - x[0] = pnt1.x(); x[1] = pnt2.x(); - y[0] = pnt1.y(); y[1] = pnt2.y(); - z[0] = pnt1.z(); z[1] = pnt2.z(); - return; - } - if (num < 2 * N){ - SPoint3 pnt1, pnt2; - num -= N; - pnt(1. - (double)num / N, (double)num / N, 0,pnt1); - pnt(1. - (double)(num + 1) / N, (double)(num + 1) / N, 0,pnt2); - x[0] = pnt1.x(); x[1] = pnt2.x(); - y[0] = pnt1.y(); y[1] = pnt2.y(); - z[0] = pnt1.z(); z[1] = pnt2.z(); - return ; - } - { - SPoint3 pnt1, pnt2; - num -= 2 * N; - pnt(0, (double)num / N, 0,pnt1); - pnt(0, (double)(num + 1) / N, 0,pnt2); - x[0] = pnt1.x(); x[1] = pnt2.x(); - y[0] = pnt1.y(); y[1] = pnt2.y(); - z[0] = pnt1.z(); z[1] = pnt2.z(); - } -} - const int numSubEdges = 12; int MTriangleN::getNumFacesRep(){ return numSubEdges * numSubEdges; } -- GitLab