Skip to content
Snippets Groups Projects
Commit ff9695d8 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix compile on win32

parent c525f899
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "highOrderTools.h" #include "highOrderTools.h"
#include "OptHomMesh.h" #include "OptHomMesh.h"
#include "OptHOM.h" #include "OptHOM.h"
#include "OS.h"
#include <stack> #include <stack>
#ifdef HAVE_FLTK #ifdef HAVE_FLTK
...@@ -374,7 +375,7 @@ static std::vector<std::set<MElement*> > splitConnex(const std::set<MElement*> & ...@@ -374,7 +375,7 @@ static std::vector<std::set<MElement*> > splitConnex(const std::set<MElement*> &
void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p) void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
{ {
clock_t t1 = clock(); double t1 = Cpu();
int samples = 30; int samples = 30;
...@@ -404,7 +405,7 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p) ...@@ -404,7 +405,7 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
double distMaxBND, distAvgBND, minJac, maxJac; double distMaxBND, distAvgBND, minJac, maxJac;
if (p.dim == 2) { if (p.dim == 2) {
clock_t tf1 = clock();; double tf1 = Cpu();;
for (GModel::fiter itf = gm->firstFace(); itf != gm->lastFace(); ++itf) { for (GModel::fiter itf = gm->firstFace(); itf != gm->lastFace(); ++itf) {
if (p.onlyVisible && !(*itf)->getVisibility())continue; if (p.onlyVisible && !(*itf)->getVisibility())continue;
int ITER = 0; int ITER = 0;
...@@ -462,7 +463,7 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p) ...@@ -462,7 +463,7 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
// ossF << "final_" << (*itf)->tag() << ".msh"; // ossF << "final_" << (*itf)->tag() << ".msh";
// temp.mesh.writeMSH(ossF.str().c_str()); // temp.mesh.writeMSH(ossF.str().c_str());
} }
double DTF = (double)(clock()-tf1) / CLOCKS_PER_SEC; double DTF = Cpu()-tf1;
if (p.SUCCESS == 1){ if (p.SUCCESS == 1){
OptHomMessage("Optimization succeeded (CPU %g sec)",DTF); OptHomMessage("Optimization succeeded (CPU %g sec)",DTF);
} }
...@@ -528,6 +529,6 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p) ...@@ -528,6 +529,6 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
// temp.mesh.writeMSH("final.msh"); // temp.mesh.writeMSH("final.msh");
} }
} }
clock_t t2 = clock(); double t2 = Cpu();
p.CPU = (double)(t2-t1)/CLOCKS_PER_SEC; p.CPU = t2-t1;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment