nmag-python-3 0.0.4__tar.gz → 0.0.6__tar.gz

{nmag_python_3-0.0.4/src/nmag_python_3.egg-info → nmag_python_3-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nmag-python-3
-Version: 0.0.4
+Version: 0.0.6
 Summary: Standalone Python 3 implementation of the Nmag micromagnetic simulation interface
 Author-email: TriMagnetix <info@trimagnetix.com>
 Classifier: Programming Language :: Python :: 3
@@ -9,9 +9,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pint
-Requires-Dist: numpy
+Requires-Dist: numpy<2.6,>=1.22
 Requires-Dist: scipy
-Requires-Dist: numba
+Requires-Dist: numba>=0.67
 Requires-Dist: tabulate
 Requires-Dist: meshio
 Requires-Dist: h5py
@@ -25,7 +25,7 @@ Provides-Extra: docs
 Requires-Dist: mkdocs==1.6.1; extra == "docs"
 Requires-Dist: mkdocs-material==9.7.7; extra == "docs"
 Requires-Dist: mkdocstrings==1.0.6; extra == "docs"
-Requires-Dist: mkdocstrings-python==2.0.5; extra == "docs"
+Requires-Dist: mkdocstrings-python==2.0.8; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: maturin<2,>=1.14; extra == "dev"
 Requires-Dist: h5py-stubs<0.2,>=0.1.2; extra == "dev"

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nmag-python-3"
-version = "0.0.4"
+version = "0.0.6"
 authors = [{ name = "TriMagnetix", email = "info@trimagnetix.com" }]
 description = "Standalone Python 3 implementation of the Nmag micromagnetic simulation interface"
 readme = "README.md"
@@ -12,7 +12,15 @@ requires-python = ">=3.10"
 classifiers = [
   "Programming Language :: Python :: 3",
   "Operating System :: OS Independent" ]
-dependencies = ["pint", "numpy", "scipy", "numba", "tabulate", "meshio", "h5py"]
+dependencies = [
+  "pint",
+  "numpy>=1.22,<2.6",
+  "scipy",
+  "numba>=0.67",
+  "tabulate",
+  "meshio",
+  "h5py",
+]
 
 [project.scripts]
 nmeshimport = "nmesh.cli.nmeshimport:main"
@@ -25,7 +33,7 @@ docs = [
   "mkdocs==1.6.1",
   "mkdocs-material==9.7.7",
   "mkdocstrings==1.0.6",
-  "mkdocstrings-python==2.0.5",
+  "mkdocstrings-python==2.0.8",
 ]
 dev = [
   "maturin>=1.14,<2",

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6}/src/nmag/simulation/__init__.py

@@ -264,7 +264,8 @@ class Simulation(
         Args:
             filename: Legacy Nmesh or Meshio-supported mesh file.
             region_names_and_mag_mats: ``(region_name, material)`` pairs in
-                ascending mesh-region order, starting at region 1.
+                ascending mesh-region order. Mesh region IDs do not need to be
+                contiguous or start at region 1.
             unit_length: Physical length represented by one mesh coordinate
                 unit.
             do_reorder: Request legacy node reordering. Reordering is currently
@@ -298,21 +299,24 @@ class Simulation(
         if manual_distribution is not None:
             self.mesh.set_vertex_distribution(manual_distribution)
 
-        self.region_name_list = [name for name, _ in region_names_and_mag_mats]
-        self.region_name_of_id = {
-            index: name for index, name in enumerate(self.region_name_list, start=1)
-        }
-        self.region_id_of_name = {name: index for index, name in self.region_name_of_id.items()}
-
-        mesh_region_ids = {int(region_id) for region_id in self.mesh.regions}
-        configured_region_ids = set(self.region_name_of_id)
-        if mesh_region_ids != configured_region_ids:
+        mesh_region_ids = sorted({int(region_id) for region_id in self.mesh.regions})
+        if len(mesh_region_ids) != len(region_names_and_mag_mats):
+            configured_names = [name for name, _ in region_names_and_mag_mats]
             raise ValueError(
                 "Mesh material regions do not match the configured region list: "
-                f"mesh={sorted(mesh_region_ids)}, configured={sorted(configured_region_ids)}. "
-                "Materials must be supplied in ascending mesh-region order."
+                f"mesh={mesh_region_ids}, configured={configured_names}. "
+                "Supply one material per mesh region, in ascending mesh-region order."
             )
 
+        self.region_name_list = [name for name, _ in region_names_and_mag_mats]
+        self.region_name_of_id = {
+            region_id: name
+            for region_id, name in zip(mesh_region_ids, self.region_name_list, strict=True)
+        }
+        self.region_id_of_name = {
+            name: region_id for region_id, name in self.region_name_of_id.items()
+        }
+
         self.mats_of_region_name = {}
         self.mat_of_mat_name = {}
         for name, materials in region_names_and_mag_mats:

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6}/src/nmag/vtk_export.py

@@ -8,6 +8,7 @@ from pathlib import Path
 import h5py
 import meshio
 import numpy as np
+from numpy.typing import ArrayLike
 
 import nmesh
 
@@ -77,7 +78,7 @@ def export_vtk(
         if np.any(simplices < 0) or np.any(simplices >= len(points)):
             raise ValueError("Mesh cell indices are outside the snapshot point range.")
 
-        point_data: dict[str, np.ndarray] = {}
+        point_data: dict[str, ArrayLike] = {}
         field_group = handle.get("fields")
         if not isinstance(field_group, h5py.Group):
             raise ValueError("Snapshot is missing the /fields group.")
@@ -97,7 +98,7 @@ def export_vtk(
                 )
             point_data[field_name] = np.asarray(values, dtype=float)
 
-    cell_data: dict[str, list[np.ndarray]] = {}
+    cell_data: dict[str, list[ArrayLike]] = {}
     if regions is not None:
         cell_data["region"] = [regions]
     mesh = meshio.Mesh(

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6/src/nmag_python_3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nmag-python-3
-Version: 0.0.4
+Version: 0.0.6
 Summary: Standalone Python 3 implementation of the Nmag micromagnetic simulation interface
 Author-email: TriMagnetix <info@trimagnetix.com>
 Classifier: Programming Language :: Python :: 3
@@ -9,9 +9,9 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pint
-Requires-Dist: numpy
+Requires-Dist: numpy<2.6,>=1.22
 Requires-Dist: scipy
-Requires-Dist: numba
+Requires-Dist: numba>=0.67
 Requires-Dist: tabulate
 Requires-Dist: meshio
 Requires-Dist: h5py
@@ -25,7 +25,7 @@ Provides-Extra: docs
 Requires-Dist: mkdocs==1.6.1; extra == "docs"
 Requires-Dist: mkdocs-material==9.7.7; extra == "docs"
 Requires-Dist: mkdocstrings==1.0.6; extra == "docs"
-Requires-Dist: mkdocstrings-python==2.0.5; extra == "docs"
+Requires-Dist: mkdocstrings-python==2.0.8; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: maturin<2,>=1.14; extra == "dev"
 Requires-Dist: h5py-stubs<0.2,>=0.1.2; extra == "dev"

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6}/src/nmag_python_3.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pint
-numpy
+numpy<2.6,>=1.22
 scipy
-numba
+numba>=0.67
 tabulate
 meshio
 h5py
@@ -19,7 +19,7 @@ ruff<1,>=0.12
 mkdocs==1.6.1
 mkdocs-material==9.7.7
 mkdocstrings==1.0.6
-mkdocstrings-python==2.0.5
+mkdocstrings-python==2.0.8
 
 [rust]
 maturin<2,>=1.14

{nmag_python_3-0.0.4 → nmag_python_3-0.0.6}/src/nmesh/mesh_io.py

@@ -28,6 +28,11 @@ def _is_nmesh_hdf5_file(filename: str | Path) -> bool:
     return is_legacy_nmesh_hdf5(filename)
 
 
+def _is_netgen_neutral_file(filename: str | Path) -> bool:
+    name = Path(filename).name.lower()
+    return name.endswith((".neutral", ".neutral.gz"))
+
+
 def hdf5_mesh_get_permutation(filename: str | Path) -> list[int] | None:
     """Stub for retrieving permutation from HDF5."""
     log.warning("hdf5_mesh_get_permutation: HDF5 support is stubbed.")
@@ -62,6 +67,10 @@ class MeshFromFile(MeshBase):
             from .io.legacy_nmesh_hdf5 import load_raw_mesh_from_legacy_nmesh_hdf5
 
             raw = load_raw_mesh_from_legacy_nmesh_hdf5(path)
+        elif _is_netgen_neutral_file(path):
+            from .io.netgen import read_netgen_neutral
+
+            raw = read_netgen_neutral(path)
         else:
             from .io import load_raw_mesh_with_meshio