sdfr 1.2.1__py3-none-win_amd64.whl → 1.3.0__py3-none-win_amd64.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
@@ -447,6 +452,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 +521,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 +619,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 +630,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 +647,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 +692,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

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Thu May 1 13:59:33 2025 +0100"
-__commit_id__ = "6700eab92d2526d52b012861672b0b9e6ff57975"
+__commit_date__ = "Wed May 7 13:32:07 2025 +0100"
+__commit_id__ = "c22be2665c4bcbc9925fa702205ace2f99585439"

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

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

sdfr-1.3.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+sdfr/__init__.py,sha256=vSTzC03qtlxqcn-7dewmUa59NvhaZ-QqBi1svDCDzIo,1153
+sdfr/_commit_info.py,sha256=TmprDWbFKQKXQpJ-hWS2ELdZ46OBHS0lMKb2QHUqiyo,111
+sdfr/loadlib.py,sha256=EMcnZhh68fS72Bjv8QtfDzPbowx1FfaqX4TPhDl-o94,2328
+sdfr/SDF.py,sha256=D4M4qiaK-rYgYKNOi19cWt07M0Dqb6kYgId0uFZtYo4,29770
+sdfr/sdf_helper.py,sha256=jS4fxmq1y7PeryrPFuB_Lgu5n88-cNggaWMvQy4XqSA,63682
+sdfr/sdfc_shared.dll,sha256=JYkR3mF1Ikr4xFZf7NdUN6WNx7CeTdJZVB8k5cCeXRg,13312
+sdfr-1.3.0.dist-info/METADATA,sha256=qhi1HXCNjSgmcm0qLSwEETcCJnsec_45pXXf_41noyo,370
+sdfr-1.3.0.dist-info/WHEEL,sha256=n3HxvvUxRudexxUBRcXuzD3-t2g3c6dOWZQFWqwqrFk,103
+sdfr-1.3.0.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.3.0.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.3.0.dist-info/RECORD,,

sdfr-1.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-sdfr/__init__.py,sha256=vSTzC03qtlxqcn-7dewmUa59NvhaZ-QqBi1svDCDzIo,1153
-sdfr/_commit_info.py,sha256=s_1eIAiO2sCAlYEX7FxbqKEyU88Z6yimpVnWN9ovOg0,111
-sdfr/loadlib.py,sha256=EMcnZhh68fS72Bjv8QtfDzPbowx1FfaqX4TPhDl-o94,2328
-sdfr/SDF.py,sha256=aJBqweNSYMBYwRDLY-7y9Niwq73WANstgnc8xKqp9Vc,27997
-sdfr/sdf_helper.py,sha256=jS4fxmq1y7PeryrPFuB_Lgu5n88-cNggaWMvQy4XqSA,63682
-sdfr/sdfc_shared.dll,sha256=Q7fPn9Jlxox64kW_BOH0Z4ynZhGZP5uDxuh4BW5BQFo,13312
-sdfr-1.2.1.dist-info/METADATA,sha256=OJsufcYrnuBoRhFTlSGoxyCFyYWdyn5d-NvWUZU1Fis,370
-sdfr-1.2.1.dist-info/WHEEL,sha256=n3HxvvUxRudexxUBRcXuzD3-t2g3c6dOWZQFWqwqrFk,103
-sdfr-1.2.1.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.2.1.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.2.1.dist-info/RECORD,,