phiFEM 0.8.1.dev1__py3-none-any.whl → 0.8.2.dev1__py3-none-any.whl

phifem/mesh_scripts.py

@@ -380,8 +380,9 @@ def _transfer_tags(
     # TODO: change this line to allow parallel computing
     source_tags = source_mesh_tags.values
 
-    dest_entities = np.arange(len(emap))
-    dest_tags = source_tags[emap]
+    num_entities = emap.topology.index_map(edim).size_local
+    dest_entities = np.arange(num_entities)
+    dest_tags = emap.sub_topology_to_topology(source_tags, False)
 
     dest_entities_indices = np.hstack(dest_entities).astype(np.int32)
     dest_entities_markers = np.hstack(dest_tags).astype(np.int32)
@@ -570,21 +571,30 @@ def _tag_facets(
     interior_facets = np.setdiff1d(all_facets, boundary_facets)
 
     cell_facet_pairs = _cells_facets_pairs(f2c_map, c2f_map, interior_facets)
-    levelset_eval_int = levelset_expression_facets.eval(mesh, cell_facet_pairs)
+    levelset_eval_int = levelset_expression_facets.eval(
+        mesh, cell_facet_pairs.reshape(-1, 2)
+    )
 
-    exterior_int = np.min(levelset_eval_int, axis=1) > 0.0
-    interior_int = np.max(levelset_eval_int, axis=1) < 0.0
+    geq_zero_int = np.greater_equal(np.min(levelset_eval_int, axis=1), 0.0)
+    leq_zero_int = np.less_equal(np.max(levelset_eval_int, axis=1), 0.0)
     direct_int = np.isclose(np.sum(np.abs(levelset_eval_int), axis=1), 0.0)
+    exterior_int = np.logical_and(geq_zero_int, ~direct_int)
+    interior_int = np.logical_and(leq_zero_int, ~direct_int)
 
     connected_cells = f2c_map[boundary_facets][:, 0]
 
     cell_facet_pairs = _compute_integration_entities(
         mesh, connected_cells, boundary_facets, 0
     )[0][1]
-    levelset_eval_bdy = levelset_expression_facets.eval(mesh, cell_facet_pairs)
-    exterior_bdy = np.min(levelset_eval_bdy, axis=1) > 0.0
-    interior_bdy = np.max(levelset_eval_bdy, axis=1) < 0.0
+    levelset_eval_bdy = levelset_expression_facets.eval(
+        mesh, cell_facet_pairs.reshape(-1, 2)
+    )
+
+    geq_zero_bdy = np.greater_equal(np.min(levelset_eval_bdy, axis=1), 0.0)
+    leq_zero_bdy = np.less_equal(np.max(levelset_eval_bdy, axis=1), 0.0)
     direct_bdy = np.isclose(np.sum(np.abs(levelset_eval_bdy), axis=1), 0.0)
+    exterior_bdy = np.logical_and(geq_zero_bdy, ~direct_bdy)
+    interior_bdy = np.logical_and(leq_zero_bdy, ~direct_bdy)
 
     facets_indices = np.hstack([interior_facets, boundary_facets])
     exterior = np.hstack([exterior_int, exterior_bdy])
@@ -702,7 +712,7 @@ def _compute_codim_interpolation_points(
     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()
+    return new_space.element.interpolation_points
 
 
 def _levelset_expression(
@@ -769,7 +779,7 @@ def compute_tags_measures(
         The boundaries measure.
         Submesh c-map, v-map and n-map.
     """
-    interpolation_points = detection_space.element.interpolation_points()
+    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)

{phifem-0.8.1.dev1.dist-info → phifem-0.8.2.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: phiFEM
-Version: 0.8.1.dev1
+Version: 0.8.2.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
@@ -12,7 +12,7 @@ License-File: COPYING.lesser
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: fenics-dolfinx==0.9.0
+Requires-Dist: fenics-dolfinx<0.11,>=0.9.0
 Description-Content-Type: text/markdown
 
 <p align="center" width="100%">

phifem-0.8.2.dev1.dist-info/RECORD

@@ -0,0 +1,7 @@
+phifem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+phifem/mesh_scripts.py,sha256=TIAGOjbfsHLrBFbNgvjs08iLEAPTabx-vrYUjmPcy0w,33678
+phifem-0.8.2.dev1.dist-info/METADATA,sha256=dQqGlLjoQ9B5uEGV9c_Gn-qZJeg-xsxQYyHUsceXlLY,5612
+phifem-0.8.2.dev1.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+phifem-0.8.2.dev1.dist-info/licenses/COPYING,sha256=xTplwv1WHIfqq_EHLvXcq4ZTBCvBUwhGX1JBNYXrYnE,35146
+phifem-0.8.2.dev1.dist-info/licenses/COPYING.lesser,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+phifem-0.8.2.dev1.dist-info/RECORD,,

{phifem-0.8.1.dev1.dist-info → phifem-0.8.2.dev1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any

phifem-0.8.1.dev1.dist-info/RECORD

@@ -1,7 +0,0 @@
-phifem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-phifem/mesh_scripts.py,sha256=AAUsA75d8UVjKTcjbie9Ap9GS0zFBR2rvNPRiAfT9L0,33222
-phifem-0.8.1.dev1.dist-info/METADATA,sha256=9N9PgoSH6zNVh_jN3XSkp_QVseI74H8y-3yYRESOLRM,5606
-phifem-0.8.1.dev1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-phifem-0.8.1.dev1.dist-info/licenses/COPYING,sha256=xTplwv1WHIfqq_EHLvXcq4ZTBCvBUwhGX1JBNYXrYnE,35146
-phifem-0.8.1.dev1.dist-info/licenses/COPYING.lesser,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-phifem-0.8.1.dev1.dist-info/RECORD,,