fix compile

Mesh/delaunay3d.cpp

@@ -11,8 +11,8 @@
 #include <vector>
 #include <algorithm>
 #include <math.h>
-#include <sys/time.h>
 #include "SBoundingBox3d.h"
+#include "OS.h"
 #include "delaunay3d_private.h"
 #include "delaunay3d.h"
 #include "MVertex.h"
@@ -305,24 +305,7 @@ double walltime( double *t0 )
 #ifdef _OPENMP
   return omp_get_wtime();
 #else
-  double mic, time;
-  double mega = 0.000001;
-  struct timeval tp;
-  struct timezone tzp;
-  static long base_sec = 0;
-  static long base_usec = 0;
-
-  (void) gettimeofday(&tp,&tzp);
-  if (base_sec == 0)
-    {
-      base_sec = tp.tv_sec;
-      base_usec = tp.tv_usec;
-    }
-
-  time = (double) (tp.tv_sec - base_sec);
-  mic = (double) (tp.tv_usec - base_usec);
-  time = (time + mic * mega) - *t0;
-  return(time);
+  return GetTimeInSeconds();
 #endif
 }
 
@@ -642,7 +625,7 @@ void delaunayTrgl (const unsigned int numThreads,
 #pragma omp barrier
       cavitySize[myThread] = 0;
       std::vector<Tet*> t(NPTS_AT_ONCE);
-      //	  clock_t c1 = clock();
+      //	  double c1 = Cpu();
       for (unsigned int K=0; K< NPTS_AT_ONCE; K++) {
 	vToAdd[K] = iPGlob <  locSizeK[K] ? &allocatedVerts[K][iPGlob] : NULL;
 	if(vToAdd[K]){
@@ -681,7 +664,7 @@ void delaunayTrgl (const unsigned int numThreads,
 	  }
 	}
       }
-      //      clock_t c1 = clock();
+      //      double c1 = Cpu();
       for (unsigned int K=0; K< NPTS_AT_ONCE; K++) {
 	if(vToAdd[K]){
 	  cavityContainer &cavityK = cavity[K];
@@ -719,7 +702,7 @@ void delaunayTrgl (const unsigned int numThreads,
 	else ok[K] = canWeProcessCavity (cavity[K], myThread, K);
       }
 
-      //            clock_t ck = clock();
+      //            double ck = Cpu();
       //      std::set<Tet*> touched;
       for (unsigned int K=0; K< NPTS_AT_ONCE; K++) {
 	if (ok[K]){

Mesh/delaunay_refinement.cpp

@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <math.h>
 #include "GmshMessage.h"
+#include "OS.h"
 #include "SPoint3.h"
 #include "delaunay3d_private.h"
 #include "delaunay3d.h"
@@ -388,40 +389,38 @@ void edgeBasedRefinement (const int numThreads,
 
     Msg::Info("----------------------------------- SATUR FILTR SORTH DELNY TIME  TETS");
 
-    clock_t __t__ = clock();
+    double __t__ = Cpu();
     while(1){
       char name[256];
       //      sprintf(name,"beforeRefinement%d.pos",iter);
       //      print (name,_tets);
       //      printf("ITER %3d\n",iter);
       std::vector<Vertex*> add;
-      clock_t t1 = clock();
+      double t1 = Cpu();
       saturateEdges (ec, _tets, numThreads, add, _fx, NULL);
       //      printf("%d points to add\n",add.size());
       //sprintf(name,"Points%d.pos",iter);
       //     _print (name,add);
-      clock_t t2 = clock();
+      double t2 = Cpu();
       filterVertices (numThreads, _filter, _vertices, add, _fx, NULL);
-      clock_t t3 = clock();
+      double t3 = Cpu();
       if (add.empty())break;
       std::vector<int> indices;
       SortHilbert(add, indices);
-      clock_t t4 = clock();
+      double t4 = Cpu();
       //      sprintf(name,"PointsFiltered%d.pos",iter);
       //      _print (name,add);
       delaunayTrgl (1,1,add.size(), _tets, &add);
-      clock_t t5 = clock();
+      double t5 = Cpu();
       Msg::Info("IT %3d %6d points added, timings %5.2f %5.2f %5.2f %5.2f %5.2f %5d",iter,add.size(),
-		(float)(t2-t1)/CLOCKS_PER_SEC,
-		(float)(t3-t2)/CLOCKS_PER_SEC,
-		(float)(t4-t3)/CLOCKS_PER_SEC,
-		(float)(t5-t4)/CLOCKS_PER_SEC,
-		(float)(t5-__t__)/CLOCKS_PER_SEC,
+		(t2-t1),
+		(t3-t2),
+		(t4-t3),
+		(t5-t4),
+		(t5-__t__),
 		_tets.size());
       iter++;
     }
     print ("afterRefinement.pos",_tets);
   }
 }
-
-