From: Wolfgang Bangerth Date: Sun, 14 Mar 2010 01:19:19 +0000 (+0000) Subject: Remove one compile error. Others remain. X-Git-Tag: v8.0.0~6326 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be643af7c5f4079cf10fdc18d19bcbcfd652226;p=dealii.git Remove one compile error. Others remain. git-svn-id: https://svn.dealii.org/trunk@20822 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc index 855dc60ce6..860b1c8b9d 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -138,7 +138,7 @@ void print(const MGDoFHandler &dof, std::vector > &interf template -class LaplaceProblem +class LaplaceProblem { public: LaplaceProblem (const unsigned int deg); @@ -146,9 +146,9 @@ class LaplaceProblem private: void setup_system (); - void assemble_multigrid (const MGDoFHandler &mg_dof, + void assemble_multigrid (const MGDoFHandler &mg_dof, MGLevelObject > &matrices, - std::vector > + std::vector > &boundary_indices); void test (); void test_renumber (); @@ -167,10 +167,10 @@ class LaplaceProblem const unsigned int degree; - std::vector > + std::vector > boundary_indices; - std::vector > + std::vector > boundary_indices_renumbered; }; @@ -233,7 +233,7 @@ void LaplaceProblem::setup_system () mg_dof_handler_renumbered.n_dofs(level), mg_dof_handler_renumbered.max_couplings_between_dofs()); MGTools::make_sparsity_pattern (mg_dof_handler, mg_sparsity[level], level); - MGTools::make_sparsity_pattern (mg_dof_handler_renumbered, + MGTools::make_sparsity_pattern (mg_dof_handler_renumbered, mg_sparsity_renumbered[level], level); mg_sparsity[level].compress(); mg_sparsity_renumbered[level].compress(); @@ -245,11 +245,11 @@ void LaplaceProblem::setup_system () template void LaplaceProblem::assemble_multigrid (const MGDoFHandler &mgdof, MGLevelObject > &mgmatrices, - std::vector > &boundaryindices) -{ + std::vector > &boundaryindices) +{ QGauss quadrature_formula(1+degree); - FEValues fe_values (fe, quadrature_formula, + FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | update_quadrature_points | update_JxW_values); @@ -272,7 +272,7 @@ void LaplaceProblem::assemble_multigrid (const MGDoFHandler &mgdof, boundary_interface_dofs.push_back (tmp); } - MGTools::extract_inner_interface_dofs(mgdof, + MGTools::extract_inner_interface_dofs(mgdof, interface_dofs, boundary_interface_dofs); typename FunctionMap::type dirichlet_boundary; @@ -286,7 +286,7 @@ void LaplaceProblem::assemble_multigrid (const MGDoFHandler &mgdof, for (unsigned int level=0; level::assemble_multigrid (const MGDoFHandler &mgdof, template -void LaplaceProblem::test () +void LaplaceProblem::test () { - assemble_multigrid(mg_dof_handler, mg_matrices, + assemble_multigrid(mg_dof_handler, mg_matrices, boundary_indices); - assemble_multigrid(mg_dof_handler_renumbered, + assemble_multigrid(mg_dof_handler_renumbered, mg_matrices_renumbered, boundary_indices_renumbered); MGLevelObject > v(0, triangulation.n_levels()-1); @@ -341,15 +341,15 @@ void LaplaceProblem::test () { deallog << "Level " << l << std::endl; v = 1; - MGTools::apply_boundary_values(boundary_indices[l], mg_matrices[l]) + MGTools::apply_boundary_values(boundary_indices[l], mg_matrices[l]); MGTools::apply_boundary_values(boundary_indices_renumbered[l], mg_matrices[l]) /* - for(std::set::const_iterator b=boundary_indices[l].begin(); + for(std::set::const_iterator b=boundary_indices[l].begin(); b!=boundary_indices[l].end(); ++b) deallog << ' ' << *b; deallog << std::endl; - for(std::set::const_iterator b=boundary_indices_renumbered[l].begin(); + for(std::set::const_iterator b=boundary_indices_renumbered[l].begin(); b!=boundary_indices_renumbered[l].end(); ++b) deallog << ' ' << *b; deallog << std::endl; @@ -397,7 +397,7 @@ void LaplaceProblem::refine_local () } template -void LaplaceProblem::run () +void LaplaceProblem::run () { for (unsigned int cycle=0; cycle<7; ++cycle) { @@ -425,7 +425,7 @@ void LaplaceProblem::run () }; } -int main () +int main () { std::ofstream logfile("mg_renumbered_02/output"); deallog << std::setprecision(4);