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

fix win compile

parent 2532407c
Branches
Tags
No related merge requests found
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "linearSystemCSR.h" #include "linearSystemCSR.h"
#include "linearSystemFull.h" #include "linearSystemFull.h"
#include "linearSystemPETSc.h" #include "linearSystemPETSc.h"
#include "OS.h"
#define SQU(a) ((a)*(a)) #define SQU(a) ((a)*(a))
...@@ -614,18 +615,18 @@ double highOrderTools::apply_incremental_displacement (double max_incr, ...@@ -614,18 +615,18 @@ double highOrderTools::apply_incremental_displacement (double max_incr,
//+++++++++ Assembly & Solve ++++++++++++++++++++++++++++++++++++ //+++++++++ Assembly & Solve ++++++++++++++++++++++++++++++++++++
if (myAssembler.sizeOfR()){ if (myAssembler.sizeOfR()){
// assembly of the elasticity term on the // assembly of the elasticity term on the
clock_t t1 = clock(); double t1 = Cpu();
for (unsigned int i = 0; i < v.size(); i++){ for (unsigned int i = 0; i < v.size(); i++){
SElement se(v[i]); SElement se(v[i]);
if (mixed)El_mixed.addToMatrix(myAssembler, &se); if (mixed)El_mixed.addToMatrix(myAssembler, &se);
else El.addToMatrix(myAssembler, &se); else El.addToMatrix(myAssembler, &se);
} }
clock_t t2 = clock(); double t2 = Cpu();
// solve the system // solve the system
printf("coucou3 %12.5E\n",(double)(t2-t1)/CLOCKS_PER_SEC); printf("coucou3 %12.5E\n", t2-t1);
lsys->systemSolve(); lsys->systemSolve();
clock_t t3 = clock(); double t3 = Cpu();
printf("coucou4 %12.5E\n",(double)(t3-t2)/CLOCKS_PER_SEC); printf("coucou4 %12.5E\n", t3-t2);
} }
//+++++++++ Move vertices @ maximum ++++++++++++++++++++++++++++++++++++ //+++++++++ Move vertices @ maximum ++++++++++++++++++++++++++++++++++++
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment