diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp index 1195bb30b7b1e3ab1002eef8e367b09cd27b6c6a..213199516dcc68abad07a31d5b24b7a79d918f5c 100644 --- a/Geo/GFace.cpp +++ b/Geo/GFace.cpp @@ -960,7 +960,7 @@ GPoint GFace::closestPoint(const SPoint3 &queryPoint, const double initialGuess[ min_dist = dist; min_u = u; min_v = v; - GPoint pnt = point(min_u, min_v); + //GPoint pnt = point(min_u, min_v); } } } @@ -971,7 +971,7 @@ GPoint GFace::closestPoint(const SPoint3 &queryPoint, const double initialGuess[ initial_conditions[1] = min_v; // printf("Initial conditions : %f %f %12.5E\n", min_u, min_v,min_dist); - GPoint pnt = point(min_u, min_v); + // GPoint pnt = point(min_u, min_v); // printf("Initial conditions (point) : %f %f %f local (%g %g) Looking for %f %f %f DIST = %12.5E\n", // pnt.x(), pnt.y(), pnt.z(),min_u,min_v, // queryPoint.x(),queryPoint.y(),queryPoint.z(), diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 5d8ca46e4e451775e8cf1d8abba90fd2a8f3c3ad..b22b554f8ad00aa462f57fbd79403939d11ccde8 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -447,7 +447,7 @@ void GFaceCompound::printFillTris() const if (fillTris.size() > 0){ char name[256]; - std::list<GFace*>::const_iterator itf = _compound.begin(); + //std::list<GFace*>::const_iterator itf = _compound.begin(); sprintf(name, "fillTris-%d.pos", tag()); FILE * ftri = fopen(name,"w"); fprintf(ftri,"View \"\"{\n"); @@ -630,8 +630,8 @@ bool GFaceCompound::checkOverlap(std::vector<MVertex *> &vert) const has_overlap = true; MVertex *v1 = orderedLoop[i]; MVertex *v2 = orderedLoop[k]; - std::set<MVertex *>::iterator it1 = ov.find(v1); - std::set<MVertex *>::iterator it2 = ov.find(v2); + //std::set<MVertex *>::iterator it1 = ov.find(v1); + //std::set<MVertex *>::iterator it2 = ov.find(v2); vert.push_back(v1); vert.push_back(v2); Msg::Info("=== Overlap"); @@ -2247,30 +2247,30 @@ void GFaceCompound::computeHessianMapping() const SPoint3 uv = coordinates[vv[i]]; A(i,0) = uv.x()*uv.x(); A(i,1) = uv.x()*uv.y(); A(i,2) = uv.y()*uv.y(); A(i,3) = uv.x(); A(i,4) = uv.y(); A(i,5) = 1.; - bx(i) = vv[i]->x(); + bx(i) = vv[i]->x(); by(i) = vv[i]->y(); bz(i) = vv[i]->z(); } ATAx.gemmWithAtranspose(A,A,1.,0.); ATAy = ATAx; ATAz = ATAx; - A.multWithATranspose(bx,1.,0.,ATbx); - A.multWithATranspose(by,1.,0.,ATby); - A.multWithATranspose(bz,1.,0.,ATbz); + A.multWithATranspose(bx,1.,0.,ATbx); + A.multWithATranspose(by,1.,0.,ATby); + A.multWithATranspose(bz,1.,0.,ATbz); ATAx.luSolve(ATbx,coeffsx); ATAy.luSolve(ATby,coeffsy); ATAz.luSolve(ATbz,coeffsz); SPoint3 uv = coordinates[ver]; xuu[ver] = SVector3(2.*coeffsx(0),2.*coeffsy(0),2.*coeffsz(0)) ; xvv[ver] = SVector3(2.*coeffsx(2),2.*coeffsy(2),2.*coeffsz(2)) ; - xuv[ver] = SVector3(coeffsx(1), coeffsy(1),coeffsz(1)); - xu[ver] = SVector3(2.*coeffsx(0)*uv.x()+coeffsx(1)*uv.y()+coeffsx(3), - 2.*coeffsy(0)*uv.x()+coeffsy(1)*uv.y()+coeffsy(3), + xuv[ver] = SVector3(coeffsx(1), coeffsy(1),coeffsz(1)); + xu[ver] = SVector3(2.*coeffsx(0)*uv.x()+coeffsx(1)*uv.y()+coeffsx(3), + 2.*coeffsy(0)*uv.x()+coeffsy(1)*uv.y()+coeffsy(3), 2.*coeffsz(0)*uv.x()+coeffsz(1)*uv.y()+coeffsz(3)); - xv[ver] = SVector3(coeffsx(1)*uv.x()+2.*coeffsx(2)*uv.y()+coeffsx(4), + xv[ver] = SVector3(coeffsx(1)*uv.x()+2.*coeffsx(2)*uv.y()+coeffsx(4), coeffsy(1)*uv.x()+2.*coeffsy(2)*uv.y()+coeffsy(4), coeffsz(1)*uv.x()+2.*coeffsz(2)*uv.y()+coeffsz(4)); } - + #endif } static void GFaceCompoundBB(void *a, double*mmin, double*mmax)