Convert a few more locally-owned loops with filters. #13073

bangerth · 2021-12-14T22:29:13Z

Another follow-up to #12952.

/rebuild

bangerth · 2021-12-14T22:30:58Z

source/distributed/shared_tria.cc

+                                  IteratorFilters::LocallyOwnedCell())
+          {
+            (void)cell;
+            ++n_my_cells;


It is disappointing that one has to give the loop variable a name, but that appears to be the case based on the standard.

Would it be more elegant to use std::count_if here (and below)?

Or use what you did above in source/distributed/repartitioning_policy_tools.cc.

const auto locally_owned_cells = tria_in.active_cell_iterators() | IteratorFilters::LocallyOwnedCell(); const unsigned int n_locally_owned_active_cells = std::distance(locally_owned_cells.begin(), locally_owned_cells.end());

marcfehling · 2021-12-15T17:33:02Z

source/distributed/tria_base.cc

+      for (const auto &cell : this->active_cell_iterators() |
+                                IteratorFilters::SubdomainEqualTo(my_subdomain))
+        {
+          (void)cell;


marcfehling · 2021-12-15T17:33:28Z

source/distributed/tria.cc

@@ -22,6 +22,7 @@
 #include <deal.II/distributed/p4est_wrappers.h>
 #include <deal.II/distributed/tria.h>

+#include <deal.II/grid/filtered_iterator.h>


Doesn't look like you need it here?

Suggested change

#include <deal.II/grid/filtered_iterator.h>

marcfehling · 2021-12-15T17:33:38Z

source/distributed/shared_tria.cc

+          for (const auto &cell : this->cell_iterators() |
+                                    IteratorFilters::LocallyOwnedLevelCell())
+            {
+              (void)cell;


marcfehling · 2021-12-15T17:34:53Z

source/distributed/shared_tria.cc

+                                  IteratorFilters::LocallyOwnedCell())
+          {
+            (void)cell;
+            ++n_my_cells;


Or use what you did above in source/distributed/repartitioning_policy_tools.cc.

const auto locally_owned_cells = tria_in.active_cell_iterators() | IteratorFilters::LocallyOwnedCell(); const unsigned int n_locally_owned_active_cells = std::distance(locally_owned_cells.begin(), locally_owned_cells.end());

marcfehling · 2021-12-15T17:35:28Z

source/grid/grid_tools_cache.cc

@@ -156,10 +156,10 @@ namespace GridTools
          typename Triangulation<dim, spacedim>::active_cell_iterator>>
          boxes;
        boxes.reserve(tria->n_active_cells());
-        for (const auto &cell : tria->active_cell_iterators())
+        for (const auto &cell : tria->active_cell_iterators() |
+                                  IteratorFilters::LocallyOwnedCell())
          if (cell->is_locally_owned())


You don't need this anymore I guess.

Suggested change

if (cell->is_locally_owned())

bangerth · 2021-12-15T21:26:48Z

Ah yes, std::count_if is a clever solution. Thanks for pointing that out!

jppelteret

This is pretty cool :-)

jppelteret · 2021-12-28T17:59:30Z

source/distributed/fully_distributed_tria.cc

@@ -19,6 +19,7 @@

 #include <deal.II/distributed/fully_distributed_tria.h>

+#include <deal.II/grid/filtered_iterator.h>


It doesn't look as if IteratorFilters are used in this file?

jppelteret · 2021-12-28T18:31:12Z

source/distributed/tria_base.cc

-          // It is very unlikely that a single process has more than 2 billion
-          // cells, but we might as well check.
+          // It is very unlikely that a single process has more than 2
+          // billion cells, but we might as well check.


If you're going to push "billon" onto the next line, then maybe it makes sense to move the number "2" as well.

bangerth · 2021-12-28T21:17:59Z

Adjusted as requested!

bangerth · 2021-12-29T00:58:19Z

Seems to work now!

@marcfehling You put the block on this PR. Want to take another look?

bangerth · 2022-01-04T19:28:01Z

Ping?

bangerth · 2022-01-10T19:15:27Z

Ping? (@marcfehling had the last set of comments that created a hold on the PR.)

marcfehling

Sorry for the late feedback. Forgot about this open PR over the holidays.

marcfehling · 2022-01-15T18:03:46Z

source/distributed/repartitioning_policy_tools.cc

+    const auto locally_owned_cells =
+      tria_in.active_cell_iterators() | IteratorFilters::LocallyOwnedCell();
+    const unsigned int n_locally_owned_active_cells =
+      std::distance(locally_owned_cells.begin(), locally_owned_cells.end());


If you want, you can use std::count_if here, too.

Yes, so done!

marcfehling · 2022-01-17T10:12:12Z

source/distributed/repartitioning_policy_tools.cc

-        ++n_locally_owned_active_cells;
+    const unsigned int n_locally_owned_active_cells =
+      std::count_if(tria_in.begin_active(),
+                    tria_in.end(),


Suggested change

tria_in.end(),

typename Triangulation<dim, spacedim>::active_cell_iterator(

tria_in.end()),

This should fix the compiler problem

/home/runner/work/dealii/dealii/source/distributed/repartitioning_policy_tools.cc:210:20: note: deduced conflicting types for parameter ‘_IIter’ (‘dealii::TriaActiveIterator<dealii::CellAccessor<1, 1> >’ and ‘dealii::TriaIterator<dealii::CellAccessor<1, 1> >’)

bangerth added the ready to test label Dec 14, 2021

bangerth commented Dec 14, 2021

View reviewed changes

marcfehling requested changes Dec 15, 2021

View reviewed changes

bangerth force-pushed the filter branch from a43f891 to 178574d Compare December 15, 2021 21:26

jppelteret approved these changes Dec 28, 2021

View reviewed changes

Convert a few more locally-owned loops with filters.

ca4baff

bangerth force-pushed the filter branch from 178574d to ca4baff Compare December 28, 2021 21:17

masterleinad requested a review from marcfehling December 28, 2021 22:33

masterleinad approved these changes Jan 5, 2022

View reviewed changes

marcfehling approved these changes Jan 15, 2022

View reviewed changes

marcfehling approved these changes Jan 17, 2022

View reviewed changes

bangerth force-pushed the filter branch from 88f9fee to d41403a Compare January 18, 2022 14:58

Use std::count_if().

143a1c1

bangerth force-pushed the filter branch from d41403a to 143a1c1 Compare January 19, 2022 03:27

marcfehling approved these changes Jan 19, 2022

View reviewed changes

marcfehling merged commit fcbb8b6 into dealii:master Jan 19, 2022

bangerth deleted the filter branch January 19, 2022 15:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert a few more locally-owned loops with filters. #13073

Convert a few more locally-owned loops with filters. #13073

bangerth commented Dec 14, 2021

bangerth Dec 14, 2021

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021

bangerth commented Dec 15, 2021

jppelteret left a comment

jppelteret Dec 28, 2021

jppelteret Dec 28, 2021

bangerth commented Dec 28, 2021

bangerth commented Dec 29, 2021

bangerth commented Jan 4, 2022

bangerth commented Jan 10, 2022

marcfehling left a comment

marcfehling Jan 15, 2022

bangerth Jan 16, 2022

marcfehling Jan 17, 2022

		@@ -19,6 +19,7 @@

		#include <deal.II/distributed/fully_distributed_tria.h>

		#include <deal.II/grid/filtered_iterator.h>

	tria_in.end(),
	typename Triangulation<dim, spacedim>::active_cell_iterator(
	tria_in.end()),

Convert a few more locally-owned loops with filters. #13073

Convert a few more locally-owned loops with filters. #13073

Conversation

bangerth commented Dec 14, 2021

Choose a reason for hiding this comment

marcfehling Dec 15, 2021 • edited

Choose a reason for hiding this comment

marcfehling Dec 15, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcfehling Dec 15, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcfehling Dec 15, 2021 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bangerth commented Dec 15, 2021

jppelteret left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bangerth commented Dec 28, 2021

bangerth commented Dec 29, 2021

bangerth commented Jan 4, 2022

bangerth commented Jan 10, 2022

marcfehling left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021 •

edited

marcfehling Dec 15, 2021 •

edited