From 5cede0eecfdcdbf516113cfb76f6e8f190a9119d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 30 Nov 2016 11:05:32 +0000
Subject: [PATCH] remove debug prints
---
Geo/GModel.cpp | 7 +------
Geo/discreteEdge.cpp | 15 +++++++--------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index b18f2fceed..73fd1ff9f3 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1331,12 +1331,10 @@ static void _associateEntityWithElementVertices(GEntity *ge, std::vector<T*> &el
void GModel::_createGeometryOfDiscreteEntities(bool force)
{
- printf("%d vertices\n",getNumVertices());
if (CTX::instance()->meshDiscrete){
createTopologyFromMeshNew ();
exportDiscreteGEOInternals();
}
- printf("%d vertices\n",getNumVertices());
if (force || CTX::instance()->meshDiscrete){
Msg::Info("Creating the geometry of discrete curves");
@@ -1347,7 +1345,6 @@ void GModel::_createGeometryOfDiscreteEntities(bool force)
}
}
}
- printf("%d vertices\n",getNumVertices());
if (CTX::instance()->meshDiscrete){
Msg::Info("Creating the geometry of discrete surfaces");
@@ -1358,10 +1355,8 @@ void GModel::_createGeometryOfDiscreteEntities(bool force)
}
}
}
- printf("%d vertices\n",getNumVertices());
}
-
void GModel::_associateEntityWithMeshVertices()
{
// loop on regions, then on faces, edges and vertices and store the
@@ -2283,7 +2278,7 @@ void GModel::createTopologyFromMesh(int ignoreHoles)
makeDiscreteFacesSimplyConnected();
// TEST !!!!!!!!
- if (0){
+ if (CTX::instance()->meshDiscrete){
createTopologyFromMeshNew ();
exportDiscreteGEOInternals();
double t2 = Cpu();
diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp
index 8af4bdf1e9..8d90d4798a 100644
--- a/Geo/discreteEdge.cpp
+++ b/Geo/discreteEdge.cpp
@@ -79,7 +79,7 @@ void discreteEdge::orderMLines()
else boundv.erase(it2);
}
// find the first MLine and erase it from the list segments
-
+
MLine *firstLine;
if (boundv.size() == 2){ // non periodic
firstLine = (boundv.begin())->second;
@@ -143,7 +143,7 @@ void discreteEdge::orderMLines()
//lines is now a list of ordered MLines
lines = _m;
-
+
//mesh_vertices
mesh_vertices.clear();
for (unsigned int i = 0; i < lines.size()-1; ++i){
@@ -155,7 +155,7 @@ void discreteEdge::orderMLines()
mesh_vertices.end()) mesh_vertices.push_back(v2);
}
-
+
//special case reverse orientation
if (lines.size() < 2) return;
if (_orientation[0] && lines[0]->getVertex(1) != lines[1]->getVertex(1)
@@ -216,7 +216,6 @@ void discreteEdge::setBoundVertices()
v1 = bound_vertices[1];
}
else if (boundv.size() == 0){
- printf("closed loop for discrete Edge =%d \n", this->tag());
GVertex* bound_vertex;
std::vector<MLine*>::const_iterator it = lines.begin();
MVertex* vE = (*it)->getVertex(0);
@@ -368,7 +367,7 @@ void discreteEdge::parametrize(std::map<MVertex*, MVertex*>& old2new)
_pars.push_back(i);
}
}
-
+
std::vector<MVertex* > newVertices;
std::vector<MLine*> newLines;
@@ -396,7 +395,7 @@ void discreteEdge::parametrize(std::map<MVertex*, MVertex*>& old2new)
mesh_vertices = newVertices;
lines.clear();
- lines = newLines;
+ lines = newLines;
}
@@ -455,7 +454,7 @@ GPoint discreteEdge::point(double par) const
int iEdge;
if(!getLocalParameter(par, iEdge, tLoc)) return GPoint();
-
+
double x, y, z;
MVertex *vB = discrete_lines[iEdge]->getVertex(0);
MVertex *vE = discrete_lines[iEdge]->getVertex(1);
@@ -469,7 +468,7 @@ GPoint discreteEdge::point(double par) const
SVector3 discreteEdge::firstDer(double par) const
{
-
+
double tLoc;
int iEdge;
if(!getLocalParameter(par, iEdge, tLoc)) return SVector3();
--
GitLab