rename namespace

diff --git a/tests/performance/instrumentation_step_22.cc b/tests/performance/instrumentation_step_22.cc
index 0d7bfb81d05a2b61540c74a4bd704d211a638309..3397a1b721a11987c687dc22de539b29861bfea0 100644 (file)
--- a/tests/performance/instrumentation_step_22.cc
+++ b/tests/performance/instrumentation_step_22.cc
@@ -624,28 +624,27 @@ StokesProblem<dim>::run()
 
       if (refinement_cycle > 0)
         {
-          callgrind_wrapper::start_instrumentation();
+          CallgrindWrapper::start_instrumentation();
           refine_mesh();
-          cycle_count["refinement"] = callgrind_wrapper::stop_instrumentation();
+          cycle_count["refinement"] = CallgrindWrapper::stop_instrumentation();
         }
 
-      callgrind_wrapper::start_instrumentation();
+      CallgrindWrapper::start_instrumentation();
       setup_dofs();
-      cycle_count["setup_system"] = callgrind_wrapper::stop_instrumentation();
+      cycle_count["setup_system"] = CallgrindWrapper::stop_instrumentation();
 
       debug_output << "   Assembling..." << std::endl << std::flush;
-      callgrind_wrapper::start_instrumentation();
+      CallgrindWrapper::start_instrumentation();
       assemble_system();
-      cycle_count["assemble_system"] =
-        callgrind_wrapper::stop_instrumentation();
+      cycle_count["assemble_system"] = CallgrindWrapper::stop_instrumentation();
 
-      callgrind_wrapper::start_instrumentation();
+      CallgrindWrapper::start_instrumentation();
       solve();
-      cycle_count["solve"] = callgrind_wrapper::stop_instrumentation();
+      cycle_count["solve"] = CallgrindWrapper::stop_instrumentation();
 
-      callgrind_wrapper::start_instrumentation();
+      CallgrindWrapper::start_instrumentation();
       output_results(refinement_cycle);
-      cycle_count["output_results"] = callgrind_wrapper::stop_instrumentation();
+      cycle_count["output_results"] = CallgrindWrapper::stop_instrumentation();
 
       debug_output << std::endl;
     }

diff --git a/tests/performance/instrumentation_step_3.cc b/tests/performance/instrumentation_step_3.cc
index 8914cb0c3bacb5bdc9b98b99fe343b802bc0cb24..f7372ff1a8d89d90ab9cc8ed1cc187a24e4cfe2e 100644 (file)
--- a/tests/performance/instrumentation_step_3.cc
+++ b/tests/performance/instrumentation_step_3.cc
@@ -219,25 +219,25 @@ Step3::run()
 {
   std::map<std::string, std::uint64_t> cycle_count;
 
-  callgrind_wrapper::start_instrumentation();
+  CallgrindWrapper::start_instrumentation();
   make_grid();
-  cycle_count["make_grid"] = callgrind_wrapper::stop_instrumentation();
+  cycle_count["make_grid"] = CallgrindWrapper::stop_instrumentation();
 
-  callgrind_wrapper::start_instrumentation();
+  CallgrindWrapper::start_instrumentation();
   setup_system();
-  cycle_count["setup_system"] = callgrind_wrapper::stop_instrumentation();
+  cycle_count["setup_system"] = CallgrindWrapper::stop_instrumentation();
 
-  callgrind_wrapper::start_instrumentation();
+  CallgrindWrapper::start_instrumentation();
   assemble_system();
-  cycle_count["assemble_system"] = callgrind_wrapper::stop_instrumentation();
+  cycle_count["assemble_system"] = CallgrindWrapper::stop_instrumentation();
 
-  callgrind_wrapper::start_instrumentation();
+  CallgrindWrapper::start_instrumentation();
   solve();
-  cycle_count["solve"] = callgrind_wrapper::stop_instrumentation();
+  cycle_count["solve"] = CallgrindWrapper::stop_instrumentation();
 
-  callgrind_wrapper::start_instrumentation();
+  CallgrindWrapper::start_instrumentation();
   output_results();
-  cycle_count["output_results"] = callgrind_wrapper::stop_instrumentation();
+  cycle_count["output_results"] = CallgrindWrapper::stop_instrumentation();
 
   return {cycle_count["make_grid"],
           cycle_count["setup_system"],

diff --git a/tests/performance/valgrind_instrumentation.h b/tests/performance/valgrind_instrumentation.h
index c2554f1c5b7d1d9b20f391731f5846db53ef5a9c..c25773ad69ac957b2de5ead92ea1860055b673eb 100644 (file)
--- a/tests/performance/valgrind_instrumentation.h
+++ b/tests/performance/valgrind_instrumentation.h
@@ -37,7 +37,7 @@
  *            --callgrind-out-file=callgrind.out ./executable
  * @endcode
  */
-namespace callgrind_wrapper
+namespace CallgrindWrapper
 {
   /**
    * Reset the current instruction counter to zero and start callgrind
@@ -102,7 +102,7 @@ namespace callgrind_wrapper
     AssertThrow(
       is_initialized,
       dealii::ExcMessage(
-        "callgrind_wrapper::start_instrumentation() can only be called when "
+        "CallgrindWrapper::start_instrumentation() can only be called when "
         "the executable is run via \"valgrind --tool=callgrind -q "
         "--combine-dumps=yes --instr-atstart=no "
         "--callgrind-out-file=callgrind.out ./executable\""));
@@ -138,6 +138,6 @@ namespace callgrind_wrapper
     return cycles;
   }
 
-} // namespace callgrind_wrapper
+} // namespace CallgrindWrapper
 
 #endif