From: Baerbel Jannsen Date: Thu, 26 Aug 2010 15:56:23 +0000 (+0000) Subject: changed the MGConstraints to MGConstrainedDoFs X-Git-Tag: v8.0.0~5663 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f007af41fa34726d267b12ddb3e0c38a165262b9;p=dealii.git changed the MGConstraints to MGConstrainedDoFs git-svn-id: https://svn.dealii.org/trunk@21735 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-16/step-16.cc b/deal.II/examples/step-16/step-16.cc index 383d8a3fea..122c742bd5 100644 --- a/deal.II/examples/step-16/step-16.cc +++ b/deal.II/examples/step-16/step-16.cc @@ -75,7 +75,7 @@ // operator (solver or preconditioner). #include #include -#include +#include #include #include #include @@ -179,7 +179,7 @@ class LaplaceProblem MGLevelObject mg_sparsity_patterns; MGLevelObject > mg_matrices; MGLevelObject > mg_interface_matrices; - MGConstraints mg_constraints; + MGConstrainedDoFs mg_constrained_dofs; }; @@ -349,8 +349,8 @@ void LaplaceProblem::setup_system () // the boundary values as well, so we // pass the dirichlet_boundary // here as well. - mg_constraints.clear(); - mg_constraints.initialize(mg_dof_handler, dirichlet_boundary); + mg_constrained_dofs.clear(); + mg_constrained_dofs.initialize(mg_dof_handler, dirichlet_boundary); // Now for the things that concern the @@ -555,9 +555,9 @@ void LaplaceProblem::assemble_multigrid () // already computed the information for us // when we called initialize in setup_system(). std::vector > interface_dofs - = mg_constraints.get_refinement_edge_indices (); + = mg_constrained_dofs.get_refinement_edge_indices (); std::vector > boundary_interface_dofs - = mg_constraints.get_refinement_edge_boundary_indices (); + = mg_constrained_dofs.get_refinement_edge_boundary_indices (); // The indices just identified will later // be used to decide where the assembled value @@ -589,7 +589,7 @@ void LaplaceProblem::assemble_multigrid () for (unsigned int level=0; level::solve () // Create the object that deals with the transfer // between different refinement levels. We need to // pass it the hanging node constraints. - MGTransferPrebuilt > mg_transfer(hanging_node_constraints); + MGTransferPrebuilt > mg_transfer(hanging_node_constraints, mg_constrained_dofs); // Now the prolongation matrix has to be built. // This matrix needs to take the boundary values on // each level into account and needs to know about // the indices at the refinement egdes. The // MGConstraints knows about that so // pass it as an argument. - mg_transfer.build_matrices(mg_dof_handler, mg_constraints); + mg_transfer.build_matrices(mg_dof_handler); FullMatrix coarse_matrix; coarse_matrix.copy_from (mg_matrices[0]);