sdfr 1.4.4__py3-none-win_amd64.whl → 1.4.6__py3-none-win_amd64.whl

sdfr/SDF.py

@@ -370,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
@@ -517,15 +517,9 @@ class Block:
         self._data_length = block.data_length
         self._dims = tuple(block.dims[: block.ndims])
         self._contents = block
-        self._owndata = True
         self._blocklist = block._blocklist
         self._data = None
 
-    def __del__(self):
-        if not self._owndata and self._data is not None:
-            clib = self._handle._clib
-            clib.sdf_free_block_data(self._handle, self._contents)
-
     def _numpy_from_buffer(self, data, blen):
         buffer_from_memory = ct.pythonapi.PyMemoryView_FromMemory
         buffer_from_memory.restype = ct.py_object
@@ -535,7 +529,6 @@ class Block:
         totype = _ct_datatypes[self._contents.datatype_out]
         cast = ct.cast(data, ct.POINTER(totype))
         buf = buffer_from_memory(cast, blen)
-        self._owndata = False
         return np.frombuffer(buf, dtype)
 
     @property
@@ -912,8 +905,10 @@ def get_header(h):
 
 
 def get_run_info(block):
+    import datetime
     from datetime import datetime as dtm
-    from datetime import UTC
+
+    utc = datetime.timezone.utc
 
     h = ct.cast(block.data, ct.POINTER(RunInfo)).contents
     d = {}
@@ -922,9 +917,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"] = 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")
+    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__ = "Thu Jun 19 14:32:34 2025 +0100"
-__commit_id__ = "1b49a56a9b844067b2d9900ef3cb45824821cefb"
+__commit_date__ = "Fri Aug 8 17:11:48 2025 +0100"
+__commit_id__ = "254251dfdad1469679c14dd9bbbadf472cd9225b"

sdfr/sdf_helper.py

@@ -1317,8 +1317,11 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
             k1 = "vmax"
             k = "vrange"
             vmin, vmax = 1e99, -1e99
-            if k not in kwargs and not (k0 in kwargs and k1 in kwargs) \
-                    and len(ray_list) > 0:
+            if (
+                k not in kwargs
+                and not (k0 in kwargs and k1 in kwargs)
+                and len(ray_list) > 0
+            ):
                 for v in ray_list:
                     if len(v.data) > 0:
                         vmin = min(vmin, v.data.min())
@@ -2034,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:
@@ -2052,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
 
@@ -2107,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():
@@ -2156,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:
@@ -2169,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
 
@@ -2177,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:
@@ -2198,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)
 

{sdfr-1.4.4.dist-info → sdfr-1.4.6.dist-info}/METADATA

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

sdfr-1.4.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
+sdfr/_commit_info.py,sha256=0rgHeEWqDT9BY-sUd4y9DzBpu47pTrR9Witiqaw_g-A,111
+sdfr/loadlib.py,sha256=xxp5MX-u7ZHIc12mcvN-y8L5UEjY-aEgINj2r-1swWk,2358
+sdfr/SDF.py,sha256=Vka3UM8TCbREKAf0-eppz5crPQ04bvGo2DjpMal4Kx0,31386
+sdfr/sdf_helper.py,sha256=EnwHKG0cHHkplE9wKAIdBb-XAhqvVbsG0aDea_6S3zU,63439
+sdfr/sdfc_shared.dll,sha256=dJ-8sXbze0DtqEvjrK4VhkPVOeke44HbseNw20HGI8s,121856
+sdfr/sdfc_shared.lib,sha256=oIgoIRQf3vaNLlzLS5fgpjpYXVXanlMp037A8EkWNeA,3616
+sdfr-1.4.6.dist-info/METADATA,sha256=R-u3p3Va7lHdIEud6a2DFNhIFB71_K8erUQRV3Lndw8,370
+sdfr-1.4.6.dist-info/WHEEL,sha256=s8reeTqZgG3jMO9N1mb5NZvAOJEkFQZZpEaDT4R2CPk,103
+sdfr-1.4.6.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.4.6.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.4.6.dist-info/RECORD,,

{sdfr-1.4.4.dist-info → sdfr-1.4.6.dist-info}/WHEEL

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

sdfr-1.4.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-sdfr/__init__.py,sha256=OxcJAJ0ADoE54vgqMQqxhoFWyU2ldb3fb-_LFyeZZfQ,1209
-sdfr/_commit_info.py,sha256=hqXwlOqYzU29y9NaKyuTotIZ84sBacjNh7bvhYqVsaE,112
-sdfr/loadlib.py,sha256=xxp5MX-u7ZHIc12mcvN-y8L5UEjY-aEgINj2r-1swWk,2358
-sdfr/SDF.py,sha256=fawFbkOiSIzeKOtc6Vic0OQ96q2on213IP4jSxLTbRo,31570
-sdfr/sdf_helper.py,sha256=n-2h-MrqQM-5p-lsmLhIealtSnsOeQTd-nNezYp0EgA,63670
-sdfr/sdfc_shared.dll,sha256=w22kJKHIxaFeAhdbm1EoElDhIUZoZLlZ8_bL2QwhXbs,121344
-sdfr/sdfc_shared.lib,sha256=S1N_78t9KbdIMK70zF5doUSQTPKnINn_MaOo_f1F_9k,3616
-sdfr-1.4.4.dist-info/METADATA,sha256=_2w8TOMMbZPmHFAhTMZOQ67AsYJEk7hCQioGlhVOItk,370
-sdfr-1.4.4.dist-info/WHEEL,sha256=M0M8yQSkdzjr-Re7BLxGdurZIJei1aSjIm-hgxnt5-w,103
-sdfr-1.4.4.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.4.4.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.4.4.dist-info/RECORD,,