sdfr 1.4.0__py3-none-macosx_11_0_arm64.whl → 1.4.1__py3-none-macosx_11_0_arm64.whl

sdfr/SDF.py

@@ -367,7 +367,7 @@ class BlockList:
 
         block = h.contents.blocklist
         self.Header = get_header(h.contents)
-        meshes = []
+        mesh_id_map = {}
         mesh_vars = []
         self._block_ids = {}
         self._block_names = {}
@@ -417,7 +417,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockLagrangianMesh(block)
                     newblock_mid = block
-                    meshes.append(newblock)
+                    mesh_id_map[newblock.id] = newblock
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_NAMEVALUE:
                 newblock = BlockNameValue(block)
             elif (
@@ -430,7 +430,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockPlainMesh(block)
                     newblock_mid = block
-                    meshes.append(newblock)
+                    mesh_id_map[newblock.id] = newblock
             elif (
                 blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_DERIVED
                 or blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_VARIABLE
@@ -439,7 +439,7 @@ class BlockList:
                 mesh_vars.append(newblock)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_MESH:
                 newblock = BlockPointMesh(block)
-                meshes.append(newblock)
+                mesh_id_map[newblock.id] = newblock
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_RUN_INFO:
                 self.Run_info = get_run_info(block)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_STATION:
@@ -452,7 +452,8 @@ class BlockList:
                 # print(name,SdfBlockType(blocktype).name)
                 pass
             if newblock is not None:
-                self.__dict__[name] = newblock
+                if not block.dont_display:
+                    self.__dict__[name] = newblock
                 self._block_ids.update({block.id.decode(): newblock})
                 self._block_names.update({block.name.decode(): newblock})
             block = block.next
@@ -467,7 +468,8 @@ class BlockList:
                     newblock = BlockLagrangianMesh(block_mid, mid=True)
                 elif blocktype == SdfBlockType.SDF_BLOCKTYPE_PLAIN_MESH:
                     newblock = BlockPlainMesh(block_mid, mid=True)
-                self.__dict__[name] = newblock
+                if not newblock_mid.dont_display:
+                    self.__dict__[name] = newblock
                 nm = block_mid.id.decode() + "_mid"
                 self._block_ids.update({nm: newblock})
                 nm = block_mid.name.decode() + "_mid"
@@ -475,10 +477,8 @@ class BlockList:
 
         for var in mesh_vars:
             gid = var.grid_id
-            for mesh in meshes:
-                if mesh.id == gid:
-                    var._grid = mesh
-                    break
+            if gid in mesh_id_map:
+                var._grid = mesh_id_map[gid]
 
     def __del__(self):
         self._clib.sdf_stack_destroy.argtypes = [ct.c_void_p]

sdfr/__init__.py

@@ -30,7 +30,10 @@ from .loadlib import (
 
 from importlib.metadata import version, PackageNotFoundError
 
-__version__ = version(_module_name)
+try:
+    __version__ = version(_module_name)
+except Exception:
+    __version__ = "0.0.0"
 
 __all__ = [
     "SDF",

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Tue May 20 13:50:42 2025 +0100"
-__commit_id__ = "f5e130988f5c6f06f9fb34a23cefc953857a3908"
+__commit_date__ = "Wed Jun 4 23:52:44 2025 +0100"
+__commit_id__ = "2a253d656c6c5be2d4ff1b7d0071155ef5f2f93c"

{sdfr-1.4.0.dist-info → sdfr-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sdfr
-Version: 1.4.0
+Version: 1.4.1
 Summary: Python module for processing SDF files
 Author-Email: Keith Bennett <k.bennett@warwick.ac.uk>
 Requires-Dist: numpy

sdfr-1.4.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+sdfr-1.4.1.dist-info/RECORD,,
+sdfr-1.4.1.dist-info/WHEEL,sha256=rKVRZG47BwjO0BuVS9GGfWnnPLBRGGrauSgGKfHqTLw,111
+sdfr-1.4.1.dist-info/METADATA,sha256=OpBhOHlMqYOw0H7MAMZDdSqIBvDHcfIzUPagTMoDz3U,370
+sdfr-1.4.1.dist-info/licenses/LICENSE,sha256=Qu02Dqb67LYxdjaA0WVeZMwzcDFF_bSearhX7yzLCJQ,1621
+sdfr-1.4.1.dist-info/licenses/LICENSE_README.txt,sha256=kU0OIq6O4_qqBwDWpJrPw2nNLWDCDI7oJGCe_JBF8j0,231
+sdfr/_commit_info.py,sha256=8jlsRsmJqc0ANqAJ-eIW6DJEmb5w2krDmoZTPcojnhI,109
+sdfr/sdf_helper.py,sha256=Fdod2nwFih-5h_Vpy2sq-sHPhAXOwKM-esfmQWGgbX4,61359
+sdfr/__init__.py,sha256=nZLaiq81DjL97PgCXUGJ-qRDJ-KAJXN4qsJVEvSsAC8,1164
+sdfr/SDF.py,sha256=zgCH3qGIuk3BFGkRHpE924wr_9YpmikGSxGnSKk_yxM,30176
+sdfr/loadlib.py,sha256=dr5jYKAjAhW0jKCzudphV0D4e3-6lxAufsTVJHKYcZ8,2262
+sdfr/libsdfc_shared.dylib,sha256=VOuGvDHHRMMmwI5aDqA4lTaOSzsGZENmtIlfIS1GADI,173176

{sdfr-1.4.0.dist-info → sdfr-1.4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.11.3
+Generator: scikit-build-core 0.11.4
 Root-Is-Purelib: false
 Tag: py3-none-macosx_11_0_arm64
 

sdfr-1.4.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr/_commit_info.py,sha256=xWby5pBHkz40Df4UMHZ9hAQrFZmEhUpY0EwLKSy5QyE,110
-sdfr/sdf_helper.py,sha256=Fdod2nwFih-5h_Vpy2sq-sHPhAXOwKM-esfmQWGgbX4,61359
-sdfr/__init__.py,sha256=BAmluKbA8UkwlUTWKxjNyaSfx9xgTUaXovnSHQvr0qo,1111
-sdfr/SDF.py,sha256=-MbMqvOzQE3ifhN0gn_ulS2sXh3ijUT1GTIPgBI-hE0,30084
-sdfr/loadlib.py,sha256=dr5jYKAjAhW0jKCzudphV0D4e3-6lxAufsTVJHKYcZ8,2262
-sdfr/libsdfc_shared.dylib,sha256=cxT9NMCj3MC5rKEL8Irn_DAey4raec_wuKNg2NwdFw0,173176
-sdfr-1.4.0.dist-info/RECORD,,
-sdfr-1.4.0.dist-info/WHEEL,sha256=HTrPOApIPwPBm17ZPxRHsFBiLMv7HIyEx-CtG-rvYPM,111
-sdfr-1.4.0.dist-info/METADATA,sha256=lkxSLGXDi0cJXyueMbl5CWZelo3inMyLBplq13u0Sco,370
-sdfr-1.4.0.dist-info/licenses/LICENSE,sha256=Qu02Dqb67LYxdjaA0WVeZMwzcDFF_bSearhX7yzLCJQ,1621
-sdfr-1.4.0.dist-info/licenses/LICENSE_README.txt,sha256=kU0OIq6O4_qqBwDWpJrPw2nNLWDCDI7oJGCe_JBF8j0,231