From 4cfd1ac9446e7a08563341fe14a31cb84ddbf4c9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 16 Jul 2010 09:12:56 +0000
Subject: [PATCH] re-enable dynamic libgmp
---
CMakeLists.txt | 2 +-
Mesh/meshGEdge.cpp | 12 ++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c534812957..a8057fa3f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -450,7 +450,7 @@ if(ENABLE_KBIPACK)
add_subdirectory(contrib/kbipack)
include_directories(contrib/kbipack)
set_config_option(HAVE_KBIPACK "Kbipack")
- find_library(GMP_LIB NAMES libgmp.a libgmp.dll.a)
+ find_library(GMP_LIB NAMES libgmp)
if(GMP_LIB)
set_config_option(HAVE_GMP "GMP")
list(APPEND EXTERNAL_LIBRARIES ${GMP_LIB})
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 1a542e40a3..b5ba3e4b13 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -97,14 +97,10 @@ static double F_Lc(GEdge *ge, double t)
lc_here = BGM_MeshSize(ge, t, 0, p.x(), p.y(), p.z());
SVector3 der = ge->firstDer(t);
- const double d = norm(der);
-
- SMetric3 metric (1./(lc_here*lc_here));
-
- // metric(0,0) = metric(0,0)*10000;
-
- double lSquared = dot (der,metric,der);
-
+ //const double d = norm(der);
+ //return d / lc_here;
+ SMetric3 metric(1. / (lc_here * lc_here));
+ double lSquared = dot(der, metric, der);
return sqrt(lSquared);
}
--
GitLab