sdfr 1.4.3__py3-none-win32.whl → 1.4.5__py3-none-win32.whl

sdfr/SDF.py

@@ -340,6 +340,7 @@ class BlockList:
     """Contains all the blocks"""
 
     def __init__(self, filename, convert=False, derived=True):
+        self._handle = None
         clib = sdf_lib
         self._clib = clib
         clib.sdf_open.restype = ct.POINTER(SdfFile)
@@ -369,8 +370,8 @@ class BlockList:
         self.Header = get_header(h.contents)
         mesh_id_map = {}
         mesh_vars = []
-        self._block_ids = {}
-        self._block_names = {}
+        self._block_ids = {"Header": self.Header}
+        self._block_names = {"Header": self.Header}
         for n in range(h.contents.nblocks):
             block = block.contents
             block._handle = h
@@ -417,6 +418,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockLagrangianMesh(block)
                     newblock_mid = block
+                    newblock_mid._grid_block = newblock
                     mesh_id_map[newblock.id] = newblock
             elif blocktype == SdfBlockType.SDF_BLOCKTYPE_NAMEVALUE:
                 newblock = BlockNameValue(block)
@@ -430,6 +432,7 @@ class BlockList:
                 if block.datatype_out != 0:
                     newblock = BlockPlainMesh(block)
                     newblock_mid = block
+                    newblock_mid._grid_block = newblock
                     mesh_id_map[newblock.id] = newblock
             elif (
                 blocktype == SdfBlockType.SDF_BLOCKTYPE_POINT_DERIVED
@@ -474,6 +477,7 @@ class BlockList:
                 self._block_ids.update({nm: newblock})
                 nm = block_mid.name.decode() + "_mid"
                 self._block_names.update({nm: newblock})
+                newblock_mid._grid_block._grid_mid = newblock
 
         for var in mesh_vars:
             gid = var.grid_id
@@ -481,10 +485,12 @@ class BlockList:
                 var._grid = mesh_id_map[gid]
 
     def __del__(self):
-        self._clib.sdf_stack_destroy.argtypes = [ct.c_void_p]
-        self._clib.sdf_close.argtypes = [ct.c_void_p]
-        self._clib.sdf_stack_destroy(self._handle)
-        self._clib.sdf_close(self._handle)
+        if self._handle:
+            self._clib.sdf_stack_destroy.argtypes = [ct.c_void_p]
+            self._clib.sdf_close.argtypes = [ct.c_void_p]
+            self._clib.sdf_stack_destroy(self._handle)
+            self._clib.sdf_close(self._handle)
+            self._handle = None
 
     @property
     def name_dict(self):
@@ -600,6 +606,11 @@ class BlockPlainVariable(Block):
         """Associated mesh"""
         return self._grid
 
+    @property
+    def grid_mid(self):
+        """Associated median mesh"""
+        return self._grid._grid_mid
+
     @property
     def grid_id(self):
         """Associated mesh id"""
@@ -901,7 +912,10 @@ def get_header(h):
 
 
 def get_run_info(block):
-    from datetime import datetime
+    import datetime
+    from datetime import datetime as dtm
+
+    utc = datetime.timezone.utc
 
     h = ct.cast(block.data, ct.POINTER(RunInfo)).contents
     d = {}
@@ -910,9 +924,9 @@ def get_run_info(block):
     d["sha1sum"] = h.sha1sum.decode()
     d["compile_machine"] = h.compile_machine.decode()
     d["compile_flags"] = h.compile_flags.decode()
-    d["compile_date"] = datetime.utcfromtimestamp(h.compile_date).strftime("%c")
-    d["run_date"] = datetime.utcfromtimestamp(h.run_date).strftime("%c")
-    d["io_data"] = datetime.utcfromtimestamp(h.io_date).strftime("%c")
+    d["compile_date"] = dtm.fromtimestamp(h.compile_date, utc).strftime("%c")
+    d["run_date"] = dtm.fromtimestamp(h.run_date, utc).strftime("%c")
+    d["io_data"] = dtm.fromtimestamp(h.io_date, utc).strftime("%c")
     return d
 
 

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Tue Jun 10 10:08:15 2025 +0100"
-__commit_id__ = "78518bb920d66415e43857a26b0e7f914bd05da1"
+__commit_date__ = "Fri Jun 20 12:58:42 2025 +0100"
+__commit_id__ = "64516dfe112baa107ced7cda226188b3db02ea7d"

sdfr/sdf_helper.py

@@ -888,7 +888,7 @@ def plot1d(
     if title:
         subplot.set_title(get_title(var), fontsize="large", y=1.03)
 
-    figure.set_tight_layout(True)
+    figure.set_layout_engine("tight")
     figure.canvas.draw()
 
 
@@ -997,7 +997,7 @@ def plot_path(
         elif figure is None:
             figure = subplot.figure
         subplot.axis(plot_path.axis)
-        figure.set_tight_layout(True)
+        figure.set_layout_engine("tight")
         figure.canvas.draw()
         return
 
@@ -1251,7 +1251,7 @@ def plot_path(
             subplot.axis(lim)
 
     if update:
-        figure.set_tight_layout(True)
+        figure.set_layout_engine("tight")
         figure.canvas.draw()
 
 
@@ -1300,6 +1300,11 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
                 kwargs["hold"] = True
             return
 
+        if rays:
+            ray_list = [var.data[i] for i in rays]
+        else:
+            ray_list = var.data[ray_slice]
+
         if not isinstance(v, sdf.BlockLagrangianMesh):
             k = "cbar_label"
             if k not in kwargs or (
@@ -1311,30 +1316,26 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
             k0 = "vmin"
             k1 = "vmax"
             k = "vrange"
-            if k not in kwargs and not (k0 in kwargs and k1 in kwargs):
-                v = var.data[0]
-                vmin = v.data.min()
-                vmax = v.data.max()
-                if rays:
-                    ray_list = [var.data[i] for i in rays]
-                else:
-                    ray_list = var.data[ray_slice]
+            vmin, vmax = 1e99, -1e99
+            if (
+                k not in kwargs
+                and not (k0 in kwargs and k1 in kwargs)
+                and len(ray_list) > 0
+            ):
                 for v in ray_list:
-                    vmin = min(vmin, v.data.min())
-                    vmax = max(vmax, v.data.max())
-                if k0 not in kwargs:
-                    kwargs[k0] = vmin
-                if k1 not in kwargs:
-                    kwargs[k1] = vmax
+                    if len(v.data) > 0:
+                        vmin = min(vmin, v.data.min())
+                        vmax = max(vmax, v.data.max())
 
-        if rays:
-            ray_list = [var.data[i] for i in rays]
-        else:
-            ray_list = var.data[ray_slice]
+            if k0 not in kwargs:
+                kwargs[k0] = vmin
+            if k1 not in kwargs:
+                kwargs[k1] = vmax
 
         for v in ray_list:
-            plot_auto(v, update=False, **kwargs)
-            kwargs["hold"] = True
+            if len(v.data) > 0:
+                plot_auto(v, update=False, **kwargs)
+                kwargs["hold"] = True
 
         plot_auto(var.data[0], axis_only=True, **kwargs)
         kwargs["hold"] = True
@@ -1635,7 +1636,7 @@ def plot2d_array(
                 cbar.set_label(var_label, fontsize="large", x=1.2)
     figure.canvas.draw()
 
-    figure.set_tight_layout(True)
+    figure.set_layout_engine("tight")
     figure.canvas.draw()
 
 
@@ -1959,7 +1960,7 @@ def plot_levels(
         # gs.update(right=1-tw/fw)
         # ax.set_position([box.x0, box.y0, box.width + bw, box.height])
     else:
-        fig.set_tight_layout(True)
+        fig.set_layout_engine("tight")
     plt.draw()
 
 
@@ -2036,14 +2037,8 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
             except:
                 pass
 
-    sdfdict = {}
-    for key, value in data.__dict__.items():
-        if hasattr(value, "id"):
-            sdfdict[value.id] = value
-        else:
-            sdfdict[key] = value
+    sdfdict = data._block_ids
 
-    fdict = {}
     table = {"time": "t"}
     k = "Header"
     if k in sdfdict:
@@ -2054,7 +2049,6 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
             var = h[k]
             if verbose:
                 print(key + str(np.shape(var)) + " = " + k)
-            fdict[key] = var
             globals()[key] = var
             builtins.__dict__[key] = var
 
@@ -2109,39 +2103,10 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
             dims = str(tuple(int(i) for i in sdfdict[k].dims))
             if verbose:
                 print(key + dims + " = " + k)
-            fdict[key] = var
-            globals()[key] = var
-            builtins.__dict__[key] = var
-
-    k = "grid"
-    if k in sdfdict:
-        vargrid = sdfdict[k]
-        grid = vargrid
-        keys = "x", "y", "z"
-        for n in range(np.size(vargrid.dims)):
-            key = keys[n]
-            var = vargrid.data[n]
-            dims = str(tuple(int(i) for i in sdfdict[k].dims))
-            if verbose:
-                print(key + dims + " = " + k)
-            fdict[key] = var
             globals()[key] = var
             builtins.__dict__[key] = var
 
-    k = "grid_mid"
-    if k in sdfdict:
-        vargrid = sdfdict[k]
-        grid_mid = vargrid
-        keys = "xc", "yc", "zc"
-        for n in range(np.size(vargrid.dims)):
-            key = keys[n]
-            var = vargrid.data[n]
-            dims = str(tuple(int(i) for i in sdfdict[k].dims))
-            if verbose:
-                print(key + dims + " = " + k)
-            fdict[key] = var
-            globals()[key] = var
-            builtins.__dict__[key] = var
+    _get_grid(data)
 
     # Export particle arrays
     for k, value in data.__dict__.items():
@@ -2158,7 +2123,6 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
         if isinstance(value, sdf.BlockPointVariable):
             if verbose:
                 print(key + dims + " = " + value.name)
-            fdict[key] = var
             globals()[key] = var
             builtins.__dict__[key] = var
         else:
@@ -2171,7 +2135,6 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
                 dims = str(tuple(int(i) for i in value.dims))
                 if verbose:
                     print(gkey + dims + " = " + k + " " + keys[n])
-                fdict[gkey] = var
                 globals()[gkey] = var
                 builtins.__dict__[gkey] = var
 
@@ -2179,6 +2142,33 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
     return data
 
 
+def _get_grid(data, verbose=False):
+    sdfdict = {}
+    if hasattr(data, "_block_ids"):
+        sdfdict = data._block_ids
+
+    grids = "grid", "grid_mid"
+    grid_keys = ["x", "y", "z"], ["xc", "yc", "zc"]
+
+    for key, gkeys in zip(grids, grid_keys):
+        vargrid = None
+        if hasattr(data, key):
+            vargrid = data.grid
+        elif key in sdfdict:
+            vargrid = sdfdict[key]
+
+        if vargrid:
+            globals()[key] = vargrid
+            for n in range(np.size(vargrid.dims)):
+                key = gkeys[n]
+                var = vargrid.data[n]
+                dims = str(tuple(int(i) for i in vargrid.dims))
+                if verbose:
+                    print(key + dims + " = " + k)
+                globals()[key] = var
+                builtins.__dict__[key] = var
+
+
 def ogrid(skip=None, **kwargs):
     global x, y, mult_x, mult_y
     if np.ndim(x) == 1:
@@ -2200,8 +2190,15 @@ def ogrid(skip=None, **kwargs):
 
 
 def plotgrid(fname=None, iso=None, title=True):
-    if isinstance(fname, sdf.BlockList) or isinstance(fname, dict):
+    global grid
+    if (
+        isinstance(fname, sdf.BlockList)
+        or isinstance(fname, dict)
+        or hasattr(fname, "grid")
+    ):
         dat = fname
+        _get_grid(dat)
+        title = False
     elif fname is not None:
         dat = getdata(fname, verbose=verbose)
 
@@ -2225,7 +2222,7 @@ def plotgrid(fname=None, iso=None, title=True):
     plt.draw()
 
     fig = plt.gcf()
-    fig.set_tight_layout(True)
+    fig.set_layout_engine("tight")
     plt.draw()
 
 

{sdfr-1.4.3.dist-info → sdfr-1.4.5.dist-info}/METADATA

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

sdfr-1.4.5.dist-info/RECORD

@@ -0,0 +1,12 @@
+sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
+sdfr/_commit_info.py,sha256=9HQrcuM5QHd6sjf7BoxBdHycFer6VVwNvPkFa5hpc5c,112
+sdfr/loadlib.py,sha256=xxp5MX-u7ZHIc12mcvN-y8L5UEjY-aEgINj2r-1swWk,2358
+sdfr/SDF.py,sha256=Dm1Mf5Sr8Cf-J9H5wdPCAW5ywlqQFi9_nbmBSS86CV0,31638
+sdfr/sdf_helper.py,sha256=EnwHKG0cHHkplE9wKAIdBb-XAhqvVbsG0aDea_6S3zU,63439
+sdfr/sdfc_shared.dll,sha256=WPq5yRz8w3HqNwgWCeGjMCDZbmmePeRFeAmdDB9gnd8,102400
+sdfr/sdfc_shared.lib,sha256=3tq7FEdM0AIZ5XN6oilKzMfrbTk29r7JWvPq5UQpJw0,3652
+sdfr-1.4.5.dist-info/METADATA,sha256=mL1lsi_LnAljuFXLuP04YNi21rx8kuxnn4zWOKYHOaM,370
+sdfr-1.4.5.dist-info/WHEEL,sha256=2gMiQ9URLdcVSVn--wWLd3wXucnRxZtbu4ekGokbEAk,99
+sdfr-1.4.5.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.4.5.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.4.5.dist-info/RECORD,,

sdfr-1.4.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
-sdfr/_commit_info.py,sha256=m_JZRhDwnK9FYuMipiiKsSYgntEAJH7hyVCQZetAD-c,112
-sdfr/loadlib.py,sha256=xxp5MX-u7ZHIc12mcvN-y8L5UEjY-aEgINj2r-1swWk,2358
-sdfr/SDF.py,sha256=bt4DOuOTmbc_lvtTBz7khVtbaFStiO6RKN2FAq3DjrI,31144
-sdfr/sdf_helper.py,sha256=cI6F9531e7hbp6oe_hnjPi9pdl6QddsTbohqlNdyg6c,63755
-sdfr/sdfc_shared.dll,sha256=Ruh6tS3GlTuhk3GO-lFOja7mKAFjqe9emE7962nL3Vg,102400
-sdfr/sdfc_shared.lib,sha256=3tq7FEdM0AIZ5XN6oilKzMfrbTk29r7JWvPq5UQpJw0,3652
-sdfr-1.4.3.dist-info/METADATA,sha256=GTu3uSmFPTzK-K8j6cSPzDZHP7XzslpP6v1KnVi6cZU,370
-sdfr-1.4.3.dist-info/WHEEL,sha256=2gMiQ9URLdcVSVn--wWLd3wXucnRxZtbu4ekGokbEAk,99
-sdfr-1.4.3.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.4.3.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.4.3.dist-info/RECORD,,