update tests

diff --git a/tests/base/task_09.cc b/tests/base/task_09.cc
index 0e0f2685f5f7ac2adbb90a6bad2519eaf2cf947e..238c8efc182d37391e89c3887ad469f5a5882a66 100644 (file)
--- 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 99a65d69cb03a411e6ef52c05e7bcdc12c739e4d..3a3687ac706f4afaa118c2cc3f76634be285c9f5 100644 (file)
--- 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 4809efdf1e4509221f1ab0ae1b9132805059c92a..450c1bf6e8667300438fdfef2f0eec7753e537b1 100644 (file)
--- 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 d065a6dc37c481e868a38e862a07552d592e770e..4b38ec0a4978826f6eb30ad48558a697d2a8f1ea 100644 (file)
--- 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 80c2df07892f54cdb21f0a60f5bf7336f8fd7d54..ecac8d547a011098f8d83bc2cd319cb0c1b1a3d6 100644 (file)
--- 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 0d1c8eae731ce27becd6f839fd7a653555aea32a..a26ce863acc18ff7700676cb0017d1888503fd66 100644 (file)
--- 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 f867078d380092fd9667ba816ad11736a1165638..946532e3904bdbe5e5849312e70cdc59ad577a66 100644 (file)
--- 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 c47485370eb3c441d1ed73c2c532ce8832f8755c..5aab2efd565bdc9bca99103a54f5f8115155e1ed 100644 (file)
--- 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 faab0e3786f2afc963bf9a4d153bd96f9992456c..1faeab62ae5be12ece66e512a84639e65c75d570 100644 (file)
--- 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 cb5882ce557e4a1a3e71478b21eec9aaf9fab5e7..ad71eb89a68304dbd0de144249260b9bd5bef243 100644 (file)
--- 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 8697f70bb314bf8879b5c64238d33fb6d1a5c0be..bdcc5338d8682188d42735987c9657d2501faf3c 100644 (file)
--- 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 c18c6038142e155f55702ade2766aaf497a6ae85..1db5bc658041f4be5dcb66bb49e980a027aff5c6 100644 (file)
--- 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 fe7ecbd81df7c588b145bbca41cd712a75992b83..68c45235cf0d1d32b74dd6a14bcb90385b1adefd 100644 (file)
--- 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 ffd0e095d017d9b637823122d4d3e9160ed131ff..55d9826653c0544e9ab196c357b7e6a97c8de893 100644 (file)
--- 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 4748531d6edbac6d579f3720950716c8132de6ec..7bc5e77eaaf879fd62c545b80a7b79bd30077402 100644 (file)
--- 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 7be5630c9c2db822b2b778d88bcb906e60046006..aeef2baca53fdd0e1791c39bba60ed8aee64a2a1 100644 (file)
--- 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 845da7345c6b8d88d4c8157161bcd62d59179a18..cb748e638d211c9a0504e7af84ec3b604b041f56 100644 (file)
--- 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 aa4d1570b528fbc4510691cda4146632e2b7e437..a3584779042b3e36a1a954ae4e5fcec84878c52f 100644 (file)
--- 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 4966a0a2d98ab5a97024d1713bc8057e04c8e405..049d4db43b8cf8c19e20fd336147a9dc9e0ae113 100644 (file)
--- 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 381d4941bd7e1a1f816637e04b43fd761e1998fc..d8fa740aa90943d0542a9e942e520c718a04f916 100644 (file)
--- 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);