phiFEM 0.7.1.dev1__tar.gz → 0.7.1.dev2__tar.gz

{phifem-0.7.1.dev1 → phifem-0.7.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phiFEM
-Version: 0.7.1.dev1
+Version: 0.7.1.dev2
 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.7.1.dev1 → phifem-0.7.1.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "phiFEM"
-version = "0.7.1.dev1"
+version = "0.7.1.dev2"
 authors = [
 	{ name="Raphaël Bulle", email="raphael.bulle@inria.fr" },
 	{ name="Michel Duprez", email="michel.duprez@inria.fr" },

{phifem-0.7.1.dev1 → phifem-0.7.1.dev2}/src/phifem/mesh_scripts.py

@@ -135,15 +135,14 @@ def _compute_detection_vector(
 
 
 def _compute_integration_entities(
-    mesh: Mesh, integration_cells: list[int], integration_facets: list[int], ind: int
-) -> ufl.Measure:
+    mesh: Mesh, integration_cells: list[int], integration_facets: list[int]
+) -> list[int]:
     """Compute the integration entities in order to build a one-sided integral over a set of given edges. This script is inspired from https://github.com/jorgensd/dolfinx-tutorial/issues/158.
 
     Args:
         mesh: the mesh on which we compute the measure.
         integration_cells: list of cells indices from which the integral is computed.
         integration_facets: list of facets indices on which the integral is computed.
-        ind: index used in the measure.
     Returns: the integration entities.
     """
     cdim = mesh.topology.dim
@@ -189,7 +188,7 @@ def _compute_integration_entities(
         np.column_stack((right_side_cells_rep, local_indices))
     ).astype(np.int32)
 
-    return [(ind, integration_entities)]
+    return integration_entities
 
 
 def _reshape_map(connect: AdjacencyList_int32) -> npt.NDArray[np.int32]:
@@ -610,7 +609,7 @@ def compute_tags_measures(
         cells_tags = _overwrite_tags(mesh, cells_tags, ow_cells_tags)
     if "facets" in overwrite_tags.keys():
         ow_facets_tags = overwrite_tags["facets"]
-        if np.any(np.isin([1, 2, 3, 4, 5, 6, 100, 101], ow_facets_tags.values)):
+        if np.any(np.isin([1, 2, 3, 4, 5, 6], ow_facets_tags.values)):
             raise ValueError("Cannot overwrite facets tags with values 1, 2, 3, 4, 5, 6, 100 or 101.")
         facets_tags = _overwrite_tags(mesh, facets_tags, ow_facets_tags)
 
@@ -618,15 +617,35 @@ def compute_tags_measures(
         submesh = None
         integration_cells = np.union1d(cells_tags.find(2), cells_tags.find(1))
         integration_entities_outside = _compute_integration_entities(
-            mesh, integration_cells, facets_tags.find(4), 100
-        )
+            mesh, integration_cells, facets_tags.find(4))
+        integration_entities_outside = [(100, integration_entities_outside)]
         integration_cells = np.union1d(cells_tags.find(2), cells_tags.find(3))
         integration_entities_inside = _compute_integration_entities(
-            mesh, integration_cells, facets_tags.find(3), 101
-        )
-        combined_integration_entities = (
-            integration_entities_outside + integration_entities_inside
-        )
+            mesh, integration_cells, facets_tags.find(3))
+        integration_entities_inside = [(101, integration_entities_inside)]
+        combined_integration_entities = integration_entities_outside + integration_entities_inside
+
+        non_phifem_mask = ~np.isin(facets_tags.values, [1, 2, 3, 4, 5, 6])
+        fdim = facets_tags.dim
+        boundary_facets = dfx.mesh.locate_entities_boundary(mesh, fdim, lambda x: np.ones_like(x[0]).astype(bool))
+        non_phifem_facets_bdy = np.isin(facets_tags.indices, boundary_facets)
+        non_phifem_mask *= non_phifem_facets_bdy
+        non_phifem_facets_ind = np.arange(len(facets_tags.indices))[non_phifem_mask]
+        non_phifem_facets = facets_tags.indices[non_phifem_facets_ind]
+        non_phifem_facets_tags = np.unique(facets_tags.values[non_phifem_facets_ind])
+        
+        for tag in non_phifem_facets_tags:
+            cdim = mesh.topology.dim
+            fdim = cdim - 1
+            mesh.topology.create_connectivity(fdim, cdim)
+            f2c_connect = mesh.topology.connectivity(fdim, cdim)
+            f2c_map = _reshape_map(f2c_connect)[0]
+
+            non_phifem_facets_cells = f2c_map[non_phifem_facets]
+
+            assert len(non_phifem_facets_cells) == len(non_phifem_facets)
+
+            combined_integration_entities += [(tag, _compute_integration_entities(mesh, non_phifem_facets_cells, facets_tags.find(tag)))]
 
         boundaries_measure = ufl.Measure(
             "ds", domain=mesh, subdomain_data=combined_integration_entities