From b0dbc56a564019a2d5ae9727f301e61febd664da Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Fri, 5 Aug 2016 22:24:45 -0700 Subject: [PATCH] Remove calls to deprecated MGLevelObject.clear() --- examples/step-16/step-16.cc | 6 +++--- examples/step-37/step-37.cc | 4 ++-- examples/step-39/step-39.cc | 6 +++--- examples/step-50/step-50.cc | 4 ++-- include/deal.II/multigrid/mg_smoother.h | 6 +++--- include/deal.II/multigrid/sparse_matrix_collection.h | 10 +++++----- tests/matrix_free/step-37.cc | 4 ++-- tests/mpi/flux_edge_01.cc | 6 +++--- tests/mpi/multigrid_adaptive.cc | 4 ++-- tests/mpi/multigrid_uniform.cc | 4 ++-- tests/mpi/step-39.cc | 6 +++--- tests/multigrid/mg_renumbered_01.cc | 4 ++-- tests/multigrid/step-16-02.cc | 6 +++--- tests/multigrid/step-16-03.cc | 4 ++-- tests/multigrid/step-16-04.cc | 4 ++-- tests/multigrid/step-16-50-mpi.cc | 4 ++-- tests/multigrid/step-16-50-serial.cc | 4 ++-- tests/multigrid/step-16-bdry1.cc | 6 +++--- tests/multigrid/step-16.cc | 4 ++-- tests/multigrid/step-39-02.cc | 8 ++++---- tests/multigrid/step-39-02a.cc | 8 ++++---- tests/multigrid/step-39-03.cc | 8 ++++---- tests/multigrid/step-39.cc | 6 +++--- tests/multigrid/step-50_01.cc | 4 ++-- 24 files changed, 65 insertions(+), 65 deletions(-) diff --git a/examples/step-16/step-16.cc b/examples/step-16/step-16.cc index 592698e958..33b6256016 100644 --- a/examples/step-16/step-16.cc +++ b/examples/step-16/step-16.cc @@ -319,11 +319,11 @@ namespace Step16 const unsigned int n_levels = triangulation.n_levels(); mg_interface_in.resize(0, n_levels-1); - mg_interface_in.clear (); + mg_interface_in.clear_elements (); mg_interface_out.resize(0, n_levels-1); - mg_interface_out.clear (); + mg_interface_out.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(0, n_levels-1); // Now, we have to provide a matrix on each level. To this end, we first diff --git a/examples/step-37/step-37.cc b/examples/step-37/step-37.cc index fd7af71d96..49b4e722fc 100644 --- a/examples/step-37/step-37.cc +++ b/examples/step-37/step-37.cc @@ -752,8 +752,8 @@ namespace Step37 setup_time = 0; system_matrix.clear(); - mg_matrices.clear(); - mg_constraints.clear(); + mg_matrices.clear_elements(); + mg_constraints.clear_elements(); dof_handler.distribute_dofs (fe); dof_handler.distribute_mg_dofs (fe); diff --git a/examples/step-39/step-39.cc b/examples/step-39/step-39.cc index b880cf5aa1..291b89d638 100644 --- a/examples/step-39/step-39.cc +++ b/examples/step-39/step-39.cc @@ -511,11 +511,11 @@ namespace Step39 // The global system is set up, now we attend to the level matrices. We // resize all matrix objects to hold one matrix per level. mg_matrix.resize(0, n_levels-1); - mg_matrix.clear(); + mg_matrix.clear_elements(); mg_matrix_dg_up.resize(0, n_levels-1); - mg_matrix_dg_up.clear(); + mg_matrix_dg_up.clear_elements(); mg_matrix_dg_down.resize(0, n_levels-1); - mg_matrix_dg_down.clear(); + mg_matrix_dg_down.clear_elements(); // It is important to update the sparsity patterns after clear() // was called for the level matrices, since the matrices lock the sparsity // pattern through the SmartPointer and Subscriptor mechanism. diff --git a/examples/step-50/step-50.cc b/examples/step-50/step-50.cc index a91498016f..b54e869c67 100644 --- a/examples/step-50/step-50.cc +++ b/examples/step-50/step-50.cc @@ -328,9 +328,9 @@ namespace Step50 const unsigned int n_levels = triangulation.n_global_levels(); mg_interface_matrices.resize(0, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); // Now, we have to provide a matrix on each // level. To this end, we first use the diff --git a/include/deal.II/multigrid/mg_smoother.h b/include/deal.II/multigrid/mg_smoother.h index 1c007aa58f..64c0d954d6 100644 --- a/include/deal.II/multigrid/mg_smoother.h +++ b/include/deal.II/multigrid/mg_smoother.h @@ -586,7 +586,7 @@ namespace mg inline void SmootherRelaxation::clear () { - MGLevelObject::clear(); + MGLevelObject::clear_elements(); } @@ -687,7 +687,7 @@ template inline void MGSmootherRelaxation::clear () { - smoothers.clear(); + smoothers.clear_elements(); unsigned int i=matrices.min_level(), max_level=matrices.max_level(); @@ -854,7 +854,7 @@ template inline void MGSmootherPrecondition::clear () { - smoothers.clear(); + smoothers.clear_elements(); unsigned int i=matrices.min_level(), max_level=matrices.max_level(); diff --git a/include/deal.II/multigrid/sparse_matrix_collection.h b/include/deal.II/multigrid/sparse_matrix_collection.h index 7980de5f19..917af7f800 100644 --- a/include/deal.II/multigrid/sparse_matrix_collection.h +++ b/include/deal.II/multigrid/sparse_matrix_collection.h @@ -63,15 +63,15 @@ namespace mg SparseMatrixCollection::resize(const unsigned int minlevel, const unsigned int maxlevel) { matrix.resize(minlevel, maxlevel); - matrix.clear(); + matrix.clear_elements(); matrix_up.resize(minlevel+1, maxlevel); - matrix_up.clear(); + matrix_up.clear_elements(); matrix_down.resize(minlevel+1, maxlevel); - matrix_down.clear(); + matrix_down.clear_elements(); matrix_in.resize(minlevel, maxlevel); - matrix_in.clear(); + matrix_in.clear_elements(); matrix_out.resize(minlevel, maxlevel); - matrix_out.clear(); + matrix_out.clear_elements(); sparsity.resize(minlevel, maxlevel); sparsity_edge.resize(minlevel, maxlevel); } diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index 34e393929a..eddfcfbf37 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -406,8 +406,8 @@ namespace Step37 void LaplaceProblem::setup_system () { system_matrix.clear(); - mg_matrices.clear(); - mg_constraints.clear(); + mg_matrices.clear_elements(); + mg_constraints.clear_elements(); dof_handler.distribute_dofs (fe); dof_handler.distribute_mg_dofs (fe); diff --git a/tests/mpi/flux_edge_01.cc b/tests/mpi/flux_edge_01.cc index f86d6228ba..fdefd80fe1 100644 --- a/tests/mpi/flux_edge_01.cc +++ b/tests/mpi/flux_edge_01.cc @@ -119,11 +119,11 @@ namespace Step39 const unsigned int n_levels = triangulation.n_global_levels(); mg_matrix.resize(0, n_levels-1); - mg_matrix.clear(); + mg_matrix.clear_elements(); mg_matrix_dg_up.resize(0, n_levels-1); - mg_matrix_dg_up.clear(); + mg_matrix_dg_up.clear_elements(); mg_matrix_dg_down.resize(0, n_levels-1); - mg_matrix_dg_down.clear(); + mg_matrix_dg_down.clear_elements(); for (unsigned int level=mg_matrix.min_level(); level<=mg_matrix.max_level(); ++level) diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index 233c81abc2..d1011816ac 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -209,9 +209,9 @@ namespace Step50 const unsigned int n_levels = triangulation.n_global_levels(); mg_interface_matrices.resize(0, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); for (unsigned int level=0; level::setup_system () } mg_matrices.resize(0, nlevels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_matrices_renumbered.resize(0, nlevels-1); - mg_matrices_renumbered.clear (); + mg_matrices_renumbered.clear_elements (); mg_sparsity.resize(0, nlevels-1); mg_sparsity_renumbered.resize(0, nlevels-1); diff --git a/tests/multigrid/step-16-02.cc b/tests/multigrid/step-16-02.cc index 6bd45e9ef4..e88e72f8ec 100644 --- a/tests/multigrid/step-16-02.cc +++ b/tests/multigrid/step-16-02.cc @@ -261,11 +261,11 @@ void LaplaceProblem::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_in.resize(0, n_levels-1); - mg_interface_in.clear (); + mg_interface_in.clear_elements (); mg_interface_out.resize(0, n_levels-1); - mg_interface_out.clear (); + mg_interface_out.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(0, n_levels-1); for (unsigned int level=0; level::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_matrices.resize(min_level, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(min_level, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(min_level, n_levels-1); for (unsigned int level=min_level; level::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_matrices.resize(min_level, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(min_level, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(min_level, n_levels-1); for (unsigned int level=min_level; level::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_matrices.resize(0, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(0, n_levels-1); for (unsigned int level=0; level::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_in.resize(0, n_levels-1); - mg_interface_in.clear (); + mg_interface_in.clear_elements (); mg_interface_out.resize(0, n_levels-1); - mg_interface_out.clear (); + mg_interface_out.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(0, n_levels-1); for (unsigned int level=0; level::setup_system () const unsigned int n_levels = triangulation.n_levels(); mg_interface_matrices.resize(0, n_levels-1); - mg_interface_matrices.clear (); + mg_interface_matrices.clear_elements (); mg_matrices.resize(0, n_levels-1); - mg_matrices.clear (); + mg_matrices.clear_elements (); mg_sparsity_patterns.resize(0, n_levels-1); for (unsigned int level=0; level