sdfr 1.3.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,15 +439,21 @@ 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:
+                sdict = BlockStation(block, name)
+                self.__dict__.update({"StationBlocks": sdict})
+                self._block_ids.update({block.id.decode(): sdict})
+                self._block_names.update({block.name.decode(): sdict})
             else:
                 # Block not supported
                 # 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
@@ -462,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"
@@ -470,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]
@@ -803,6 +808,35 @@ class BlockData(Block):
         return self._mimetype
 
 
+def BlockStation(block, name):
+    """Station block"""
+    sdict = dict(
+        stations=None,
+        step=block.step,
+        step_increment=block.step_increment,
+        time=block.time,
+        time_increment=block.time_increment,
+    )
+
+    tdict = {}
+    for i in range(block.nstations):
+        varnames = []
+        for j in range(block.station_nvars[i]):
+            varnames.append(block.material_names[i + j + 1].decode())
+        stat = dict(variables=varnames)
+        stat.update({"station_move": bool(block.station_move[i])})
+        if block.ndims > 0:
+            stat.update({"station_x": block.station_x[i]})
+        if block.ndims > 1:
+            stat.update({"station_y": block.station_y[i]})
+        if block.ndims > 2:
+            stat.update({"station_z": block.station_z[i]})
+        tdict.update({block.station_names[i].decode(): stat})
+    sdict.update({"stations": tdict})
+
+    return {name: sdict}
+
+
 class BlockStitched(Block):
     """Stitched block"""
 

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__ = "Wed May 7 13:32:07 2025 +0100"
-__commit_id__ = "c22be2665c4bcbc9925fa702205ace2f99585439"
+__commit_date__ = "Wed Jun 4 23:52:44 2025 +0100"
+__commit_id__ = "2a253d656c6c5be2d4ff1b7d0071155ef5f2f93c"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sdfr
-Version: 1.3.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.3.0.dist-info → sdfr-1.4.1.dist-info}/WHEEL

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

sdfr-1.3.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr/_commit_info.py,sha256=T7y16HUeYZNuXukYkWPIJasprTNgJ374pZrP-7Fn4Is,109
-sdfr/sdf_helper.py,sha256=Fdod2nwFih-5h_Vpy2sq-sHPhAXOwKM-esfmQWGgbX4,61359
-sdfr/__init__.py,sha256=BAmluKbA8UkwlUTWKxjNyaSfx9xgTUaXovnSHQvr0qo,1111
-sdfr/SDF.py,sha256=IxOc0JTMVpMqVE5Xp4Vwdt6bzgJl5OkmvLA81tjuuHQ,28836
-sdfr/loadlib.py,sha256=dr5jYKAjAhW0jKCzudphV0D4e3-6lxAufsTVJHKYcZ8,2262
-sdfr/libsdfc_shared.dylib,sha256=CWhVFy-1lIotmHCJkxtErU8YuM_g4IVFovgyHa0ZEjs,173176
-sdfr-1.3.0.dist-info/RECORD,,
-sdfr-1.3.0.dist-info/WHEEL,sha256=IoXaaiGmdlaXKMxcV8qzyNxnbZ83Rlz8PkPkhmUIHwY,111
-sdfr-1.3.0.dist-info/METADATA,sha256=qhi1HXCNjSgmcm0qLSwEETcCJnsec_45pXXf_41noyo,370
-sdfr-1.3.0.dist-info/licenses/LICENSE,sha256=Qu02Dqb67LYxdjaA0WVeZMwzcDFF_bSearhX7yzLCJQ,1621
-sdfr-1.3.0.dist-info/licenses/LICENSE_README.txt,sha256=kU0OIq6O4_qqBwDWpJrPw2nNLWDCDI7oJGCe_JBF8j0,231