------------------------------------------------------------
revno: 3940
committer: Bruno Chareyre <[email protected]>
timestamp: Wed 2014-05-07 11:30:47 +0200
message:
add missing #ifdef, breaking compilation without LINSOLV + better volume
computation
modified:
pkg/pfv/FlowEngine.ipp
--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'pkg/pfv/FlowEngine.ipp'
--- pkg/pfv/FlowEngine.ipp 2014-04-24 21:37:44 +0000
+++ pkg/pfv/FlowEngine.ipp 2014-05-07 09:30:47 +0000
@@ -98,6 +98,7 @@
}
///End compute flow and forces
timingDeltas->checkpoint ( "Applying Forces" );
+ #ifdef LINSOLV
int sleeping = 0;
if (multithread && !first) {
while (updateTriangulation && !backgroundCompleted) { /*cout<<"sleeping..."<<sleeping++<<endl;*/
@@ -133,6 +134,7 @@
ellapsedIter++;
}
} else {
+ #endif
if (updateTriangulation && !first) {
buildTriangulation (pZero, *solver);
initializeVolumes(*solver);
@@ -467,9 +469,9 @@
cell->info().volume() = newVol;
if (defTolerance>0) { //if the criterion is not used, then we skip these updates a save a LOT of time when Nthreads > 1
#pragma omp atomic
- totVol+=newVol;
+ totVol+=cell->info().volumeSign*newVol;
#pragma omp atomic
- totDVol+=abs(dVol);}
+ totDVol+=dVol;}
}
if (defTolerance>0) epsVolMax = totDVol/totVol;
for (unsigned int n=0; n<flow.imposedF.size();n++) {
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
