tol=theta
authorPritish Jetley <pjetley2@illinois.edu>
Thu, 13 Oct 2011 02:52:35 +0000 (21:52 -0500)
committerPritish Jetley <pjetley2@illinois.edu>
Thu, 13 Oct 2011 02:52:35 +0000 (21:52 -0500)
Main.cpp
gravity.h

index cec95b2..32c8d01 100644 (file)
--- a/Main.cpp
+++ b/Main.cpp
@@ -64,7 +64,7 @@ void Main::setParameters(CkArgMsg *m){
   CkPrintf("eps: %f\n", globalParams.epssq);
   globalParams.epssq = globalParams.epssq*globalParams.epssq;
 
-  globalParams.tolsq = params.getrparam("tol", DEFAULT_TOL, table);
+  globalParams.tolsq = globalParams.theta;
   CkPrintf("tol: %f\n", globalParams.tolsq);
   globalParams.tolsq = globalParams.tolsq*globalParams.tolsq;
 
index 24eda4c..7adfabe 100644 (file)
--- a/gravity.h
+++ b/gravity.h
@@ -53,10 +53,11 @@ int nodeBucketForce(Node<ForceData> *node,
 inline int partBucketForce(ExternalParticle *part, 
                           Node<ForceData> *req){ 
 
+  CkPrintf("partbucketforce\n");
   Particle *particles = req->getParticles();
   int numParticles = req->getNumParticles();
   grav(particles,particles+numParticles,part->mass,part->position);
-  return req->getNumParticles();
+  return numParticles;
 }
 
 #endif