From b0426d0c2e362e85f6acb95de7dd0e256aefda0c Mon Sep 17 00:00:00 2001
From: Axel Modave <axel.modave@gmail.com>
Date: Sat, 11 Feb 2012 23:39:00 +0000
Subject: [PATCH] fix
---
Geo/GModel.cpp | 2 +-
Mesh/Generator.cpp | 4 +++-
Mesh/meshGFaceOptimize.cpp | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 7e470f7ed1..0c1041b5fc 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1304,7 +1304,7 @@ static void recurConnectMElementsByMFace(const MFace &f,
}
}
}
- printf("group pf %d elements found\n",group.size());
+ printf("group pf %d elements found\n",(int)group.size());
}
static void recurConnectMElementsByMFaceOld(const MFace &f,
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 876b24657c..e3218406c2 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -504,6 +504,7 @@ static void Mesh2D(GModel *m)
// collapseSmallEdges(*m);
+#if defined(HAVE_ANN)
//For centerline field, clean the cut parts
Centerline *center = 0;
FieldManager *fields = GModel::current()->getFields();
@@ -512,7 +513,8 @@ static void Mesh2D(GModel *m)
center = dynamic_cast<Centerline*> (myField);
}
if (center) center->cleanMesh();
-
+#endif
+
double t2 = Cpu();
CTX::instance()->meshTimer[1] = t2 - t1;
Msg::StatusBar(2, true, "Done meshing 2D (%g s)", CTX::instance()->meshTimer[1]);
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index 59fae4b688..8fe21eb77f 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -1279,7 +1279,7 @@ int postProcessExtraEdges (GFace *gf, std::vector<std::pair<MElement*,MElement*>
// so we recombine them in another way (adding a new node)
- printf("%d extra edges to be processed\n",toProcess.size());
+ printf("%d extra edges to be processed\n",(int)toProcess.size());
// return 1;
@@ -1309,7 +1309,7 @@ int postProcessExtraEdges (GFace *gf, std::vector<std::pair<MElement*,MElement*>
if(it != adj.end()){
const std::vector<MElement*> < = it->second;
// simply swap one edge
- printf("%d elements surrounding the common vertex\n",lt.size());
+ printf("%d elements surrounding the common vertex\n",(int)lt.size());
if (lt.size() == 3){
std::vector<MVertex*> VERTS = computeBoundingPoints (lt,common);
if (VERTS.size() != 5)return -1;
--
GitLab