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

pp

parent 03988f55
Branches
Tags
No related merge requests found
......@@ -303,12 +303,12 @@ void MElement::xyz2uvw(double xyz[3], double uvw[3])
}
double inv[3][3];
inv3x3(jac, inv);
double un = uvw[0] +
inv[0][0] * (xyz[0] - xn) + inv[1][0] * (xyz[1] - yn) + inv[2][0] * (xyz[2] - zn);
double vn = uvw[1] +
inv[0][1] * (xyz[0] - xn) + inv[1][1] * (xyz[1] - yn) + inv[2][1] * (xyz[2] - zn) ;
double wn = uvw[2] +
inv[0][2] * (xyz[0] - xn) + inv[1][2] * (xyz[1] - yn) + inv[2][2] * (xyz[2] - zn) ;
double un = uvw[0] + inv[0][0] * (xyz[0] - xn) +
inv[1][0] * (xyz[1] - yn) + inv[2][0] * (xyz[2] - zn);
double vn = uvw[1] + inv[0][1] * (xyz[0] - xn) +
inv[1][1] * (xyz[1] - yn) + inv[2][1] * (xyz[2] - zn);
double wn = uvw[2] + inv[0][2] * (xyz[0] - xn) +
inv[1][2] * (xyz[1] - yn) + inv[2][2] * (xyz[2] - zn);
error = sqrt(SQU(un - uvw[0]) + SQU(vn - uvw[1]) + SQU(wn - uvw[2]));
uvw[0] = un;
uvw[1] = vn;
......
......@@ -281,7 +281,6 @@ static void getAllParameters(MVertex *v, GFace *gf, std::vector<SPoint2> &params
bool reparamMeshEdgeOnFace(MVertex *v1, MVertex *v2, GFace *gf,
SPoint2 &param1, SPoint2 &param2)
{
std::vector<SPoint2> p1, p2;
getAllParameters(v1, gf, p1);
getAllParameters(v2, gf, p2);
......@@ -328,8 +327,6 @@ bool reparamMeshEdgeOnFace(MVertex *v1, MVertex *v2, GFace *gf,
bool reparamMeshVertexOnFace(const MVertex *v, const GFace *gf, SPoint2 &param)
{
if (gf->geomType() == GEntity::CompoundSurface &&
v->onWhat()->dim() < 2){
GFaceCompound *gfc = (GFaceCompound*) gf;
......
......@@ -42,7 +42,7 @@ class MVertex{
// the geometrical entity the vertex is associated with
GEntity *_ge;
public :
public:
MVertex(double x, double y, double z, GEntity *ge=0, int num=0);
virtual ~MVertex(){}
......@@ -113,7 +113,7 @@ class MVertex{
class MEdgeVertex : public MVertex{
protected:
double _u, _lc;
public :
public:
MEdgeVertex(double x, double y, double z, GEntity *ge, double u, double lc = -1.0,
int num = 0)
: MVertex(x, y, z, ge,num), _u(u), _lc(lc)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment