From: Wolfgang Bangerth Date: Sat, 2 Jul 2011 22:34:58 +0000 (+0000) Subject: Make work again. X-Git-Tag: v8.0.0~3851 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d321d2ecfeee5bdb42a84c9cd6110eed046d934d;p=dealii.git Make work again. git-svn-id: https://svn.dealii.org/trunk@23914 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index c80be66217..8b7e7937b8 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -446,19 +446,19 @@ namespace LaplaceSolver = Threads::split_range (dof_handler.begin_active (), dof_handler.end (), n_threads); - - Threads::ThreadMutex mutex; - Threads::ThreadGroup<> threads; - for (unsigned int thread=0; thread::assemble_matrix) - (linear_system, - thread_ranges[thread].first, - thread_ranges[thread].second, - mutex); - } - threads.join_all(); - + + { + Threads::ThreadMutex mutex; + for (unsigned int thread=0; thread::solve_problem () { - Threads::ThreadGroup<> threads; - threads += Threads::spawn (*this, &WeightedResidual::solve_primal_problem)(); - threads.join_all (); - threads += Threads::spawn (*this, &WeightedResidual::solve_dual_problem)(); - threads.join_all (); + solve_primal_problem(); + solve_dual_problem(); } @@ -1684,16 +1680,14 @@ namespace LaplaceSolver .get_tria().n_active_cells()); const unsigned int n_threads = multithread_info.n_default_threads; - Threads::ThreadGroup<> threads; for (unsigned int i=0; i::estimate_some) - (primal_solution, - dual_weights, - n_threads, i, - error_indicators, - face_integrals); - threads.join_all(); + estimate_some + (primal_solution, + dual_weights, + n_threads, i, + error_indicators, + face_integrals); } unsigned int present_cell=0;