diff --git a/README.md b/README.md index 1c605960..8516a5a6 100644 --- a/README.md +++ b/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. diff --git a/src/Kripke/Timing.h b/src/Kripke/Timing.h index 16411f15..135a3dec 100644 --- a/src/Kripke/Timing.h +++ b/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(); } } diff --git a/src/kripke.cpp b/src/kripke.cpp index d35d1c02..bc6ed7eb 100644 --- a/src/kripke.cpp +++ b/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); } diff --git a/tpl/raja b/tpl/raja index c06a23dd..7785bf21 160000 --- a/tpl/raja +++ b/tpl/raja @@ -1 +1 @@ -Subproject commit c06a23dd75a42302abb2c1a8a0b73b8793151f70 +Subproject commit 7785bf219a1735386e253eaf496e73b63ceecd2c