From 911c8766a80f1fabf65608a0b3e15e3f4f09b839 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Mon, 5 Mar 2012 15:08:32 +0000
Subject: [PATCH] Added convex combination choice in geo file
---
Geo/GFaceCompound.cpp | 15 ++++++++++-----
Mesh/meshGFaceDelaunayInsertion.cpp | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index 3e4882a637..4338608e15 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 ac31bd366b..c136d27b12 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;
--
GitLab