some clean ups in EP

diff --git a/examples/smpi/NAS/ep.c b/examples/smpi/NAS/ep.c
index 60e6908..6f36675 100644 (file)
--- a/examples/smpi/NAS/ep.c
+++ b/examples/smpi/NAS/ep.c
@@ -9,8 +9,8 @@
 char class;
 int nprocs;
 
-#define true 1
-#define false 0
+#define TRUE 1
+#define FALSE 0
 
 int main(int argc, char **argv) {
   double dum[3] = {1.,1.,1.};
@@ -19,14 +19,12 @@ int main(int argc, char **argv) {
   double epsilon=1.0E-8, a = 1220703125., s=271828183.;
   double t1, t2, t3, t4;
   double sx_verify_value, sy_verify_value, sx_err, sy_err;
-  int timers_enabled = true;
 
-  int    m, mk=16,
-         mm, nn,
-         nk = (int)(pow(2,mk)), 
+  int    m;
+  int    mk=16;
+  int    nk = (int)(pow(2,mk)),
          nq=10, 
          np, node, no_nodes, i, ik, kk, l, k, nit, no_large_nodes, np_add, k_offset;
-  int    root=0;
   int    verified;
   char   size[500]; // mind the size of the string to represent a big number
 
@@ -42,39 +40,48 @@ int main(int argc, char **argv) {
   get_info(argc, argv, &nprocs, &class);
   check_info(EP, nprocs, class);
 
-  if      (class == 'S') { m = 24; }
-  else if (class == 'W') { m = 25; }
-  else if (class == 'A') { m = 28; }
-  else if (class == 'B') { m = 30; }
-  else if (class == 'C') { m = 32; }
-  else if (class == 'D') { m = 36; }
-  else if (class == 'E') { m = 40; }
+  if      (class == 'S')
+    { m = 24; }
+  else if (class == 'W')
+    { m = 25; }
+  else if (class == 'A')
+    { m = 28; }
+  else if (class == 'B')
+    { m = 30; }
+  else if (class == 'C')
+    { m = 32; }
+  else if (class == 'D')
+    { m = 36; }
+  else if (class == 'E')
+    { m = 40; }
   else {
     printf("EP: Internal error: invalid class type %c\n", class);
     exit(1);
   }
-  mm = m -mk;
-  nn = (int)(pow(2,mm)),
 
-  root = 0;
+  int mm = m -mk;
+  int nn = (int)(pow(2,mm));
+
+  int root = 0;
   if (node == root ) {
     /* Because the size of the problem is too large to store in a 32-bit integer for some classes, we put it into a
      * string (for printing). Have to strip off the decimal point put in there by the floating point print statement
      * (internal file) */
     fprintf(stdout," NAS Parallel Benchmarks 3.2 -- EP Benchmark");
     snprintf(size,500,"%lu",(unsigned long)pow(2,m+1));
-    //size = size.replace('.', ' ');
     fprintf(stdout," Number of random numbers generated: %s\n",size);
     fprintf(stdout," Number of active processes: %d\n",no_nodes);
   }
-  verified = false;
+  verified = FALSE;
 
   /* Compute the number of "batches" of random number pairs generated per processor. Adjust if the number of processors
    * does not evenly divide the total number  */
   np = nn / no_nodes;
   no_large_nodes = nn % no_nodes;
-  if (node < no_large_nodes) np_add = 1;
-  else np_add = 0;
+  if (node < no_large_nodes)
+    np_add = 1;
+  else
+    np_add = 0;
   np = np + np_add;
 
   if (np == 0) {
@@ -85,9 +92,6 @@ int main(int argc, char **argv) {
 
   /* Call the random number generator functions and initialize the x-array to reduce the effects of paging the timings.
    Also, call all mathematical functions that are used. Make sure initializations cannot be eliminated as dead code. */
-
-  //call vranlc(0, dum[1], dum[2], dum[3]);
-  // Array indexes start at 1 in Fortran, 0 in Java
   vranlc(0, dum[0], dum[1], &(dum[2]));
 
   dum[0] = randlc(&(dum[1]),&(dum[2]));
@@ -107,21 +111,17 @@ int main(int argc, char **argv) {
   timer_start(1);
 
   t1 = a;
-  //fprintf(stdout,("(ep.f:160) t1 = " + t1);
   t1 = vranlc(0, t1, a, x);
-  //fprintf(stdout,("(ep.f:161) t1 = " + t1);
 
   /* Compute AN = A ^ (2 * NK) (mod 2^46). */
   t1 = a;
-  //fprintf(stdout,("(ep.f:165) t1 = " + t1);
   for (i=1; i <= mk+1; i++) {
     t2 = randlc(&t1, &t1);
-    //fprintf(stdout,("(ep.f:168)[loop i=" + i +"] t1 = " + t1);
   }
   an = t1;
-  //fprintf(stdout,("(ep.f:172) s = " + s);
   tt = s;
-  gc = tt = 0.;
+  gc = 0;
+  tt = 0.;
   sx = 0.;
   sy = 0.;
   for (i=0; i < nq ; i++) {
@@ -135,24 +135,21 @@ int main(int argc, char **argv) {
   else
     k_offset = no_large_nodes*(np+1) + (node-no_large_nodes)*np -1;
 
-  int stop = false;
+  int stop = FALSE;
   for(k = 1; k <= np; k++) {// SMPI_SAMPLE_LOCAL(0.25 * np, 0.03) {
-    stop = false;
+    stop = FALSE;
     kk = k_offset + k ;
     t1 = s;
-    //fprintf(stdout,("(ep.f:193) t1 = " + t1);
     t2 = an;
 
     //       Find starting seed t1 for this kk.
     for (i=1;i<=100 && !stop;i++) {
       ik = kk / 2;
-      //fprintf(stdout,("(ep.f:199) ik = " +ik+", kk = " + kk);
       if (2 * ik != kk)  {
         t3 = randlc(&t1, &t2);
-        //fprintf(stdout,("(ep.f:200) t1= " +t1 );
       }
       if (ik==0)
-        stop = true;
+        stop = TRUE;
       else {
         t3 = randlc(&t2, &t2);
         kk = ik;
@@ -160,31 +157,16 @@ int main(int argc, char **argv) {
     }
     //       Compute uniform pseudorandom numbers.
 
-    //if (timers_enabled)  timer_start(3);
     timer_start(3);
-    //call vranlc(2 * nk, t1, a, x)  --> t1 and y are modified
-
-    //fprintf(stdout,">>>>>>>>>>>Before vranlc(l.210)<<<<<<<<<<<<<");
-    //fprintf(stdout,"2*nk = " + (2*nk));
-    //fprintf(stdout,"t1 = " + t1);
-    //fprintf(stdout,"a  = " + a);
-    //fprintf(stdout,"x[0] = " + x[0]);
-    //fprintf(stdout,">>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<");
-    t1 = vranlc(2 * nk, t1, a, x);
 
-    //fprintf(stdout,(">>>>>>>>>>>After  Enter vranlc (l.210)<<<<<<");
-    //fprintf(stdout,("2*nk = " + (2*nk));
-    //fprintf(stdout,("t1 = " + t1);
-    //fprintf(stdout,("a  = " + a);
-    //fprintf(stdout,("x[0] = " + x[0]);
-    //fprintf(stdout,(">>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<");
+    t1 = vranlc(2 * nk, t1, a, x);
 
-    //if (timers_enabled)  timer_stop(3);
     timer_stop(3);
 
     /* Compute Gaussian deviates by acceptance-rejection method and tally counts in concentric square annuli.
      * This loop is not vectorizable. */
-    if (timers_enabled) timer_start(2);
+    timer_start(2);
+
     for(i=1; i<=nk;i++) {
       x1 = 2. * x[2*i-2] -1.0;
       x2 = 2. * x[2*i-1] - 1.0;
@@ -198,28 +180,14 @@ int main(int argc, char **argv) {
         sx   = sx + t3;
         sy   = sy + t4;
       }
-      /*
-       if(i == 1) {
-                fprintf(stdout,"x1 = " + x1);
-                fprintf(stdout,"x2 = " + x2);
-                fprintf(stdout,"t1 = " + t1);
-                fprintf(stdout,"t2 = " + t2);
-                fprintf(stdout,"t3 = " + t3);
-                fprintf(stdout,"t4 = " + t4);
-                fprintf(stdout,"l = " + l);
-                fprintf(stdout,"q[l] = " + q[l]);
-                fprintf(stdout,"sx = " + sx);
-                fprintf(stdout,"sy = " + sy);
-       }
-       */
     }
-    if (timers_enabled)  timer_stop(2);
+    timer_stop(2);
   }
 
   TRACE_smpi_set_category ("finalize");
 
   MPI_Allreduce(&sx, x, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
-  sx = x[0]; //FIXME :  x[0] or x[1] => x[0] because fortran starts with 1
+  sx = x[0];
   MPI_Allreduce(&sy, x, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
   sy = x[0];
   MPI_Allreduce(q, x, nq, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
@@ -236,9 +204,11 @@ int main(int argc, char **argv) {
   MPI_Allreduce(&tm, x, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
   tm = x[0];
 
+  free(x);
+
   if(node == root) {
     nit = 0;
-    verified = true;
+    verified = TRUE;
 
     if(m == 24) {
       sx_verify_value = -3.247834652034740E3;
@@ -259,23 +229,12 @@ int main(int argc, char **argv) {
       sx_verify_value =  1.982481200946593E5;
       sy_verify_value = -1.020596636361769E5;
     } else {
-      verified = false;
+      verified = FALSE;
     }
 
-    /*
-    fprintf(stdout,("sx        = " + sx);
-    fprintf(stdout,("sx_verify = " + sx_verify_value);
-    fprintf(stdout,("sy        = " + sy);
-    fprintf(stdout,("sy_verify = " + sy_verify_value);
-    */
     if(verified) {
       sx_err = fabs((sx - sx_verify_value)/sx_verify_value);
       sy_err = fabs((sy - sy_verify_value)/sy_verify_value);
-      /*
-      fprintf(stdout,("sx_err = " + sx_err);
-      fprintf(stdout,("sy_err = " + sx_err);
-      fprintf(stdout,("epsilon= " + epsilon);
-      */
       verified = ((sx_err < epsilon) && (sy_err < epsilon));
     }
 
@@ -297,6 +256,8 @@ int main(int argc, char **argv) {
     fprintf(stdout,"Random numbers: %f\n",(timer_read(3)/1000));
   }
 
+  free(q);
+
   MPI_Finalize();
   return 0;
 }