fluxfem 0.1.4__py3-none-any.whl → 0.2.1__py3-none-any.whl

fluxfem/mesh/dtypes.py

@@ -0,0 +1,12 @@
+import jax
+import jax.numpy as jnp
+import numpy as np
+
+
+def default_dtype() -> jnp.dtype:
+    return jnp.float64 if jax.config.read("jax_enable_x64") else jnp.float32
+
+
+DEFAULT_DTYPE = default_dtype()
+INDEX_DTYPE = jnp.int64
+NP_INDEX_DTYPE = np.int64

fluxfem/mesh/hex.py

@@ -5,9 +5,9 @@ from dataclasses import dataclass
 from typing import Optional, Dict, Tuple, List, Callable
 import jax
 import jax.numpy as jnp
-from ..core.dtypes import DEFAULT_DTYPE
 import numpy as np
 
+from .dtypes import INDEX_DTYPE, default_dtype
 from .base import BaseMesh, BaseMeshPytree
 
 
@@ -17,10 +17,10 @@ class HexMesh(BaseMesh):
     Structured / unstructured hex mesh (8-node linear hex elements).
     
     coords: (n_nodes, 3) float32
-    conn:   (n_elems, 8) int32  # node indices of each element
+    conn:   (n_elems, 8) int64  # node indices of each element
     """
     coords: jnp.ndarray  # shape (n_nodes, 3)
-    conn: jnp.ndarray    # shape (n_elems, 8), int32
+    conn: jnp.ndarray    # shape (n_elems, 8), int64
 
     def face_node_patterns(self):
         return [
@@ -59,8 +59,8 @@ def tag_axis_minmax_facets(
     Tag boundary facets on min/max of the given axis.
 
     Returns:
-        facets: (n_facets, 4) int32, quad node ids
-        facet_tags: (n_facets,) int32, dirichlet_tag on min side, neumann_tag on max side
+        facets: (n_facets, 4) int64, quad node ids
+        facet_tags: (n_facets,) int64, dirichlet_tag on min side, neumann_tag on max side
     """
     coords = np.asarray(mesh.coords)
     conn = np.asarray(mesh.conn)
@@ -99,7 +99,7 @@ def tag_axis_minmax_facets(
                 facet_map[key] = (nodes, tag)
 
     if not facet_map:
-        return jnp.empty((0, 4), dtype=jnp.int32), jnp.empty((0,), dtype=jnp.int32)
+        return jnp.empty((0, 4), dtype=INDEX_DTYPE), jnp.empty((0,), dtype=INDEX_DTYPE)
 
     facets = []
     tags = []
@@ -107,7 +107,7 @@ def tag_axis_minmax_facets(
         facets.append(nodes)
         tags.append(tag)
 
-    return jnp.array(facets, dtype=jnp.int32), jnp.array(tags, dtype=jnp.int32)
+    return jnp.array(facets, dtype=INDEX_DTYPE), jnp.array(tags, dtype=INDEX_DTYPE)
 
 
 @dataclass
@@ -135,9 +135,10 @@ class StructuredHexBox:
             raise ValueError("order must be 1, 2, or 3")
 
         ox, oy, oz = self.origin
-        xs = jnp.linspace(ox, ox + self.lx, self.nx + 1, dtype=DEFAULT_DTYPE)
-        ys = jnp.linspace(oy, oy + self.ly, self.ny + 1, dtype=DEFAULT_DTYPE)
-        zs = jnp.linspace(oz, oz + self.lz, self.nz + 1, dtype=DEFAULT_DTYPE)
+        dtype = default_dtype()
+        xs = jnp.linspace(ox, ox + self.lx, self.nx + 1, dtype=dtype)
+        ys = jnp.linspace(oy, oy + self.ly, self.ny + 1, dtype=dtype)
+        zs = jnp.linspace(oz, oz + self.lz, self.nz + 1, dtype=dtype)
 
         if self.order == 1:
             return self._build_hex8(xs, ys, zs)
@@ -151,7 +152,7 @@ class StructuredHexBox:
             for j in range(self.ny + 1):
                 for i in range(self.nx + 1):
                     coords_list.append([xs[i], ys[j], zs[k]])
-        coords = jnp.array(coords_list, dtype=DEFAULT_DTYPE)
+        coords = jnp.array(coords_list, dtype=default_dtype())
 
         def node_id(i: int, j: int, k: int) -> int:
             return k * (self.ny + 1) * (self.nx + 1) + j * (self.nx + 1) + i
@@ -170,7 +171,7 @@ class StructuredHexBox:
                     n011 = node_id(i,     j + 1, k + 1)
                     conn_list.append([n000, n100, n110, n010, n001, n101, n111, n011])
 
-        conn = jnp.array(conn_list, dtype=jnp.int32)
+        conn = jnp.array(conn_list, dtype=INDEX_DTYPE)
         return HexMesh(coords=coords, conn=conn)
 
     def _build_hex20(self, xs, ys, zs) -> HexMesh:
@@ -241,8 +242,8 @@ class StructuredHexBox:
                         ]
                     )
 
-        coords = jnp.array(coords_list, dtype=DEFAULT_DTYPE)
-        conn = jnp.array(conn_list, dtype=jnp.int32)
+        coords = jnp.array(coords_list, dtype=default_dtype())
+        conn = jnp.array(conn_list, dtype=INDEX_DTYPE)
         return HexMesh(coords=coords, conn=conn)
 
     def _build_hex27(self, xs, ys, zs) -> HexMesh:
@@ -323,6 +324,6 @@ class StructuredHexBox:
                     # order in lexicographic k,j,i -> length 27
                     conn_list.append(nodes)
 
-        coords = jnp.array(coords_list, dtype=DEFAULT_DTYPE)
-        conn = jnp.array(conn_list, dtype=jnp.int32)
+        coords = jnp.array(coords_list, dtype=default_dtype())
+        conn = jnp.array(conn_list, dtype=INDEX_DTYPE)
         return HexMesh(coords=coords, conn=conn)

fluxfem/mesh/io.py

@@ -3,6 +3,9 @@ from __future__ import annotations
 import numpy as np
 import jax
 import jax.numpy as jnp
+from typing import Optional
+
+from .dtypes import NP_INDEX_DTYPE
 
 DTYPE = jnp.float64 if jax.config.read("jax_enable_x64") else jnp.float32
 
@@ -10,7 +13,7 @@ try:
     import meshio
 except Exception as e:  # pragma: no cover
     meshio = None
-    meshio_import_error = e
+    meshio_import_error: Optional[Exception] = e
 else:
     meshio_import_error = None
 
@@ -34,12 +37,12 @@ def load_gmsh_mesh(path: str):
     msh = meshio.read(path)
     coords = np.asarray(msh.points[:, :3], dtype=DTYPE)
 
-    mesh = None
+    mesh: HexMesh | TetMesh | None = None
     if "hexahedron" in msh.cells_dict:
-        conn = np.asarray(msh.cells_dict["hexahedron"], dtype=np.int32)
+        conn = np.asarray(msh.cells_dict["hexahedron"], dtype=NP_INDEX_DTYPE)
         mesh = HexMesh(jnp.asarray(coords), jnp.asarray(conn))
     elif "tetra" in msh.cells_dict:
-        conn = np.asarray(msh.cells_dict["tetra"], dtype=np.int32)
+        conn = np.asarray(msh.cells_dict["tetra"], dtype=NP_INDEX_DTYPE)
         mesh = TetMesh(jnp.asarray(coords), jnp.asarray(conn))
     else:
         raise ValueError("gmsh mesh does not contain hexahedron or tetra cells")
@@ -50,7 +53,7 @@ def load_gmsh_mesh(path: str):
     cell_dict = msh.cells_dict
     for fkey in ("quad", "triangle", "tri"):
         if fkey in cell_dict:
-            facets = np.asarray(cell_dict[fkey], dtype=np.int32)
+            facets = np.asarray(cell_dict[fkey], dtype=NP_INDEX_DTYPE)
             break
     tags_raw = None
     if facets is not None:
@@ -63,7 +66,7 @@ def load_gmsh_mesh(path: str):
                         tags_raw = data
                         break
         if tags_raw is not None:
-            facet_tags = np.asarray(tags_raw, dtype=np.int32)
+            facet_tags = np.asarray(tags_raw, dtype=NP_INDEX_DTYPE)
 
     return mesh, facets, facet_tags