yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 4161: remove a temporary fix for https://bugs.launchpad.net/yade/+bug/923929, after better fix in https...

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 15 Sep 2014 11:29:21 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4161
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Mon 2014-09-15 12:27:11 +0200
message:
  remove a temporary fix for https://bugs.launchpad.net/yade/+bug/923929, after better fix in https://github.com/yade/trunk/commit/4ea76ad6e47ac5074a389ad61712a0840e8560a5, thanks Anton
modified:
  pkg/dem/NewtonIntegrator.cpp


--
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/dem/NewtonIntegrator.cpp'
--- pkg/dem/NewtonIntegrator.cpp	2014-07-03 07:16:58 +0000
+++ pkg/dem/NewtonIntegrator.cpp	2014-09-15 10:27:11 +0000
@@ -84,25 +84,8 @@
 	#endif
 }
 
-#ifdef YADE_OPENMP
-void NewtonIntegrator::ensureSync()
-{
-	if (syncEnsured) return;	
-	YADE_PARALLEL_FOREACH_BODY_BEGIN(const shared_ptr<Body>& b, scene->bodies){
-// 		if(b->isClump()) continue;
-		scene->forces.addForce(b->getId(),Vector3r(0,0,0));
-	} YADE_PARALLEL_FOREACH_BODY_END();
-	syncEnsured=true;
-}
-#endif
-
 void NewtonIntegrator::action()
 {
-	#ifdef YADE_OPENMP
-	//prevent https://bugs.launchpad.net/yade/+bug/923929
-	ensureSync();
-	#endif
-
 	scene->forces.sync();
 	bodySelected=(scene->selectedBody>=0);
 	if(warnNoForceReset && scene->forces.lastReset<scene->iter) LOG_WARN("O.forces last reset in step "<<scene->forces.lastReset<<", while the current step is "<<scene->iter<<". Did you forget to include ForceResetter in O.engines?");