From 35b080c61af1fdf009be74eeb63e9ce6dc303fa3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 24 Sep 2009 19:46:07 +0000
Subject: [PATCH] sync laptop
---
Geo/GModel.cpp | 7 +++++++
contrib/DiscreteIntegration/Integration3D.cpp | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 8fdbe77d39..da749249b8 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -27,6 +27,7 @@
#include "Field.h"
#include "Generator.h"
#include "Context.h"
+#include "OS.h"
std::vector<GModel*> GModel::list;
int GModel::_current = -1;
@@ -1192,6 +1193,9 @@ GModel *GModel::buildCutGModel(gLevelset *ls)
std::map<int, std::map<int, std::string> > physicals[4];
std::map<int, MVertex*> vertexMap;
+ Msg::Info("Cutting mesh...");
+ double t1 = Cpu();
+
GModel *cutGM = buildCutMesh(this, ls, elements, vertexMap, physicals);
for(int i = 0; i < (int)(sizeof(elements) / sizeof(elements[0])); i++)
@@ -1204,6 +1208,9 @@ GModel *GModel::buildCutGModel(gLevelset *ls)
for(int i = 0; i < 4; i++)
cutGM->_storePhysicalTagsInEntities(i, physicals[i]);
+ double t2 = Cpu();
+
+ Msg::Info("Mesh cutting complete (%g s)", t2 - t1);
return cutGM;
}
diff --git a/contrib/DiscreteIntegration/Integration3D.cpp b/contrib/DiscreteIntegration/Integration3D.cpp
index 9b21033c04..517334a52d 100644
--- a/contrib/DiscreteIntegration/Integration3D.cpp
+++ b/contrib/DiscreteIntegration/Integration3D.cpp
@@ -222,7 +222,7 @@ int minimum(double *x, double *y, double *z, const int num) {
}
// Return the quality of a triangle
-double qualityTri(const DI_Point &p0, const DI_Point p1, const DI_Point &p2) {
+double qualityTri(const DI_Point &p0, const DI_Point &p1, const DI_Point &p2) {
double a = distance(p0, p1);
double b = distance(p0, p2);
double c = distance(p1, p2);
--
GitLab