Merge branch 'develop' into release/v1.2.0-CORAL2

README.md

@@ -91,7 +91,7 @@ As we explore new architectures and programming paradigms with Kripke, we will b
 
 Mini App or Proxy App?
 ----------------------
-Kripke is a Mini-App since it has a very small code base consisting of 4233 lines of C++ code (generated using David A. Wheeler's SLOCCount v2.26).
+Kripke is a Mini-App since it has a very small code base consisting of 3539 lines of C++ code (using cloc v1.67).
 
 Kripke is also a Proxy-App since it is a proxy for the LLNL transport code ARDRA.
 

src/Kripke/Timing.h

@@ -65,7 +65,7 @@ namespace Kripke {
       void stop(std::string const &my_name) {
         if(started){
           timer.stop(my_name.c_str());
-					elapsed += timer.elapsed();
+          elapsed += timer.elapsed();
         }
       }
 

src/kripke.cpp

@@ -488,6 +488,7 @@ int main(int argc, char **argv) {
   size_t num_iter = timing.getCount("SweepSolver");
   double solve_time = timing.getTotal("Solve");
   double grind_time = solve_time / num_unknowns / num_iter;
+  double throughput = num_unknowns / solve_time / num_iter;
 
   double sweep_eff = 100.0 * timing.getTotal("SweepSubdomain") / timing.getTotal("SweepSolver");
 
@@ -496,8 +497,9 @@ int main(int argc, char **argv) {
     printf("Figures of Merit\n");
     printf("================\n");
     printf("\n");
+    printf("  Throughput:         %e [unknowns/second/iteration]\n", throughput);
     printf("  Number of unknowns: %lu\n", (unsigned long) num_unknowns);
-    printf("  Grind time :        %e [seconds/unknown/iterations]\n", grind_time);
+    printf("  Grind time :        %e [seconds/unknown/iteration]\n", grind_time);
     printf("  Sweep efficiency :  %4.5lf [100.0 * SweepSubdomain time / SweepSolver time]\n", sweep_eff);
   }