Fixes to be compatible with DOLFINx main (april 20, 2023) (#60)

* Fix integration domain handling (FEniCS/dolfinx#2617)

* Fix lifting

cpp/assemble_matrix.cpp

@@ -263,7 +263,7 @@ void assemble_exterior_facets(
                             const std::span<const std::int32_t>&,
                             const std::span<const T>)>& mat_add_values,
     const dolfinx::mesh::Mesh<double>& mesh,
-    const std::span<const std::int32_t>& facets,
+    std::span<const std::int32_t> facets,
     const std::function<void(const std::span<T>&,
                              const std::span<const std::uint32_t>&,
                              std::int32_t, int)>& apply_dof_transformation,
@@ -396,7 +396,7 @@ void assemble_cells_impl(
                             const std::span<const std::int32_t>&,
                             const std::span<const T>)>& mat_add_values,
     const dolfinx::mesh::Geometry<double>& geometry,
-    const std::vector<std::int32_t>& active_cells,
+    std::span<const std::int32_t> active_cells,
     std::function<void(std::span<T>, const std::span<const std::uint32_t>,
                        const std::int32_t, const int)>
         apply_dof_transformation,
@@ -571,7 +571,8 @@ void assemble_matrix_impl(
     const auto& fn = a.kernel(dolfinx::fem::IntegralType::cell, i);
     const auto& [coeffs, cstride]
         = coefficients.at({dolfinx::fem::IntegralType::cell, i});
-    const std::vector<std::int32_t>& active_cells = a.cell_domains(i);
+    std::span<const std::int32_t> active_cells
+        = a.domain(dolfinx::fem::IntegralType::cell, i);
     assemble_cells_impl<T>(
         mat_add_block_values, mat_add_values, mesh->geometry(), active_cells,
         apply_dof_transformation, dofs0, bs0,
@@ -584,7 +585,8 @@ void assemble_matrix_impl(
     const auto& fn = a.kernel(dolfinx::fem::IntegralType::exterior_facet, i);
     const auto& [coeffs, cstride]
         = coefficients.at({dolfinx::fem::IntegralType::exterior_facet, i});
-    const std::vector<std::int32_t>& facets = a.exterior_facet_domains(i);
+    std::span<const std::int32_t> facets
+        = a.domain(dolfinx::fem::IntegralType::exterior_facet, i);
     assemble_exterior_facets<T>(mat_add_block_values, mat_add_values, *mesh,
                                 facets, apply_dof_transformation, dofs0, bs0,
                                 apply_dof_transformation_to_transpose, dofs1,

cpp/assemble_vector.cpp

@@ -167,7 +167,8 @@ void _assemble_vector(
       };
 
       // Assemble over all active cells
-      const std::vector<std::int32_t>& active_cells = L.cell_domains(i);
+      std::span<const std::int32_t> active_cells
+          = L.domain(dolfinx::fem::IntegralType::cell, i);
       _assemble_entities_impl<T, 1>(b, active_cells, dofs, bs, mpc, fetch_cell,
                                     assemble_local_cell_vector);
     }
@@ -214,8 +215,8 @@ void _assemble_vector(
       };
 
       // Assemble over all active cells
-      const std::vector<std::int32_t>& active_facets
-          = L.exterior_facet_domains(i);
+      std::span<const std::int32_t> active_facets
+          = L.domain(dolfinx::fem::IntegralType::exterior_facet, i);
       _assemble_entities_impl<T, 2>(b, active_facets, dofs, bs, mpc, fetch_cell,
                                     assemble_local_exterior_facet_vector);
     }

cpp/lifting.h

@@ -278,7 +278,8 @@ void apply_lifting(
         }
       };
       // Assemble over all active cells
-      const std::vector<std::int32_t>& cells = a->cell_domains(i);
+      std::span<const std::int32_t> cells
+          = a->domain(dolfinx::fem::IntegralType::cell, i);
       lift_bc_entities<T, 1>(b, cells, dofmap0, dofmap1, bs0, bs1, bc_values1,
                              bc_markers1, mpc1, fetch_cells, lift_bcs_cell);
     }
@@ -363,8 +364,8 @@ void apply_lifting(
       };
 
       // Assemble over all active cells
-      const std::vector<std::int32_t>& active_facets
-          = a->exterior_facet_domains(i);
+      std::span<const std::int32_t> active_facets
+          = a->domain(dolfinx::fem::IntegralType::exterior_facet, i);
       impl::lift_bc_entities<T, 2>(b, active_facets, dofmap0, dofmap1, bs0, bs1,
                                    bc_values1, bc_markers1, mpc1, fetch_cell,
                                    lift_bc_exterior_facet);

cpp/utils.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <basix/mdspan.hpp>
 #include <dolfinx/geometry/utils.h>
+#include <dolfinx/la/petsc.h>
 #include <dolfinx/mesh/Mesh.h>
 #include <dolfinx/mesh/utils.h>
 

cpp/utils.h

@@ -18,6 +18,7 @@
 #include <dolfinx/graph/AdjacencyList.h>
 #include <dolfinx/la/SparsityPattern.h>
 #include <dolfinx/la/petsc.h>
+#include <dolfinx/mesh/MeshTags.h>
 #include <span>
 
 namespace impl
@@ -285,15 +286,15 @@ void build_standard_pattern(dolfinx::la::SparsityPattern& pattern,
     case dolfinx::fem::IntegralType::cell:
       for (int id : ids)
       {
-        const std::vector<std::int32_t>& cells = a.cell_domains(id);
+        std::span<const std::int32_t> cells = a.domain(type, id);
         dolfinx::fem::sparsitybuild::cells(pattern, cells,
                                            {{dofmaps[0], dofmaps[1]}});
       }
       break;
     case dolfinx::fem::IntegralType::interior_facet:
       for (int id : ids)
       {
-        const std::vector<std::int32_t>& facets = a.interior_facet_domains(id);
+        std::span<const std::int32_t> facets = a.domain(type, id);
         std::vector<std::int32_t> f;
         f.reserve(facets.size() / 2);
         for (std::size_t i = 0; i < facets.size(); i += 4)
@@ -305,7 +306,7 @@ void build_standard_pattern(dolfinx::la::SparsityPattern& pattern,
     case dolfinx::fem::IntegralType::exterior_facet:
       for (int id : ids)
       {
-        const std::vector<std::int32_t>& facets = a.exterior_facet_domains(id);
+        std::span<const std::int32_t> facets = a.domain(type, id);
         std::vector<std::int32_t> cells;
         cells.reserve(facets.size() / 2);
         for (std::size_t i = 0; i < facets.size(); i += 2)