projects
/
IRC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c0956d
)
accidentally commited tinker code yesterday
author
jjenista
<jjenista>
Wed, 5 Oct 2011 19:18:51 +0000
(19:18 +0000)
committer
jjenista
<jjenista>
Wed, 5 Oct 2011 19:18:51 +0000
(19:18 +0000)
Robust/src/Benchmarks/oooJava/barneshut/Barneshut.java
patch
|
blob
|
history
diff --git
a/Robust/src/Benchmarks/oooJava/barneshut/Barneshut.java
b/Robust/src/Benchmarks/oooJava/barneshut/Barneshut.java
index 04b08a70d004a18f01475fdc6231871f2e5080b3..7bc6e6a88130f40dcd02ae4770a9f1fd31d7f1fa 100644
(file)
--- a/
Robust/src/Benchmarks/oooJava/barneshut/Barneshut.java
+++ b/
Robust/src/Benchmarks/oooJava/barneshut/Barneshut.java
@@
-243,35
+243,20
@@
public void ComputeCenterOfMass(ArrayIndexedGraph octree, ArrayIndexedNode roo
long start_time = System.currentTimeMillis();
for (int step = 0; step < local_ntimesteps; step++) { // time-step the system
ComputeCenterAndDiameter();
long start_time = System.currentTimeMillis();
for (int step = 0; step < local_ntimesteps; step++) { // time-step the system
ComputeCenterAndDiameter();
- ArrayIndexedGraph octree =
disjoint AIG
new ArrayIndexedGraph(8);
+ ArrayIndexedGraph octree = new ArrayIndexedGraph(8);
ArrayIndexedNode root = octree.createNode(new OctTreeNodeData(centerx, centery, centerz)); // create the tree's root
octree.addNode(root);
double radius = diameter * 0.5;
ArrayIndexedNode root = octree.createNode(new OctTreeNodeData(centerx, centery, centerz)); // create the tree's root
octree.addNode(root);
double radius = diameter * 0.5;
-
- genreach b0;
-
for (int i = 0; i < local_nbodies; i++) {
Insert(octree, root, body[i], radius); // grow the tree by inserting each body
body[i].root=root;
}
curr = 0;
for (int i = 0; i < local_nbodies; i++) {
Insert(octree, root, body[i], radius); // grow the tree by inserting each body
body[i].root=root;
}
curr = 0;
-
-
- genreach b1;
-
-
// summarize subtree info in each internal node (plus restructure tree and sort bodies for performance reasons)
ComputeCenterOfMass(octree, root);
// summarize subtree info in each internal node (plus restructure tree and sort bodies for performance reasons)
ComputeCenterOfMass(octree, root);
-
- genreach b2;
-
-
sese force {
sese force {
-
- genreach b3;
-
for(int i=0; i < local_nbodies; i++){
// compute the acceleration of each body (consumes most of the total runtime)
// n.ComputeForce(octree, root, diameter, itolsq, step, dthf, epssq);
for(int i=0; i < local_nbodies; i++){
// compute the acceleration of each body (consumes most of the total runtime)
// n.ComputeForce(octree, root, diameter, itolsq, step, dthf, epssq);
@@
-281,7
+266,6
@@
public void ComputeCenterOfMass(ArrayIndexedGraph octree, ArrayIndexedNode roo
double dt=dthf;
double ep=epssq;
sese parallel{
double dt=dthf;
double ep=epssq;
sese parallel{
- genreach intoPar;
eachbody.ComputeForce(octree, di, it, step, dt, ep);
}
}
eachbody.ComputeForce(octree, di, it, step, dt, ep);
}
}
@@
-293,7
+277,6
@@
public void ComputeCenterOfMass(ArrayIndexedGraph octree, ArrayIndexedNode roo
} // end of time step
} // end of time step
-
long end_time=System.currentTimeMillis();
if (isFirstRun) {
long end_time=System.currentTimeMillis();
if (isFirstRun) {