Remove deprecated CellAccessor::active()

diff --git a/contrib/python-bindings/source/cell_accessor_wrapper.cc b/contrib/python-bindings/source/cell_accessor_wrapper.cc
index 18a20428851a58574976911717229a79e6ff5b85..db46907472e190785156677243ee72c3563efdef 100644 (file)
--- a/contrib/python-bindings/source/cell_accessor_wrapper.cc
+++ b/contrib/python-bindings/source/cell_accessor_wrapper.cc
@@ -679,11 +679,11 @@ namespace python
   CellAccessorWrapper::active() const
   {
     if ((dim == 2) && (spacedim == 2))
-      return internal::cell_cast<2, 2>(cell_accessor)->active();
+      return internal::cell_cast<2, 2>(cell_accessor)->is_active();
     else if ((dim == 2) && (spacedim == 3))
-      return internal::cell_cast<2, 3>(cell_accessor)->active();
+      return internal::cell_cast<2, 3>(cell_accessor)->is_active();
     else
-      return internal::cell_cast<3, 3>(cell_accessor)->active();
+      return internal::cell_cast<3, 3>(cell_accessor)->is_active();
   }
 
 

diff --git a/doc/news/changes/incompatibilities/20210603DanielArndt b/doc/news/changes/incompatibilities/20210603DanielArndt
new file mode 100644 (file)
index 0000000..bc0582d
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20210603DanielArndt
@@ -0,0 +1,3 @@
+Removed: The deprecated member function CellAccessor::active() has been removed.
+<br>
+(Daniel Arndt, 2021/06/03)

diff --git a/include/deal.II/grid/tria_accessor.h b/include/deal.II/grid/tria_accessor.h
index 7556f1c90c56cd1db1c6c968d930453a4277f7b7..ece9c4c881848f7433128fc78218d8a953a00dd8 100644 (file)
--- a/include/deal.II/grid/tria_accessor.h
+++ b/include/deal.II/grid/tria_accessor.h
@@ -3637,23 +3637,6 @@ public:
    * @{
    */
 
-  /**
-   * Test that the cell has no children (this is the criterion for whether a
-   * cell is called "active").
-   *
-   * See the
-   * @ref GlossActive "glossary"
-   * for more information.
-   *
-   * @deprecated This function is deprecated. Use the is_active()
-   *   function instead, which satisfies the naming scheme of other
-   *   functions inquiring about yes/no properties of cells (e.g.,
-   *   is_ghost(), is_locally_owned(), etc.).
-   */
-  DEAL_II_DEPRECATED
-  bool
-  active() const;
-
   /**
    * Test that the cell has no children (this is the criterion for whether a
    * cell is called "active").

diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index 33589f3ff4d14f4096bf45d5a61d54963d88e44f..d857cc39845942ff4f3b38acad8dad2feb10634a 100644 (file)
--- a/include/deal.II/grid/tria_accessor.templates.h
+++ b/include/deal.II/grid/tria_accessor.templates.h
@@ -3659,15 +3659,6 @@ CellAccessor<dim, spacedim>::neighbor(const unsigned int face_no) const
 
 
 
-template <int dim, int spacedim>
-inline bool
-CellAccessor<dim, spacedim>::active() const
-{
-  return !this->has_children();
-}
-
-
-
 template <int dim, int spacedim>
 inline bool
 CellAccessor<dim, spacedim>::is_active() const

diff --git a/tests/base/mpi_noncontiguous_partitioner_02.cc b/tests/base/mpi_noncontiguous_partitioner_02.cc
index ff1eb448fbbd04bc31088e47dca8fcf22eeb2d4f..4814fba27f14abb0e769668f848192dbbacb7556 100644 (file)
--- a/tests/base/mpi_noncontiguous_partitioner_02.cc
+++ b/tests/base/mpi_noncontiguous_partitioner_02.cc
@@ -75,7 +75,7 @@ test(const MPI_Comm &comm, const bool do_revert, const unsigned int dir)
 
   // ... has (symm)
   for (const auto &cell : dof_handler.active_cell_iterators())
-    if (cell->active() && cell->is_locally_owned())
+    if (cell->is_active() && cell->is_locally_owned())
       {
         auto c = cell->center();
         for (unsigned int i = 0; i < dim; i++)

diff --git a/tests/matrix_free/compute_diagonal_01.cc b/tests/matrix_free/compute_diagonal_01.cc
index 27b02694e95c6de510dd20c43cf55e15ed149a87..8df8881a98ea417e8f3fa93b40dc850b5beff34e 100644 (file)
--- a/tests/matrix_free/compute_diagonal_01.cc
+++ b/tests/matrix_free/compute_diagonal_01.cc
@@ -33,7 +33,8 @@ test()
 
   tria.refine_global();
   for (auto &cell : tria.active_cell_iterators())
-    if (cell->active() && cell->is_locally_owned() && cell->center()[0] < 0.0)
+    if (cell->is_active() && cell->is_locally_owned() &&
+        cell->center()[0] < 0.0)
       cell->set_refine_flag();
   tria.execute_coarsening_and_refinement();
 

diff --git a/tests/matrix_free/compute_diagonal_04.cc b/tests/matrix_free/compute_diagonal_04.cc
index 83635df1b3382e6f1885331a4c5dde2098de1d89..257c097442f6cdc715f1df2d0c46aa3028b7971e 100644 (file)
--- a/tests/matrix_free/compute_diagonal_04.cc
+++ b/tests/matrix_free/compute_diagonal_04.cc
@@ -32,7 +32,8 @@ test()
 
   tria.refine_global();
   for (auto &cell : tria.active_cell_iterators())
-    if (cell->active() && cell->is_locally_owned() && cell->center()[0] < 0.0)
+    if (cell->is_active() && cell->is_locally_owned() &&
+        cell->center()[0] < 0.0)
       cell->set_refine_flag();
   tria.execute_coarsening_and_refinement();
 

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
index 2cc30638c51bdfc76e1cf00030ad86626272a5a5..621f8e8b8d5e379778a6421c6c931cef3f257b67 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_01.cc
@@ -68,7 +68,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
     tria.refine_global();
 
     for (auto &cell : tria.active_cell_iterators())
-      if (cell->active() && cell->center()[0] < 0.5)
+      if (cell->is_active() && cell->center()[0] < 0.5)
         cell->set_refine_flag();
     tria.execute_coarsening_and_refinement();
   };

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_02.cc b/tests/multigrid-global-coarsening/mg_transfer_a_02.cc
index 3fe7d77bff5571183eb32cd3abcf5554c245f8f0..f9ba6d81af375ae5e27a3dac17b9ef10c26f0c85 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_02.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_02.cc
@@ -55,7 +55,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
     tria.refine_global();
 
     for (auto &cell : tria.active_cell_iterators())
-      if (cell->active() && cell->center()[0] < 0.5)
+      if (cell->is_active() && cell->center()[0] < 0.5)
         cell->set_refine_flag();
     tria.execute_coarsening_and_refinement();
   };

diff --git a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
index 2509e5b8142594dbd79f840b9046d8cc3e281996..c9566506837e3a1d064c9193afdc7d9a80347f88 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_a_03.cc
@@ -55,7 +55,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
     tria.refine_global();
 
     for (auto &cell : tria.active_cell_iterators())
-      if (cell->active() && cell->center()[0] < 0.5)
+      if (cell->is_active() && cell->center()[0] < 0.5)
         cell->set_refine_flag();
     tria.execute_coarsening_and_refinement();
   };

diff --git a/tests/multigrid-global-coarsening/mg_transfer_p_01.cc b/tests/multigrid-global-coarsening/mg_transfer_p_01.cc
index ee719fb57ec0048ee669cc56d37255bb0f1803db..91561c532799fb8c68c6891acf55e68276244306 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_p_01.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_p_01.cc
@@ -70,7 +70,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
   tria.refine_global();
 
   for (auto &cell : tria.active_cell_iterators())
-    if (cell->active() && cell->center()[0] < 0.5)
+    if (cell->is_active() && cell->center()[0] < 0.5)
       cell->set_refine_flag();
   tria.execute_coarsening_and_refinement();
 

diff --git a/tests/multigrid-global-coarsening/mg_transfer_p_03.cc b/tests/multigrid-global-coarsening/mg_transfer_p_03.cc
index 106c0691a252d1bb1109bf569401e7f6e97237f3..aaa1e21d70be94e8a0608441d68aac5392ebb0a4 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_p_03.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_p_03.cc
@@ -57,7 +57,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
   tria.refine_global();
 
   for (auto &cell : tria.active_cell_iterators())
-    if (cell->active() && cell->center()[0] < 0.5)
+    if (cell->is_active() && cell->center()[0] < 0.5)
       cell->set_refine_flag();
   tria.execute_coarsening_and_refinement();
 

diff --git a/tests/multigrid-global-coarsening/mg_transfer_p_04.cc b/tests/multigrid-global-coarsening/mg_transfer_p_04.cc
index 595061025846617da4c62f4a5b0df2556b758360..004ee665a9ce94e0e06ca6045048d2c46e84c0d8 100644 (file)
--- a/tests/multigrid-global-coarsening/mg_transfer_p_04.cc
+++ b/tests/multigrid-global-coarsening/mg_transfer_p_04.cc
@@ -94,7 +94,7 @@ do_test(const FiniteElement<dim> &fe_fine, const FiniteElement<dim> &fe_coarse)
     tria.refine_global();
 
     for (auto &cell : tria.active_cell_iterators())
-      if (cell->active() && cell->center()[0] < 0.5)
+      if (cell->is_active() && cell->center()[0] < 0.5)
         cell->set_refine_flag();
     tria.execute_coarsening_and_refinement();
   };

diff --git a/tests/multigrid/mg_data_out_01.cc b/tests/multigrid/mg_data_out_01.cc
index 3cf902a492c0366b94b54c0e05be43954a60b30f..42dbc27f221f6135c0b24d10a41d5a49ae85913f 100644 (file)
--- a/tests/multigrid/mg_data_out_01.cc
+++ b/tests/multigrid/mg_data_out_01.cc
@@ -36,7 +36,8 @@ print(DataOut<dim> &data_out, const Triangulation<dim> &tria)
   for (auto cell = p.first(tria); cell.state() == IteratorState::valid;
        cell      = p.second(tria, cell))
     {
-      deallog << " cell lvl=" << cell->level() << " active=" << cell->active()
+      deallog << " cell lvl=" << cell->level()
+              << " active=" << cell->is_active()
               << " id=" << cell->id().to_string() << std::endl;
     }
 }

diff --git a/tests/multigrid/mg_data_out_02.cc b/tests/multigrid/mg_data_out_02.cc
index 72d0e2350692f929cb85adc68c6e04025ad964d1..b6ee6d259342cf3c9a0281ec622b8e5ef0537d97 100644 (file)
--- a/tests/multigrid/mg_data_out_02.cc
+++ b/tests/multigrid/mg_data_out_02.cc
@@ -37,7 +37,8 @@ print(DataOut<dim> &data_out, const Triangulation<dim> &tria)
   for (auto cell = p.first(tria); cell.state() == IteratorState::valid;
        cell      = p.second(tria, cell))
     {
-      deallog << " cell lvl=" << cell->level() << " active=" << cell->active()
+      deallog << " cell lvl=" << cell->level()
+              << " active=" << cell->is_active()
               << " owner=" << static_cast<int>(cell->level_subdomain_id())
               << " id=" << cell->id().to_string() << std::endl;
     }