diff --git a/cpp/dolfinx/mesh/generation.h b/cpp/dolfinx/mesh/generation.h index 5afd4264f2..15bd2a4545 100644 --- a/cpp/dolfinx/mesh/generation.h +++ b/cpp/dolfinx/mesh/generation.h @@ -37,36 +37,36 @@ enum class DiagonalType namespace impl { template -Mesh build_tri(MPI_Comm comm, std::array, 2> p, +Mesh build_tri(MPI_Comm comm, std::array, 2> p, std::array n, const CellPartitionFunction& partitioner, DiagonalType diagonal); template -Mesh build_quad(MPI_Comm comm, const std::array, 2> p, +Mesh build_quad(MPI_Comm comm, const std::array, 2> p, std::array n, const CellPartitionFunction& partitioner); template std::vector create_geom(MPI_Comm comm, - std::array, 2> p, + std::array, 2> p, std::array n); template Mesh build_tet(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner); template Mesh build_hex(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner); template Mesh build_prism(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner); } // namespace impl @@ -93,7 +93,7 @@ Mesh build_prism(MPI_Comm comm, MPI_Comm subcomm, /// @return Mesh template Mesh create_box(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, CellType celltype, CellPartitionFunction partitioner = nullptr) { @@ -139,7 +139,7 @@ Mesh create_box(MPI_Comm comm, MPI_Comm subcomm, /// across MPI ranks. /// @return Mesh template -Mesh create_box(MPI_Comm comm, std::array, 2> p, +Mesh create_box(MPI_Comm comm, std::array, 2> p, std::array n, CellType celltype, const CellPartitionFunction& partitioner = nullptr) { @@ -163,7 +163,7 @@ Mesh create_box(MPI_Comm comm, std::array, 2> p, /// @param[in] diagonal Direction of diagonals /// @return Mesh template -Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, +Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, std::array n, CellType celltype, CellPartitionFunction partitioner, DiagonalType diagonal = DiagonalType::right) @@ -206,7 +206,7 @@ Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, /// @param[in] diagonal Direction of diagonals /// @return Mesh template -Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, +Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, std::array n, CellType celltype, DiagonalType diagonal = DiagonalType::right) { @@ -227,7 +227,7 @@ Mesh create_rectangle(MPI_Comm comm, std::array, 2> p, /// across MPI ranks. /// @return A mesh. template -Mesh create_interval(MPI_Comm comm, std::int64_t n, std::array p, +Mesh create_interval(MPI_Comm comm, std::int64_t n, std::array p, mesh::GhostMode ghost_mode = mesh::GhostMode::none, CellPartitionFunction partitioner = nullptr) { @@ -278,7 +278,7 @@ namespace impl { template std::vector create_geom(MPI_Comm comm, - std::array, 2> p, + std::array, 2> p, std::array n) { // Extract data @@ -327,7 +327,7 @@ std::vector create_geom(MPI_Comm comm, template Mesh build_tet(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner) { @@ -375,7 +375,7 @@ Mesh build_tet(MPI_Comm comm, MPI_Comm subcomm, template mesh::Mesh build_hex(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner) { @@ -418,7 +418,7 @@ mesh::Mesh build_hex(MPI_Comm comm, MPI_Comm subcomm, template Mesh build_prism(MPI_Comm comm, MPI_Comm subcomm, - std::array, 2> p, + std::array, 2> p, std::array n, const CellPartitionFunction& partitioner) { @@ -464,7 +464,7 @@ Mesh build_prism(MPI_Comm comm, MPI_Comm subcomm, } template -Mesh build_tri(MPI_Comm comm, std::array, 2> p, +Mesh build_tri(MPI_Comm comm, std::array, 2> p, std::array n, const CellPartitionFunction& partitioner, DiagonalType diagonal) @@ -621,7 +621,7 @@ Mesh build_tri(MPI_Comm comm, std::array, 2> p, } template -Mesh build_quad(MPI_Comm comm, const std::array, 2> p, +Mesh build_quad(MPI_Comm comm, const std::array, 2> p, std::array n, const CellPartitionFunction& partitioner) { diff --git a/python/dolfinx/wrappers/mesh.cpp b/python/dolfinx/wrappers/mesh.cpp index 8706760b90..b894a3903b 100644 --- a/python/dolfinx/wrappers/mesh.cpp +++ b/python/dolfinx/wrappers/mesh.cpp @@ -241,7 +241,7 @@ void declare_mesh(nb::module_& m, std::string type) std::string create_interval("create_interval_" + type); m.def( create_interval.c_str(), - [](MPICommWrapper comm, std::int64_t n, std::array p, + [](MPICommWrapper comm, std::int64_t n, std::array p, dolfinx::mesh::GhostMode ghost_mode, const PythonCellPartitionFunction& part) { @@ -254,7 +254,7 @@ void declare_mesh(nb::module_& m, std::string type) std::string create_rectangle("create_rectangle_" + type); m.def( create_rectangle.c_str(), - [](MPICommWrapper comm, std::array, 2> p, + [](MPICommWrapper comm, std::array, 2> p, std::array n, dolfinx::mesh::CellType celltype, const PythonCellPartitionFunction& part, dolfinx::mesh::DiagonalType diagonal) @@ -269,7 +269,7 @@ void declare_mesh(nb::module_& m, std::string type) std::string create_box("create_box_" + type); m.def( create_box.c_str(), - [](MPICommWrapper comm, std::array, 2> p, + [](MPICommWrapper comm, std::array, 2> p, std::array n, dolfinx::mesh::CellType celltype, const PythonCellPartitionFunction& part) {