changes.

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/allrun b/Robust/src/Benchmarks/oooJava/moldyn/allrun
deleted file mode 100755 (executable)
index 05c0cd7..0000000
--- a/Robust/src/Benchmarks/oooJava/moldyn/allrun
+++ /dev/null
@@ -1,17 +0,0 @@
-rm parallel.log
-echo ============================================================
-echo Running Parallel Moldyn
-for i in 1 2 3 4 5 6 7 8 9 10
-do
-echo Trial $i
-(time ./JGFMolDynBenchSizeBp.bin 1 150) 2>&1 | cat >> parallel.log
-done
-rm serial.log
-echo ============================================================
-echo Running Serial Moldyn
-for i in 1 2 3 4 5 6 7 8 9 10
-do
-echo Trial $i
-(time ./JGFMolDynBenchSizeBs.bin 1 150) 2>&1 | cat >> serial.log
-done
-

diff --git a/Robust/src/Benchmarks/oooJava/monte/AppDemo.java b/Robust/src/Benchmarks/oooJava/monte/AppDemo.java
index 7ac31efdb23fe29c622154db1f22027c60e6d3d6..549dcd09e6a86b434ef4133f91eb52e273d34feb 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/AppDemo.java
+++ b/Robust/src/Benchmarks/oooJava/monte/AppDemo.java
@@ -34,7 +34,7 @@ import java.util.Vector;
  * </ol>
  * 
  * @author H W Yau
- * @version $Revision: 1.1 $ $Date: 2010/07/23 03:44:00 $
+ * @version $Revision: 1.2 $ $Date: 2011/04/06 00:49:05 $
  */
 public class AppDemo extends Universal {
   // ------------------------------------------------------------------------
@@ -173,8 +173,8 @@ public class AppDemo extends Universal {
       }
       
       int l_size=iupper-ilow;
-      PriceStock psArray[]=new PriceStock[l_size];      
       sese parallel{
+        PriceStock psArray[]=new PriceStock[l_size];      
         for(int idx=ilow;idx<iupper;idx++){
           PriceStock ps = new PriceStock();
           ps.setInitAllTasks(initAllTasks);

diff --git a/Robust/src/Benchmarks/oooJava/monte/makefile b/Robust/src/Benchmarks/oooJava/monte/makefile
index 32e94f42a9c959e2fcfee293dabf0e3ac87cb6f8..7f152430865506457d0704cd56525d42f3f4774f 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/monte/makefile
+++ b/Robust/src/Benchmarks/oooJava/monte/makefile
@@ -5,6 +5,4 @@ SOURCE_FILES=JGFMonteCarloBench.java
 NUM_OOO_WORKERS=24
 NUM_RCR_WORKERS=23
 
-BMFLAGS=-nolock
-
 include ../master-makefile

diff --git a/Robust/src/Benchmarks/oooJava/raytracer/allrun b/Robust/src/Benchmarks/oooJava/raytracer/allrun
deleted file mode 100755 (executable)
index d02ad98..0000000
--- a/Robust/src/Benchmarks/oooJava/raytracer/allrun
+++ /dev/null
@@ -1,17 +0,0 @@
-rm parallel.log
-echo ============================================================
-echo Running Parallel Raytracer
-for i in 1 2 3 4 5 6 7 8 9 10
-do
-echo Trial $i
-(time ./testp.bin 1) 2>> parallel.log
-done
-rm serial.log
-echo ============================================================
-echo Running Serial Raytracer
-for i in 1 2 3 4 5 6 7 8 9 10
-do
-echo Trial $i
-(time ./tests.bin 1) 2>> serial.log
-done
-