address review comments

diff --git a/tests/performance/performance_test_driver.h b/tests/performance/performance_test_driver.h
index 5d7fe759c502d90907bcb38ffbf35344813c3185..10affa3e95552da36e08efcf4abb55211cbf9aaf 100644 (file)
--- a/tests/performance/performance_test_driver.h
+++ b/tests/performance/performance_test_driver.h
@@ -159,7 +159,7 @@ main(int argc, char *argv[])
     }
   else
     {
-      pout << "name\tmin\tmax\taverage\tstd_dev\tsamples\n";
+      pout << "name\tmin\tmax\tmean\tstd_dev\tsamples\n";
     }
 
   // Perform measurements:

diff --git a/tests/performance/timing_step_22.cc b/tests/performance/timing_step_22.cc
index c5cccbecbaa6b2e1983aeb8273e167e1f24bef63..b9fdb93f796cbb1d3a8d2a54c510ae925dca244f 100644 (file)
--- a/tests/performance/timing_step_22.cc
+++ b/tests/performance/timing_step_22.cc
@@ -16,7 +16,7 @@
 //
 // Description:
 //
-// A performance benchmark based on step 3 that measures timings for system
+// A performance benchmark based on step 22 that measures timings for system
 // setup, assembly, solve and postprocessing for a Stokes problem.
 //
 
@@ -647,11 +647,11 @@ StokesProblem<dim>::run()
 
       debug_output << std::endl;
     }
-  return {timer["refinement"].cpu_time(),
-          timer["setup_system"].cpu_time(),
-          timer["assemble_system"].cpu_time(),
-          timer["solve"].cpu_time(),
-          timer["output_results"].cpu_time()};
+  return {timer["refinement"].wall_time(),
+          timer["setup_system"].wall_time(),
+          timer["assemble_system"].wall_time(),
+          timer["solve"].wall_time(),
+          timer["output_results"].wall_time()};
 }
 
 

diff --git a/tests/performance/timing_step_3.cc b/tests/performance/timing_step_3.cc
index 4c6186873f37936b031aadee715fab359677d140..64a5a1dd4634614bd50bca23e9bc67419925ffd6 100644 (file)
--- a/tests/performance/timing_step_3.cc
+++ b/tests/performance/timing_step_3.cc
@@ -235,11 +235,11 @@ Step3::run()
   output_results();
   timer["output_results"].stop();
 
-  return {timer["make_grid"].cpu_time(),
-          timer["setup_system"].cpu_time(),
-          timer["assemble_system"].cpu_time(),
-          timer["solve"].cpu_time(),
-          timer["output_results"].cpu_time()};
+  return {timer["make_grid"].wall_time(),
+          timer["setup_system"].wall_time(),
+          timer["assemble_system"].wall_time(),
+          timer["solve"].wall_time(),
+          timer["output_results"].wall_time()};
 }