phiFEM 0.7.2.dev2__py3-none-any.whl → 0.8.0.dev1__py3-none-any.whl

phifem/mesh_scripts.py

@@ -662,6 +662,60 @@ def _overwrite_tags(mesh, tags_to_overwrite, new_tags):
     return overwritten_tags
 
 
+def _compute_codim_interpolation_points(
+    space: dfx.fem.FunctionSpace,
+) -> np.ndarray[np.float64]:
+    """Compute the same FunctionSpace but defined over a submesh of codim 1.
+
+    Args:
+        space: the original space.
+
+    Return: a new space defined on a mesh of codim 1.
+    """
+    family_name = space.ufl_element().basix_element.family.name
+    degree = space.ufl_element().basix_element.degree
+    tdim = space.mesh.topology.dim
+    codim_mesh = dfx.mesh.create_submesh(space.mesh, tdim - 1, np.array([0.0]))[0]
+    codim_cell_name = codim_mesh.topology.cell_name()
+    new_elmt = element(family_name, codim_cell_name, degree)
+    new_space = dfx.fem.functionspace(codim_mesh, new_elmt)
+    return new_space.element.interpolation_points()
+
+
+def _levelset_expression(
+    mesh: dfx.mesh.Mesh,
+    levelset: Function | Callable,
+    interpolation_points: np.NDarray[np.float64],
+) -> Expression:
+    """Sanitize the levelset input by turning it into an Expression.
+
+    Args:
+        levelset: the levelset function.
+        detection_space: the detection space.
+
+    Return: the levelset as an Expression object.
+    """
+
+    # Sanitize levelset input
+    try:
+        # Test if levelset is a dolfinx.fem.Function
+        _ = levelset.function_space
+        levelset_expression = dfx.fem.Expression(
+            levelset, interpolation_points, comm=mesh.comm
+        )
+    except AttributeError:
+        try:
+            x = ufl.SpatialCoordinate(mesh)
+            levelset_expression = dfx.fem.Expression(
+                levelset(x), interpolation_points, comm=mesh.comm
+            )
+        except TypeError:
+            print(
+                "Invalid levelset type: must be either a dolfinx.fem.Function or a UFL based Callable."
+            )
+    return levelset_expression
+
+
 def compute_tags_measures(
     mesh: Mesh,
     levelset: Function | Callable,
@@ -692,27 +746,25 @@ def compute_tags_measures(
         The boundaries measure.
         Submesh c-map, v-map and n-map.
     """
-
-    # Sanitize levelset input
-    try:
-        levelset_expression = dfx.fem.Expression(
-            levelset, detection_space.element.interpolation_points()
-        )
-    except AttributeError:
-        try:
-            x = mesh.SpatialCoordinate(mesh)
-            levelset_expression = dfx.fem.Expression(
-                levelset(x), detection_space.element.interpolation_points()
-            )
-        except TypeError:
-            print(
-                "Invalid levelset type: must be either a dolfinx.fem.Function or a UFL based Callable."
-            )
+    interpolation_points = detection_space.element.interpolation_points()
+    levelset_expression = _levelset_expression(mesh, levelset, interpolation_points)
 
     cells_tags = _tag_cells(
         mesh, levelset_expression, single_layer_cut=single_layer_cut
     )
-    facets_tags = _tag_facets(mesh, cells_tags, discrete_levelset, detection_degree)
+
+    codim_interpolation_points = _compute_codim_interpolation_points(detection_space)
+    levelset_expression_facets = _levelset_expression(
+        mesh, levelset, codim_interpolation_points
+    )
+
+    facets_tags = _tag_facets(
+        mesh,
+        levelset_expression_facets,
+        cells_tags,
+        levelset_expression,
+        single_layer_cut=single_layer_cut,
+    )
 
     if overwrite_tags is not None:
         if "cells" in overwrite_tags:

{phifem-0.7.2.dev2.dist-info → phifem-0.8.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: phiFEM
-Version: 0.7.2.dev2
+Version: 0.8.0.dev1
 Summary: phiFEM: convenience tools to use the phiFEM immersed boundary finite element method with dolfinx.
 Project-URL: Homepage, https://github.com/PhiFEM/phiFEM
 Project-URL: Issues, https://github.com/PhiFEM/phiFEM/issues

phifem-0.8.0.dev1.dist-info/RECORD

@@ -0,0 +1,7 @@
+phifem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+phifem/mesh_scripts.py,sha256=g9G_QjgERcNNdo26tCGymidLYaCRzSvMYwVaCOmiDIs,32508
+phifem-0.8.0.dev1.dist-info/METADATA,sha256=jFmzNbqBlHFois1398voBC6m7rJyKoUpT_a6s_seKGI,5606
+phifem-0.8.0.dev1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+phifem-0.8.0.dev1.dist-info/licenses/COPYING,sha256=xTplwv1WHIfqq_EHLvXcq4ZTBCvBUwhGX1JBNYXrYnE,35146
+phifem-0.8.0.dev1.dist-info/licenses/COPYING.lesser,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+phifem-0.8.0.dev1.dist-info/RECORD,,

phifem-0.7.2.dev2.dist-info/RECORD

@@ -1,7 +0,0 @@
-phifem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-phifem/mesh_scripts.py,sha256=Im8vPg3NxA44qiynUmVkCvyu6C6tYcQLKhJpDY0FJbA,30820
-phifem-0.7.2.dev2.dist-info/METADATA,sha256=pggXcQxyYtwUxScyjZtHvFlmkiakNl8kLtbr9qCdj4s,5606
-phifem-0.7.2.dev2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-phifem-0.7.2.dev2.dist-info/licenses/COPYING,sha256=xTplwv1WHIfqq_EHLvXcq4ZTBCvBUwhGX1JBNYXrYnE,35146
-phifem-0.7.2.dev2.dist-info/licenses/COPYING.lesser,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-phifem-0.7.2.dev2.dist-info/RECORD,,