sync laptop

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;
 }
 

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);