From 4709663b46ab59611a531aad21ccb5d6c75af686 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 2 Jul 2011 22:34:58 +0000 Subject: [PATCH] Make work again. git-svn-id: https://svn.dealii.org/trunk@23914 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/step-14.cc | 48 +++++++++++++++------------------- tests/bits/step-14/cmp/generic | 24 ++++++++--------- 2 files changed, 33 insertions(+), 39 deletions(-) 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; diff --git a/tests/bits/step-14/cmp/generic b/tests/bits/step-14/cmp/generic index a7e2d6a7cf..c3d0444de8 100644 --- a/tests/bits/step-14/cmp/generic +++ b/tests/bits/step-14/cmp/generic @@ -1,8 +1,8 @@ DEAL::Refinement cycle: 0 -DEAL:cg::Starting value 0.306186 +DEAL:cg::Starting value 0.31 DEAL:cg::Convergence step 8 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 21 value 0 # This file was generated by the deal.II library. @@ -556,9 +556,9 @@ b 2.6e+02 3.0e+02 m 3.0e+02 3.0e+02 x showpage DEAL:: Estimated error=0.00070 DEAL::Refinement cycle: 1 -DEAL:cg::Starting value 0.0975781 +DEAL:cg::Starting value 0.098 DEAL:cg::Convergence step 10 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 25 value 0 # This file was generated by the deal.II library. @@ -1073,9 +1073,9 @@ b 2.8e+02 3.0e+02 m 3.0e+02 3.0e+02 x showpage DEAL:: Estimated error=0.00089 DEAL::Refinement cycle: 2 -DEAL:cg::Starting value 0.136408 +DEAL:cg::Starting value 0.14 DEAL:cg::Convergence step 14 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 38 value 0 # This file was generated by the deal.II library. @@ -2137,9 +2137,9 @@ b 2.7e+02 2.8e+02 m 2.8e+02 2.8e+02 x showpage DEAL:: Estimated error=0.00045 DEAL::Refinement cycle: 3 -DEAL:cg::Starting value 0.161862 +DEAL:cg::Starting value 0.16 DEAL:cg::Convergence step 22 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 62 value 0 # This file was generated by the deal.II library. @@ -4784,9 +4784,9 @@ b 2.8e+02 2.8e+02 m 2.8e+02 2.8e+02 x showpage DEAL:: Estimated error=0.00024 DEAL::Refinement cycle: 4 -DEAL:cg::Starting value 0.180177 +DEAL:cg::Starting value 0.18 DEAL:cg::Convergence step 33 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 98 value 0 # This file was generated by the deal.II library. @@ -11518,9 +11518,9 @@ b 2.6e+02 2.7e+02 m 2.7e+02 2.7e+02 x showpage DEAL:: Estimated error=7.5e-05 DEAL::Refinement cycle: 5 -DEAL:cg::Starting value 0.147763 +DEAL:cg::Starting value 0.15 DEAL:cg::Convergence step 48 value 0 -DEAL:cg::Starting value 1.00000 +DEAL:cg::Starting value 1.0 DEAL:cg::Convergence step 157 value 0 # This file was generated by the deal.II library. -- 2.39.5