Extend non-nested MG to DG.

dealii · May 21, 2023 · e2eec85 · e2eec85
1 parent 89a79f2
commit e2eec85
Show file tree

Hide file tree

Showing 13 changed files with 1,053 additions and 145 deletions.
diff --git a/doc/news/changes/major/20230426FederHeinzMunchKronbichler b/doc/news/changes/major/20230426FederHeinzMunchKronbichler
@@ -0,0 +1,3 @@
+New: Add a two level transfer operator between non-nested multigrid levels for CG and DG.
+<br>
+(Marco Feder, Johannes Heinz, Peter Munch, Martin Kronbichler, 2023/04/26)
diff --git a/doc/news/changes/major/20230426FederMunchKronbichler b/doc/news/changes/major/20230426FederMunchKronbichler
diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.h
@@ -792,6 +792,13 @@ class MGTwoLevelTransferNonNested<dim,
    * rank.
    */
   std::vector<unsigned int> level_dof_indices_fine;
+
+  /**
+   * CRS like structure which points to DoFs accossiated with the same support
+   * point. The vector stays empty if only one DoF corresponds to one support
+   * point.
+   */
+  std::vector<unsigned int> level_dof_indices_fine_ptrs;
 };
 
 

diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_01.cc b/tests/multigrid-global-coarsening/non_nested_transfer_01.cc
@@ -124,14 +124,20 @@ test(int fe_degree, const Function<dim, Number> &function)
       deallog.pop();
     }
 
-  if (false)
+  if (fe_degree > 0)
     {
-      deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
+      deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
       do_test<dim, double>(FE_DGQ<dim>(fe_degree),
-                           FE_DGQ<dim>(fe_degree),
+                           FE_Q<dim>(fe_degree),
                            function);
       deallog.pop();
     }
+
+  deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
+  do_test<dim, double>(FE_DGQ<dim>(fe_degree),
+                       FE_DGQ<dim>(fe_degree),
+                       function);
+  deallog.pop();
 }
 
 int

diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_01.with_p4est=true.mpirun=1.output b/tests/multigrid-global-coarsening/non_nested_transfer_01.with_p4est=true.mpirun=1.output
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_01.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/non_nested_transfer_01.with_p4est=true.mpirun=2.output
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_02.cc b/tests/multigrid-global-coarsening/non_nested_transfer_02.cc
@@ -103,7 +103,7 @@ test(int fe_degree, const Function<dim, Number> &function)
   const auto str_fine   = std::to_string(fe_degree);
   const auto str_coarse = std::to_string(fe_degree);
 
-  if (false && fe_degree > 0)
+  if (fe_degree > 0)
     {
       deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
       do_test<dim, double>(FE_Q<dim>(fe_degree),
@@ -112,6 +112,14 @@ test(int fe_degree, const Function<dim, Number> &function)
       deallog.pop();
     }
 
+  if (fe_degree > 0)
+    {
+      deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_DGQ<dim>(fe_degree),
+                           FE_Q<dim>(fe_degree),
+                           function);
+      deallog.pop();
+    }
 
   {
     deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");

diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_02.with_p4est=true.mpirun=1.output b/tests/multigrid-global-coarsening/non_nested_transfer_02.with_p4est=true.mpirun=1.output
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_02.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/non_nested_transfer_02.with_p4est=true.mpirun=2.output
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_03.cc b/tests/multigrid-global-coarsening/non_nested_transfer_03.cc
@@ -121,7 +121,7 @@ test(int fe_degree, const Function<dim, Number> &function)
   const auto str_fine   = std::to_string(fe_degree);
   const auto str_coarse = std::to_string(fe_degree);
 
-  if (false && fe_degree > 0)
+  if (fe_degree > 0)
     {
       deallog.push("CG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
       do_test<dim, double>(FE_Q<dim>(fe_degree),
@@ -131,6 +131,16 @@ test(int fe_degree, const Function<dim, Number> &function)
     }
 
 
+  if (fe_degree > 0)
+    {
+      deallog.push("DG<2>(" + str_fine + ")<->CG<2>(" + str_coarse + ")");
+      do_test<dim, double>(FE_DGQ<dim>(fe_degree),
+                           FE_Q<dim>(fe_degree),
+                           function);
+      deallog.pop();
+    }
+
+
   {
     deallog.push("DG<2>(" + str_fine + ")<->DG<2>(" + str_coarse + ")");
     do_test<dim, double>(FE_DGQ<dim>(fe_degree),

diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_03.with_p4est=true.mpirun=1.output b/tests/multigrid-global-coarsening/non_nested_transfer_03.with_p4est=true.mpirun=1.output
diff --git a/tests/multigrid-global-coarsening/non_nested_transfer_03.with_p4est=true.mpirun=2.output b/tests/multigrid-global-coarsening/non_nested_transfer_03.with_p4est=true.mpirun=2.output