changes.

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBench.java b/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBench.java
index b45112b6f6f6f2ccc20100f9f1dc195b06df3dce..febfe40de6fcfa4fbe2f3ca46a4fda1ff1fb8176 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBench.java
+++ b/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBench.java
@@ -93,17 +93,6 @@ public class JGFMolDynBench {
 //    System.out.println("Total="+(end-start));
   }
 
-  public void JGFvalidate() {
-    double[] refval = new double[2];
-    refval[0] = 1731.4306625334357;
-    refval[1] = 7397.392307839352;
-    double dev = Math.fabs(ek[0] - refval[size]);
-    if (dev > 1.0e-10) {
-      // System.printString("Validation failed\n");
-      // System.printString("Kinetic Energy = " + (long)ek[0] + "  " + (long)dev
-      // + "  " + size + "\n");
-    }
-  }
 }
 
 class mdRunner {
@@ -413,9 +402,6 @@ class mdRunner {
           l_epot+=store.epot;
           l_vir+=store.vir;
           l_interacts+=store.interacts;
-//          mymd.epot[0] += store.epot;
-//          mymd.vir[0] += store.vir;
-//          mymd.interactions += store.interacts;
         }
 
       }
@@ -483,8 +469,6 @@ class mdRunner {
         rp = (count / mdsize) * 100.0;
       }
 
-      // if (id == 0) JGFInstrumentor.stopTimer("Section3:MolDyn:Run",
-      // instr.timers);
     }
 //    System.out.println("par time="+par_time);
   }

diff --git a/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBenchSizeB.java b/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBenchSizeB.java
index f7007ad537684142d96185a28552454dc2d805a3..5400b06668007eba9300cd4e1664a53059b868a6 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBenchSizeB.java
+++ b/Robust/src/Benchmarks/oooJava/moldyn/JGFMolDynBenchSizeB.java
@@ -32,18 +32,12 @@ public class JGFMolDynBenchSizeB {
       workload=300;
     }
 
-//    JGFInstrumentor instr = new JGFInstrumentor();
-//    JGFInstrumentor.printHeader(3,1,nthreads);
-
     JGFMolDynBench mold;
     mold = new JGFMolDynBench(nthreads,workload); 
     int size = 1;
-//    JGFInstrumentor.addTimer("Section3:MolDyn:Total", "Solutions",size, instr.timers);
-//    JGFInstrumentor.addTimer("Section3:MolDyn:Run", "Interactions",size, instr.timers);
 
     mold.JGFsetsize(size); 
 
-//    JGFInstrumentor.startTimer("Section3:MolDyn:Total", instr.timers);
 
     JGFMolDynBench tmp;
     mold.JGFinitialise(); 
@@ -55,7 +49,7 @@ public class JGFMolDynBenchSizeB {
     refval[1] = 7397.392307839352;
     double dval;
     dval = mold.ek[0];
-    double dev = Math.fabs(dval - refval[size]);
+    double dev = Math.abs(dval - refval[size]);
     long l = (long) refval[size] *1000000;
     long r = (long) dval * 1000000;
     if (l != r ){
@@ -63,15 +57,6 @@ public class JGFMolDynBenchSizeB {
       System.printString("Kinetic Energy = " + (long)dval + "  " + (long)dev + "  " + size + "\n");
     }
 
-//    JGFInstrumentor.stopTimer("Section3:MolDyn:Total", instr.timers);
-//    double interactions;
-//    interactions = mold.interactions;
-
-//    JGFInstrumentor.addOpsToTimer("Section3:MolDyn:Run", (double) interactions, instr.timers);
-//    JGFInstrumentor.addOpsToTimer("Section3:MolDyn:Total", 1, instr.timers);
-
-//    JGFInstrumentor.printTimer("Section3:MolDyn:Run", instr.timers); 
-//    JGFInstrumentor.printTimer("Section3:MolDyn:Total", instr.timers); 
     System.printString("Finished\n");
   }
 }