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

sdfr/SDF.py

@@ -377,6 +377,7 @@ class BlockList:
             block._blocklist = self
             blocktype = block.blocktype
             newblock = None
+            newblock_mid = None
             name = get_member_name(block.name)
             if blocktype == SdfBlockType.SDF_BLOCKTYPE_ARRAY:
                 newblock = BlockArray(block)
@@ -413,8 +414,10 @@ class BlockList:
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_DATABLOCK:
                 newblock = BlockData(block)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_LAGRANGIAN_MESH:
-                newblock = BlockLagrangianMesh(block)
-                meshes.append(newblock)
+                if block.datatype_out != 0:
+                    newblock = BlockLagrangianMesh(block)
+                    newblock_mid = block
+                    meshes.append(newblock)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_NAMEVALUE:
                 newblock = BlockNameValue(block)
             elif (
@@ -424,8 +427,10 @@ class BlockList:
                 newblock = BlockPlainVariable(block)
                 mesh_vars.append(newblock)
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_PLAIN_MESH:
-                newblock = BlockPlainMesh(block)
-                meshes.append(newblock)
+                if block.datatype_out != 0:
+                    newblock = BlockPlainMesh(block)
+                    newblock_mid = block
+                    meshes.append(newblock)
             elif (
                 blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_DERIVED
                 or blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_VARIABLE
@@ -437,6 +442,11 @@ class BlockList:
                 meshes.append(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)
@@ -447,6 +457,22 @@ class BlockList:
                 self._block_names.update({block.name.decode(): newblock})
             block = block.next
 
+            if newblock_mid is not None:
+                block_mid = newblock_mid
+                block_mid._handle = h
+                block_mid._blocklist = self
+                blocktype = block_mid.blocktype
+                name = get_member_name(block_mid.name) + "_mid"
+                if blocktype == SdfBlockType.SDF_BLOCKTYPE_LAGRANGIAN_MESH:
+                    newblock = BlockLagrangianMesh(block_mid, mid=True)
+                elif blocktype == SdfBlockType.SDF_BLOCKTYPE_PLAIN_MESH:
+                    newblock = BlockPlainMesh(block_mid, mid=True)
+                self.__dict__[name] = newblock
+                nm = block_mid.id.decode() + "_mid"
+                self._block_ids.update({nm: newblock})
+                nm = block_mid.name.decode() + "_mid"
+                self._block_names.update({nm: newblock})
+
         for var in mesh_vars:
             gid = var.grid_id
             for mesh in meshes:
@@ -500,7 +526,7 @@ class Block:
         dtype = self._datatype
         if dtype == np.byte:
             dtype = np.dtype("|S1")
-        totype = _ct_datatypes[self._contents.datatype]
+        totype = _ct_datatypes[self._contents.datatype_out]
         cast = ct.cast(data, ct.POINTER(totype))
         buf = buffer_from_memory(cast, blen)
         self._owndata = False
@@ -598,8 +624,9 @@ class BlockPlainVariable(Block):
 class BlockPlainMesh(Block):
     """Plain mesh block"""
 
-    def __init__(self, block):
+    def __init__(self, block, mid=False):
         super().__init__(block)
+        self._mid = mid
         self._data = None
         self._units = tuple(
             [block.dim_units[i].decode() for i in range(block.ndims)]
@@ -608,6 +635,11 @@ class BlockPlainMesh(Block):
             [block.dim_labels[i].decode() for i in range(block.ndims)]
         )
         self._mult = None
+        self._bdims = self._dims
+        if mid:
+            self._id += "_mid"
+            self._name += "_mid"
+            self._dims = tuple([i - 1 for i in self._dims])
         if bool(block.dim_mults):
             self._mult = tuple(block.dim_mults[: block.ndims])
         if bool(block.extents):
@@ -620,9 +652,11 @@ class BlockPlainMesh(Block):
             clib = self._handle._clib
             clib.sdf_helper_read_data(self._handle, self._contents)
             grids = []
-            for i, d in enumerate(self.dims):
+            for i, d in enumerate(self._bdims):
                 blen = np.dtype(self._datatype).itemsize * d
                 array = self._numpy_from_buffer(self._contents.grids[i], blen)
+                if self._mid:
+                    array = 0.5 * (array[1:] + array[:-1])
                 grids.append(array)
             self._data = tuple(grids)
         return self._data
@@ -663,12 +697,20 @@ class BlockLagrangianMesh(BlockPlainMesh):
             clib = self._handle._clib
             clib.sdf_helper_read_data(self._handle, self._contents)
             blen = np.dtype(self._datatype).itemsize
-            for d in self.dims:
+            for d in self._bdims:
                 blen *= d
             grids = []
-            for i, d in enumerate(self.dims):
+            for i, d in enumerate(self._bdims):
                 array = self._numpy_from_buffer(self._contents.grids[i], blen)
-                array = array.reshape(self.dims, order="F")
+                array = array.reshape(self._bdims, order="F")
+                if self._mid:
+                    nn = len(self._bdims)
+                    for j in range(nn):
+                        s1 = nn * [slice(None)]
+                        s2 = nn * [slice(None)]
+                        s1[j] = slice(1, None)
+                        s2[j] = slice(None, -1)
+                        array = 0.5 * (array[tuple(s1)] + array[tuple(s2)])
                 grids.append(array)
             self._data = tuple(grids)
         return self._data
@@ -766,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/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Thu May 1 13:59:33 2025 +0100"
-__commit_id__ = "6700eab92d2526d52b012861672b0b9e6ff57975"
+__commit_date__ = "Tue May 20 13:50:42 2025 +0100"
+__commit_id__ = "f5e130988f5c6f06f9fb34a23cefc953857a3908"

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

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

sdfr-1.4.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+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

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

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

sdfr-1.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr-1.2.1.dist-info/RECORD,,
-sdfr-1.2.1.dist-info/WHEEL,sha256=IoXaaiGmdlaXKMxcV8qzyNxnbZ83Rlz8PkPkhmUIHwY,111
-sdfr-1.2.1.dist-info/METADATA,sha256=OJsufcYrnuBoRhFTlSGoxyCFyYWdyn5d-NvWUZU1Fis,370
-sdfr-1.2.1.dist-info/licenses/LICENSE,sha256=Qu02Dqb67LYxdjaA0WVeZMwzcDFF_bSearhX7yzLCJQ,1621
-sdfr-1.2.1.dist-info/licenses/LICENSE_README.txt,sha256=kU0OIq6O4_qqBwDWpJrPw2nNLWDCDI7oJGCe_JBF8j0,231
-sdfr/_commit_info.py,sha256=03ZVB4oAczRjnbBxfcM7X1THxQ11Vm3B8mDqC61pz7s,109
-sdfr/sdf_helper.py,sha256=Fdod2nwFih-5h_Vpy2sq-sHPhAXOwKM-esfmQWGgbX4,61359
-sdfr/__init__.py,sha256=BAmluKbA8UkwlUTWKxjNyaSfx9xgTUaXovnSHQvr0qo,1111
-sdfr/SDF.py,sha256=99DkI2imulUnLTGKXTbx1PKK_l_osdYYTv_cudipsjM,27100
-sdfr/loadlib.py,sha256=dr5jYKAjAhW0jKCzudphV0D4e3-6lxAufsTVJHKYcZ8,2262
-sdfr/libsdfc_shared.dylib,sha256=AcHbxFqDjnjgKSvWhFJ16nnGjQU7Q-o9Eq91ZOXDeoA,173176