From b1c861b3229e6a8d42fb4786b4b019875cad4e9b Mon Sep 17 00:00:00 2001 From: kronbichler Date: Wed, 22 Oct 2008 10:21:35 +0000 Subject: [PATCH] Change step-31 and step-32 according to the change in the reinit function for Trilinos sparse matrices. git-svn-id: https://svn.dealii.org/trunk@17304 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-31/step-31.cc | 19 +++++-------------- deal.II/examples/step-32/step-32.cc | 29 +++++------------------------ 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/deal.II/examples/step-31/step-31.cc b/deal.II/examples/step-31/step-31.cc index 2cdf2f6e24..b95b43348f 100644 --- a/deal.II/examples/step-31/step-31.cc +++ b/deal.II/examples/step-31/step-31.cc @@ -1111,10 +1111,7 @@ void BoussinesqFlowProblem::setup_dofs () DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp, stokes_constraints, false); - BlockSparsityPattern stokes_sparsity_pattern; - stokes_sparsity_pattern.copy_from (csp); - - stokes_matrix.reinit (stokes_sparsity_pattern); + stokes_matrix.reinit (csp); stokes_matrix.collect_sizes(); } @@ -1142,11 +1139,8 @@ void BoussinesqFlowProblem::setup_dofs () DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp, stokes_constraints, false); - - BlockSparsityPattern stokes_preconditioner_sparsity_pattern; - stokes_preconditioner_sparsity_pattern.copy_from (csp); - stokes_preconditioner_matrix.reinit (stokes_preconditioner_sparsity_pattern); + stokes_preconditioner_matrix.reinit (csp); stokes_preconditioner_matrix.collect_sizes(); } @@ -1165,12 +1159,9 @@ void BoussinesqFlowProblem::setup_dofs () DoFTools::make_sparsity_pattern (temperature_dof_handler, csp, temperature_constraints, false); - SparsityPattern temperature_sparsity_pattern; - temperature_sparsity_pattern.copy_from (csp); - - temperature_matrix.reinit (temperature_sparsity_pattern); - temperature_mass_matrix.reinit (temperature_sparsity_pattern); - temperature_stiffness_matrix.reinit (temperature_sparsity_pattern); + temperature_matrix.reinit (csp); + temperature_mass_matrix.reinit (csp); + temperature_stiffness_matrix.reinit (csp); } // As last action in this function, diff --git a/deal.II/examples/step-32/step-32.cc b/deal.II/examples/step-32/step-32.cc index b0dd2d33ec..0c7e52e46e 100644 --- a/deal.II/examples/step-32/step-32.cc +++ b/deal.II/examples/step-32/step-32.cc @@ -639,8 +639,6 @@ void BoussinesqFlowProblem::setup_dofs () { stokes_matrix.clear (); - BlockSparsityPattern stokes_sparsity_pattern (2,2); - BlockCompressedSetSparsityPattern csp (2,2); csp.block(0,0).reinit (n_u, n_u); @@ -662,9 +660,7 @@ void BoussinesqFlowProblem::setup_dofs () DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp, stokes_constraints, false); - stokes_sparsity_pattern.copy_from (csp); - - stokes_matrix.reinit (stokes_partitioner, stokes_sparsity_pattern); + stokes_matrix.reinit (stokes_partitioner, csp); } { @@ -672,8 +668,6 @@ void BoussinesqFlowProblem::setup_dofs () Mp_preconditioner.reset (); stokes_preconditioner_matrix.clear (); - BlockSparsityPattern stokes_preconditioner_sparsity_pattern (2,2); - BlockCompressedSetSparsityPattern csp (2,2); csp.block(0,0).reinit (n_u, n_u); @@ -693,13 +687,8 @@ void BoussinesqFlowProblem::setup_dofs () DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp, stokes_constraints, false); - stokes_constraints.condense (csp); - - stokes_preconditioner_sparsity_pattern.copy_from (csp); - - stokes_preconditioner_matrix.reinit (stokes_partitioner, - stokes_preconditioner_sparsity_pattern); + stokes_preconditioner_matrix.reinit (stokes_partitioner, csp); } temperature_partitioner @@ -714,21 +703,13 @@ void BoussinesqFlowProblem::setup_dofs () temperature_stiffness_matrix.clear (); temperature_matrix.clear (); - SparsityPattern temperature_sparsity_pattern; - CompressedSetSparsityPattern csp (n_T, n_T); DoFTools::make_sparsity_pattern (temperature_dof_handler, csp, temperature_constraints, false); - temperature_constraints.condense (csp); - - temperature_sparsity_pattern.copy_from (csp); - temperature_matrix.reinit (temperature_partitioner, - temperature_sparsity_pattern); - temperature_mass_matrix.reinit (temperature_partitioner, - temperature_sparsity_pattern); - temperature_stiffness_matrix.reinit (temperature_partitioner, - temperature_sparsity_pattern); + temperature_matrix.reinit (temperature_partitioner, csp); + temperature_mass_matrix.reinit (temperature_partitioner, csp); + temperature_stiffness_matrix.reinit (temperature_partitioner, csp); } stokes_solution.reinit (stokes_partitioner); -- 2.39.5