diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 3e4882a63719df7633ea61a41acee9e0f4ec1f6d..4338608e1554f64cd3c2be56df3aa4269521b364 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -642,16 +642,21 @@ bool GFaceCompound::parametrize() const bool success = orderVertices(_U0, _ordered, _coords); if(!success) {Msg::Error("Could not order vertices on boundary");exit(1);} - + + // Convex parametrization + if (_mapping == CONVEXCOMBINATION){ + Msg::Info("Parametrizing surface %d with 'convex map'", tag()); + fillNeumannBCS(); + parametrize(ITERU,CONVEXCOMBINATION); + parametrize(ITERV,CONVEXCOMBINATION); + } // Laplace parametrization - if (_mapping == HARMONIC){ - Msg::Info("Parametrizing surface %d with harmonic map'", tag()); + else if (_mapping == HARMONIC){ + Msg::Info("Parametrizing surface %d with 'harmonic map'", tag()); fillNeumannBCS(); parametrize(ITERU,HARMONIC); parametrize(ITERV,HARMONIC); printStuff(111); - //parametrize(ITERU,CONVEXCOMBINATION); - //parametrize(ITERV,CONVEXCOMBINATION); if (_type == MEANPLANE) checkOrientation(0, true); printStuff(222); } diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp index ac31bd366bfa5431c50fd8b5b703ad2d2083eede..c136d27b121b972be06409da0478adc40153744e 100644 --- a/Mesh/meshGFaceDelaunayInsertion.cpp +++ b/Mesh/meshGFaceDelaunayInsertion.cpp @@ -1132,7 +1132,7 @@ void optimalPointFrontalB (GFace *gf, intersectCurveSurfaceData data (gf,n1,n2,middle,d); //printf("----------------------------\n"); if(newton_fd(intersectCircleSurface, uvt, &data)){ - // printf("--- CONVERGED -- %12.5E -----------\n",d); + //printf("--- CONVERGED -- %12.5E -----------\n",d); newPoint[0] = uvt(0); newPoint[1] = uvt(1); return;