From d4076cf7ac9bbc4504cb25851563ab1bee9f8ce3 Mon Sep 17 00:00:00 2001
From: Timo Heister <timo.heister@gmail.com>
Date: Fri, 13 Feb 2015 13:09:46 -0500
Subject: [PATCH] update tests

---
 tests/base/task_09.cc                         | 2 +-
 tests/bits/error_estimator_01.cc              | 2 +-
 tests/bits/error_estimator_02.cc              | 2 +-
 tests/bits/step-13.cc                         | 2 +-
 tests/bits/step-14.cc                         | 4 ++--
 tests/codim_one/error_estimator_01.cc         | 2 +-
 tests/deal.II/assemble_matrix_parallel_02.cc  | 4 ++--
 tests/deal.II/assemble_matrix_parallel_04.cc  | 4 ++--
 tests/fail/hp-step-14.cc                      | 4 ++--
 tests/hp/step-13.cc                           | 2 +-
 tests/matrix_free/assemble_matrix_03.cc       | 2 +-
 tests/quick_tests/affinity.cc                 | 4 ++--
 tests/tests.h                                 | 2 +-
 tests/trilinos/assemble_matrix_parallel_01.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_02.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_03.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_04.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_05.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_06.cc | 2 +-
 tests/trilinos/assemble_matrix_parallel_07.cc | 2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/base/task_09.cc b/tests/base/task_09.cc
index 0e0f2685f5..238c8efc18 100644
--- a/tests/base/task_09.cc
+++ b/tests/base/task_09.cc
@@ -66,7 +66,7 @@ int main()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  for (unsigned int i=0; i<multithread_info.n_cpus*2; ++i)
+  for (unsigned int i=0; i<MultithreadInfo::n_cpus*2; ++i)
     Threads::new_task (outer);
 
   deallog << "OK" << std::endl;
diff --git a/tests/bits/error_estimator_01.cc b/tests/bits/error_estimator_01.cc
index 99a65d69cb..3a3687ac70 100644
--- a/tests/bits/error_estimator_01.cc
+++ b/tests/bits/error_estimator_01.cc
@@ -170,7 +170,7 @@ check ()
       KellyErrorEstimator<dim>::estimate (mapping, dof, q_face, neumann_bc,
                                           v, this_error,
                                           std::vector<bool>(), 0,
-                                          multithread_info.n_threads(),
+                                          MultithreadInfo::n_threads(),
                                           subdomain);
       this_error *= scaling_factor;
 
diff --git a/tests/bits/error_estimator_02.cc b/tests/bits/error_estimator_02.cc
index 4809efdf1e..450c1bf6e8 100644
--- a/tests/bits/error_estimator_02.cc
+++ b/tests/bits/error_estimator_02.cc
@@ -170,7 +170,7 @@ check ()
       KellyErrorEstimator<dim>::estimate (mapping, dof, q_face, neumann_bc,
                                           v, this_error,
                                           std::vector<bool>(), 0,
-                                          multithread_info.n_threads(),
+                                          MultithreadInfo::n_threads(),
                                           numbers::invalid_unsigned_int,
                                           material);
       this_error *= scaling_factor;
diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc
index d065a6dc37..4b38ec0a49 100644
--- a/tests/bits/step-13.cc
+++ b/tests/bits/step-13.cc
@@ -357,7 +357,7 @@ namespace LaplaceSolver
     typename DoFHandler<dim>::active_cell_iterator
     active_cell_iterator;
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     std::vector<std::pair<active_cell_iterator,active_cell_iterator> >
     thread_ranges
       = Threads::split_range<active_cell_iterator> (dof_handler.begin_active (),
diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc
index 80c2df0789..ecac8d547a 100644
--- a/tests/bits/step-14.cc
+++ b/tests/bits/step-14.cc
@@ -443,7 +443,7 @@ namespace LaplaceSolver
     typename DoFHandler<dim>::active_cell_iterator
     active_cell_iterator;
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     std::vector<std::pair<active_cell_iterator,active_cell_iterator> >
     thread_ranges
       = Threads::split_range<active_cell_iterator> (dof_handler.begin_active (),
@@ -1684,7 +1684,7 @@ namespace LaplaceSolver
     error_indicators.reinit (dual_solver.dof_handler
                              .get_tria().n_active_cells());
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     for (unsigned int i=0; i<n_threads; ++i)
       {
         estimate_some
diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc
index 0d1c8eae73..a26ce863ac 100644
--- a/tests/codim_one/error_estimator_01.cc
+++ b/tests/codim_one/error_estimator_01.cc
@@ -168,7 +168,7 @@ check ()
       KellyErrorEstimator<dim,spacedim>::estimate (mapping, dof, q_face, neumann_bc,
                                                    v, this_error,
                                                    std::vector<bool>(), 0,
-                                                   multithread_info.n_threads(),
+                                                   MultithreadInfo::n_threads(),
                                                    subdomain);
       this_error *= scaling_factor;
 
diff --git a/tests/deal.II/assemble_matrix_parallel_02.cc b/tests/deal.II/assemble_matrix_parallel_02.cc
index f867078d38..946532e390 100644
--- a/tests/deal.II/assemble_matrix_parallel_02.cc
+++ b/tests/deal.II/assemble_matrix_parallel_02.cc
@@ -400,7 +400,7 @@ void LaplaceProblem<dim>::assemble_test_1 ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (),
-         multithread_info.n_threads(),
+         MultithreadInfo::n_threads(),
          1);
 }
 
@@ -425,7 +425,7 @@ void LaplaceProblem<dim>::assemble_test_2 ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (true),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
 }
 
diff --git a/tests/deal.II/assemble_matrix_parallel_04.cc b/tests/deal.II/assemble_matrix_parallel_04.cc
index c47485370e..5aab2efd56 100644
--- a/tests/deal.II/assemble_matrix_parallel_04.cc
+++ b/tests/deal.II/assemble_matrix_parallel_04.cc
@@ -428,7 +428,7 @@ void LaplaceProblem<dim>::assemble_test_1 ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (1),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
     if (constraints.is_constrained(i))
@@ -459,7 +459,7 @@ void LaplaceProblem<dim>::assemble_test_2 ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (2),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   for (unsigned int i=0; i<dof_handler.n_dofs(); ++i)
     if (constraints.is_constrained(i))
diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc
index faab0e3786..1faeab62ae 100644
--- a/tests/fail/hp-step-14.cc
+++ b/tests/fail/hp-step-14.cc
@@ -443,7 +443,7 @@ namespace LaplaceSolver
     typename hp::DoFHandler<dim>::active_cell_iterator
     active_cell_iterator;
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     std::vector<std::pair<active_cell_iterator,active_cell_iterator> >
     thread_ranges
       = Threads::split_range<active_cell_iterator> (dof_handler.begin_active (),
@@ -1684,7 +1684,7 @@ namespace LaplaceSolver
     error_indicators.reinit (dual_solver.dof_handler
                              .get_tria().n_active_cells());
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     Threads::ThreadGroup<> threads;
     for (unsigned int i=0; i<n_threads; ++i)
       threads += Threads::new_thread (&WeightedResidual<dim>::estimate_some, *this,
diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc
index cb5882ce55..ad71eb89a6 100644
--- a/tests/hp/step-13.cc
+++ b/tests/hp/step-13.cc
@@ -357,7 +357,7 @@ namespace LaplaceSolver
     typename hp::DoFHandler<dim>::active_cell_iterator
     active_cell_iterator;
 
-    const unsigned int n_threads = multithread_info.n_threads();
+    const unsigned int n_threads = MultithreadInfo::n_threads();
     std::vector<std::pair<active_cell_iterator,active_cell_iterator> >
     thread_ranges
       = Threads::split_range<active_cell_iterator> (dof_handler.begin_active (),
diff --git a/tests/matrix_free/assemble_matrix_03.cc b/tests/matrix_free/assemble_matrix_03.cc
index 8697f70bb3..bdcc5338d8 100644
--- a/tests/matrix_free/assemble_matrix_03.cc
+++ b/tests/matrix_free/assemble_matrix_03.cc
@@ -152,7 +152,7 @@ void do_test (const DoFHandler<dim> &dof)
          &copy_data_local_to_global,
          Assembly::Scratch::Data<dim,fe_degree>(dof.get_fe()),
          dummy,
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   deallog << "OK" << std::endl;
 }
diff --git a/tests/quick_tests/affinity.cc b/tests/quick_tests/affinity.cc
index c18c603814..1db5bc6580 100644
--- a/tests/quick_tests/affinity.cc
+++ b/tests/quick_tests/affinity.cc
@@ -60,8 +60,8 @@ int main ()
   if (!getaffinity(bits_set, mask))
     return 1;
 
-  unsigned int nprocs = dealii::multithread_info.n_cpus;
-  unsigned int tbbprocs = dealii::multithread_info.n_threads();
+  unsigned int nprocs = dealii::MultithreadInfo::n_cpus;
+  unsigned int tbbprocs = dealii::MultithreadInfo::n_threads();
   printf("aff_ncpus=%d, mask=%08X, nprocs=%d, tbb_threads=%d\n",
 	 bits_set, mask, nprocs, tbbprocs );
 
diff --git a/tests/tests.h b/tests/tests.h
index fe7ecbd81d..68c45235cf 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -191,7 +191,7 @@ struct LimitConcurrency
 {
   LimitConcurrency ()
   {
-    multithread_info.set_thread_limit (5);
+    MultithreadInfo::set_thread_limit (5);
   }
 } limit_concurrency;
 #endif
diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc
index ffd0e095d0..55d9826653 100644
--- a/tests/trilinos/assemble_matrix_parallel_01.cc
+++ b/tests/trilinos/assemble_matrix_parallel_01.cc
@@ -367,7 +367,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe_collection, quadrature_collection),
          Assembly::Copy::Data (),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
 
   test_matrix.add(-1, reference_matrix);
diff --git a/tests/trilinos/assemble_matrix_parallel_02.cc b/tests/trilinos/assemble_matrix_parallel_02.cc
index 4748531d6e..7bc5e77eaa 100644
--- a/tests/trilinos/assemble_matrix_parallel_02.cc
+++ b/tests/trilinos/assemble_matrix_parallel_02.cc
@@ -377,7 +377,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);
diff --git a/tests/trilinos/assemble_matrix_parallel_03.cc b/tests/trilinos/assemble_matrix_parallel_03.cc
index 7be5630c9c..aeef2baca5 100644
--- a/tests/trilinos/assemble_matrix_parallel_03.cc
+++ b/tests/trilinos/assemble_matrix_parallel_03.cc
@@ -378,7 +378,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);
diff --git a/tests/trilinos/assemble_matrix_parallel_04.cc b/tests/trilinos/assemble_matrix_parallel_04.cc
index 845da7345c..cb748e638d 100644
--- a/tests/trilinos/assemble_matrix_parallel_04.cc
+++ b/tests/trilinos/assemble_matrix_parallel_04.cc
@@ -393,7 +393,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);
diff --git a/tests/trilinos/assemble_matrix_parallel_05.cc b/tests/trilinos/assemble_matrix_parallel_05.cc
index aa4d1570b5..a358477904 100644
--- a/tests/trilinos/assemble_matrix_parallel_05.cc
+++ b/tests/trilinos/assemble_matrix_parallel_05.cc
@@ -379,7 +379,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);
diff --git a/tests/trilinos/assemble_matrix_parallel_06.cc b/tests/trilinos/assemble_matrix_parallel_06.cc
index 4966a0a2d9..049d4db43b 100644
--- a/tests/trilinos/assemble_matrix_parallel_06.cc
+++ b/tests/trilinos/assemble_matrix_parallel_06.cc
@@ -394,7 +394,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_rhs.compress(VectorOperation::add);
diff --git a/tests/trilinos/assemble_matrix_parallel_07.cc b/tests/trilinos/assemble_matrix_parallel_07.cc
index 381d4941bd..d8fa740aa9 100644
--- a/tests/trilinos/assemble_matrix_parallel_07.cc
+++ b/tests/trilinos/assemble_matrix_parallel_07.cc
@@ -386,7 +386,7 @@ void LaplaceProblem<dim>::assemble_test ()
                           std_cxx11::_1),
          Assembly::Scratch::Data<dim>(fe, quadrature),
          Assembly::Copy::Data (false),
-         2*multithread_info.n_threads(),
+         2*MultithreadInfo::n_threads(),
          1);
   test_matrix.compress(VectorOperation::add);
   test_matrix.compress(VectorOperation::add);
-- 
2.39.5