From cd54f1dc08e577f98e991260fcdb4c4ed0f44424 Mon Sep 17 00:00:00 2001 From: Baerbel Jannsen Date: Thu, 26 Aug 2010 15:50:29 +0000 Subject: [PATCH] changed the call of the constructor in MGTransferPrebuilt due to changes in the library git-svn-id: https://svn.dealii.org/trunk@21731 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/multigrid/mg_output.cc | 11 ++++++++-- tests/multigrid/mg_renumbered_01.cc | 22 ++++++++++++------- tests/multigrid/mg_renumbered_03.cc | 21 +++++++++++------- .../multigrid/transfer_system_adaptive_02.cc | 9 ++++---- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/tests/multigrid/mg_output.cc b/tests/multigrid/mg_output.cc index 72aaf40a21..408b43fecb 100644 --- a/tests/multigrid/mg_output.cc +++ b/tests/multigrid/mg_output.cc @@ -231,10 +231,17 @@ void check_simple(const FiniteElement& fe) for (unsigned int level=0;level > transfer(hnc); + + MGConstrainedDoFs mg_constrained_dofs; + mg_constrained_dofs.initialize(mgdof); + + MGConstrainedDoFs mg_constrained_dofs_renumbered; + mg_constrained_dofs_renumbered.initialize(mgdof_renumbered); + + MGTransferPrebuilt > transfer(hnc, mg_constrained_dofs); transfer.build_matrices(mgdof); - MGTransferPrebuilt > transfer_renumbered(hnc_renumbered); + MGTransferPrebuilt > transfer_renumbered(hnc_renumbered, mg_constrained_dofs_renumbered); transfer_renumbered.build_matrices(mgdof_renumbered); Vector u(mgdof.n_dofs()); diff --git a/tests/multigrid/mg_renumbered_01.cc b/tests/multigrid/mg_renumbered_01.cc index f6c6015790..bc7115297a 100644 --- a/tests/multigrid/mg_renumbered_01.cc +++ b/tests/multigrid/mg_renumbered_01.cc @@ -322,10 +322,7 @@ void LaplaceProblem::test () typename FunctionMap::type dirichlet_boundary; ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[0] = &dirichlet_bc; - MGTools::make_boundary_list (mg_dof_handler, dirichlet_boundary, - boundary_indices); - MGTools::make_boundary_list (mg_dof_handler_renumbered, dirichlet_boundary, - boundary_indices_renumbered); + const unsigned int min_l = mg_matrices.get_minlevel(); const unsigned int max_l = mg_matrices.get_maxlevel(); for(unsigned int l=min_l; l::test () GrowingVectorMemory<> vector_memory; GrowingVectorMemory<> vector_memory_renumbered; - MGTransferPrebuilt > mg_transfer; - mg_transfer.build_matrices(mg_dof_handler, boundary_indices); - MGTransferPrebuilt > mg_transfer_renumbered; - mg_transfer_renumbered.build_matrices(mg_dof_handler_renumbered, boundary_indices_renumbered); + MGConstrainedDoFs mg_constrained_dofs; + mg_constrained_dofs.initialize(mg_dof_handler, dirichlet_boundary); + MGConstrainedDoFs mg_constrained_dofs_renumbered; + mg_constrained_dofs_renumbered.initialize(mg_dof_handler_renumbered, dirichlet_boundary); + + ConstraintMatrix constraints; + constraints.close(); + + MGTransferPrebuilt > mg_transfer (constraints, mg_constrained_dofs); + mg_transfer.build_matrices(mg_dof_handler); + MGTransferPrebuilt > mg_transfer_renumbered (constraints, mg_constrained_dofs_renumbered); + mg_transfer_renumbered.build_matrices(mg_dof_handler_renumbered); + FullMatrix coarse_matrix; coarse_matrix.copy_from (mg_matrices[0]); MGCoarseGridHouseholder > mg_coarse; diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc index d3b13db335..709599ae67 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -313,14 +313,19 @@ void LaplaceProblem::test () typename FunctionMap::type dirichlet_boundary; ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[0] = &dirichlet_bc; - MGTools::make_boundary_list (mg_dof_handler, dirichlet_boundary, - boundary_indices); - MGTools::make_boundary_list (mg_dof_handler_renumbered, dirichlet_boundary, - boundary_indices_renumbered); - MGTransferPrebuilt > mg_transfer; - mg_transfer.build_matrices(mg_dof_handler, boundary_indices); - MGTransferPrebuilt > mg_transfer_renumbered; - mg_transfer_renumbered.build_matrices(mg_dof_handler_renumbered, boundary_indices_renumbered); + + MGConstrainedDoFs mg_constrained_dofs; + mg_constrained_dofs.initialize(mg_dof_handler, dirichlet_boundary); + MGConstrainedDoFs mg_constrained_dofs_renumbered; + mg_constrained_dofs_renumbered.initialize(mg_dof_handler_renumbered, dirichlet_boundary); + + ConstraintMatrix constraints; + constraints.close(); + + MGTransferPrebuilt > mg_transfer (constraints, mg_constrained_dofs); + mg_transfer.build_matrices(mg_dof_handler); + MGTransferPrebuilt > mg_transfer_renumbered (constraints, mg_constrained_dofs_renumbered); + mg_transfer_renumbered.build_matrices(mg_dof_handler_renumbered); Vector test; test.reinit(mg_dof_handler.n_dofs()); diff --git a/tests/multigrid/transfer_system_adaptive_02.cc b/tests/multigrid/transfer_system_adaptive_02.cc index f749a8532b..aa7b0e46f0 100644 --- a/tests/multigrid/transfer_system_adaptive_02.cc +++ b/tests/multigrid/transfer_system_adaptive_02.cc @@ -148,11 +148,12 @@ void check (const FiniteElement& fe) ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[3] = &dirichlet_bc; - MGTools::make_boundary_list (mg_dof_handler, dirichlet_boundary, - boundary_indices); + MGConstrainedDoFs mg_constrained_dofs; + mg_constrained_dofs.initialize(mg_dof_handler, dirichlet_boundary); - MGTransferPrebuilt > transfer; - transfer.build_matrices(mg_dof_handler, boundary_indices); + ConstraintMatrix constraints; + MGTransferPrebuilt > transfer(constraints, mg_constrained_dofs); + transfer.build_matrices(mg_dof_handler); FullMatrix prolong_0_1 (mg_dof_handler.n_dofs(1), mg_dof_handler.n_dofs(0)); -- 2.39.5