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

{nmag_python_3-0.0.5/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.5
+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

{nmag_python_3-0.0.5 → 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.5"
+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"

{nmag_python_3-0.0.5 → 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.5 → 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.5
+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

{nmag_python_3-0.0.5 → 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