sdfr 1.4.9__py3-none-win_amd64.whl → 1.4.11__py3-none-win_amd64.whl

sdfr/__init__.py

@@ -15,40 +15,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .SDF import (
-    new,
-    read,
-    SdfBlockType,
-    SdfGeometry,
-    SdfStagger,
-    SdfDataType,
-    SdfBlock,
-    SdfFile,
-    RunInfo,
-    BlockList,
-    Block,
-    BlockConstant,
-    BlockPlainVariable,
-    BlockPlainMesh,
-    BlockLagrangianMesh,
-    BlockPointMesh,
-    BlockPointVariable,
-    BlockNameValue,
-    BlockArray,
-    BlockData,
-    BlockStitched,
-    BlockStitchedPath,
-    BlockStitchedMaterial,
-    BlockStitchedMatvar,
-    BlockStitchedSpecies,
-    BlockStitchedTensor,
-)
+from .SDF import _new as new
+from .SDF import _read as read
+from .SDF import _get_md5 as get_md5
+from .SDF import _get_sha as get_sha
+from .SDF import _add_cpu_split as add_cpu_split
+from .SDF import _add_stitched as add_stitched
+from .SDF import _add_stitched_vector as add_stitched_vector
+from .SDF import _add_stitched_material as add_stitched_material
+from .SDF import _add_stitched_matvar as add_stitched_matvar
+from .SDF import _add_stitched_species as add_stitched_species
+from .SDF import _add_runinfo as add_runinfo
+from .SDF import _add_block as add_block
+from .SDF import _write as write
 from . import sdf_helper
 from ._commit_info import (
     __commit_date__,
     __commit_id__,
 )
-from .loadlib import (
+from ._loadlib import (
     __library_commit_date__,
     __library_commit_id__,
 )
@@ -67,33 +52,22 @@ __all__ = [
     "new",
     "read",
     "sdf_helper",
-    "SdfBlockType",
-    "SdfGeometry",
-    "SdfStagger",
-    "SdfDataType",
-    "SdfBlock",
-    "SdfFile",
-    "RunInfo",
-    "BlockList",
-    "Block",
-    "BlockConstant",
-    "BlockPlainVariable",
-    "BlockPlainMesh",
-    "BlockLagrangianMesh",
-    "BlockPointMesh",
-    "BlockPointVariable",
-    "BlockNameValue",
-    "BlockArray",
-    "BlockData",
-    "BlockStitched",
-    "BlockStitchedPath",
-    "BlockStitchedMaterial",
-    "BlockStitchedMatvar",
-    "BlockStitchedSpecies",
-    "BlockStitchedTensor",
+    "get_md5",
+    "get_sha",
+    "add_cpu_split",
+    "add_stitched",
+    "add_stitched_vector",
+    "add_stitched_material",
+    "add_stitched_matvar",
+    "add_stitched_species",
+    "add_runinfo",
+    "add_block",
+    "write",
     "__library_commit_date__",
     "__library_commit_id__",
     "__version__",
     "__commit_date__",
     "__commit_id__",
 ]
+
+del version

sdfr/_commit_info.py

@@ -1,2 +1,2 @@
-__commit_date__ = "Thu Oct 2 11:17:38 2025 +0100"
-__commit_id__ = "1f88901d0f4d4e9c9a1a0627969174db9de9188f"
+__commit_date__ = "Fri Oct 24 20:14:50 2025 +0100"
+__commit_id__ = "a17cbc89aabb147999f508583cb3cd40e0278a1f"

sdfr/sdf_helper.py

@@ -34,6 +34,7 @@ except Exception:
 
 try:
     import sdfr as sdf
+    import sdfr.SDF as SDF
 
     got_sdf = True
 except ImportError:
@@ -257,7 +258,7 @@ def get_file_list(wkd=None, base=None, block=None):
         automatically attempt to detect if this field is base or block
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
 
     Returns
@@ -276,8 +277,8 @@ def get_file_list(wkd=None, base=None, block=None):
         elif os.path.exists(wkd):
             base = wkd
         elif (
-            isinstance(wkd, sdf.BlockList)
-            or isinstance(wkd, sdf.Block)
+            isinstance(wkd, SDF.BlockList)
+            or isinstance(wkd, SDF.Block)
             or type(wkd) is dict
         ):
             block = wkd
@@ -319,7 +320,7 @@ def get_job_id(file_list=None, base=None, block=None):
         automatically attempt to detect if this field is base or block
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
 
     Returns
@@ -333,8 +334,8 @@ def get_job_id(file_list=None, base=None, block=None):
             base = file_list
             file_list = None
         elif (
-            isinstance(file_list, sdf.BlockList)
-            or isinstance(file_list, sdf.Block)
+            isinstance(file_list, SDF.BlockList)
+            or isinstance(file_list, SDF.Block)
             or type(file_list) is dict
         ):
             block = file_list
@@ -381,7 +382,7 @@ def get_files(wkd=None, base=None, block=None, varname=None, fast=True):
         automatically attempt to detect if this field is base or block
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
     varname : str
         A variable name that must be present in the file
@@ -401,8 +402,8 @@ def get_files(wkd=None, base=None, block=None, varname=None, fast=True):
         elif os.path.exists(wkd):
             base = wkd
         elif (
-            isinstance(wkd, sdf.BlockList)
-            or isinstance(wkd, sdf.Block)
+            isinstance(wkd, SDF.BlockList)
+            or isinstance(wkd, SDF.Block)
             or type(wkd) is dict
         ):
             block = wkd
@@ -461,14 +462,14 @@ def get_time(
         The directory in which to search
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
     fast : bool
         Use a faster but less thorough method for returning first/last
 
     Returns
     -------
-    data : sdf.BlockList
+    data : SDF.BlockList
         An SDF dataset
     """
     global data, wkdir
@@ -551,14 +552,14 @@ def get_step(
         The directory in which to search
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
     fast : bool
         Use a faster but less thorough method for returning first/last
 
     Returns
     -------
-    data : sdf.BlockList
+    data : SDF.BlockList
         An SDF dataset
     """
     global data, wkdir
@@ -632,12 +633,12 @@ def get_latest(wkd=None, base=None, block=None):
         automatically attempt to detect if this field is base or block
     base : str
         A representative filename or directory
-    block : sdf.Block or sdf.BlockList
+    block : SDF.Block or SDF.BlockList
         A representative sdf dataset or block
 
     Returns
     -------
-    data : sdf.BlockList
+    data : SDF.BlockList
         An SDF dataset
     """
     return get_step(last=True, wkd=wkd, base=base, block=base)
@@ -715,9 +716,9 @@ def plot_auto(*args, **kwargs):
         )
         return
     if len(dims) == 1:
-        if isinstance(args[0], sdf.BlockStitchedPath):
+        if isinstance(args[0], SDF.BlockStitchedPath):
             plot_rays(*args, **kwargs)
-        elif isinstance(args[0], sdf.BlockStitched):
+        elif isinstance(args[0], SDF.BlockStitched):
             newargs = list(args[:])
             for block in args[0].data:
                 newargs[0] = block
@@ -725,10 +726,12 @@ def plot_auto(*args, **kwargs):
         elif len(args[0].grid.dims) == 1:
             plot1d(*args, **kwargs)
         else:
+            if isinstance(args[0], SDF.BlockPointVariable):
+                kwargs["add_lines"] = False
             plot_path(*args, **kwargs)
-    elif isinstance(args[0], sdf.BlockLagrangianMesh) and dims[1] == 1:
+    elif isinstance(args[0], SDF.BlockLagrangianMesh) and dims[1] == 1:
         plot_path(*args, **kwargs)
-    elif isinstance(args[0], sdf.BlockStitchedPath):
+    elif isinstance(args[0], SDF.BlockStitchedPath):
         plot_rays(*args, **kwargs)
     elif len(dims) == 2:
         k = "set_ylabel"
@@ -843,8 +846,8 @@ def plot1d(
     # This is an attempt to get both axes to use the same scale
     # I'm not at all confident that it always does the right thing
     if xscale == 0 and yscale == 0:
-        xlen = max(abs(X[0]), abs(X[-1]))
-        ylen = max(abs(Y[0]), abs(Y[-1]))
+        xlen = max(X) - min(X)
+        ylen = max(Y) - min(Y)
         ratio1 = ylen / xlen
         ratio2 = xlen / ylen
         if ratio1 >= 1 and ratio1 < 1e3:
@@ -855,14 +858,14 @@ def plot1d(
             yscale = ylen
 
     if xscale == 0:
-        length = max(abs(X[0]), abs(X[-1]))
-        mult_x, sym_x = get_si_prefix(length)
+        xlen = max(X) - min(X)
+        mult_x, sym_x = get_si_prefix(xlen)
     else:
         mult_x, sym_x = get_si_prefix(xscale)
 
     if yscale == 0:
-        length = max(abs(Y[0]), abs(Y[-1]))
-        mult_y, sym_y = get_si_prefix(length)
+        ylen = max(Y) - min(Y)
+        mult_y, sym_y = get_si_prefix(ylen)
     else:
         mult_y, sym_y = get_si_prefix(yscale)
 
@@ -913,13 +916,14 @@ def plot_path(
     axis_only=False,
     clip_reflect=False,
     power=(-3, 3),
+    add_lines=True,
     **kwargs,
 ):
     """Plot an SDF path variable (eg. a laser ray)
 
     Parameters
     ----------
-    var : sdf.Block
+    var : SDF.Block
         The SDF block for the path to plot
     xdir : integer
         The dimension to use for the x-direction. If the path is 2D then
@@ -963,7 +967,7 @@ def plot_path(
         If set to true then update the axis limits for this path
     axis_only : logical
         If set to true then only update the axis limits for this path
-    svar : sdf.Block
+    svar : SDF.Block
         If set, use the extents of this variable to set the axis range for
         this plot
     clip_reflect : logical
@@ -1002,7 +1006,7 @@ def plot_path(
         return
 
     isvar = True
-    if isinstance(var, sdf.BlockLagrangianMesh):
+    if isinstance(var, SDF.BlockLagrangianMesh):
         isvar = False
         add_cbar = False
 
@@ -1125,37 +1129,50 @@ def plot_path(
     segments = np.concatenate([points[:-1], points[1:]], axis=1)
 
     if isvar:
-        if not hold or plot_path.norm_values is None:
-            k = "vmin"
-            k1 = "vrange"
-            if k in kwargs:
-                vmin = kwargs[k]
-            elif k1 in kwargs:
-                vmin = kwargs[k1][0]
-            else:
-                vmin = c.min()
+        k = "vmin"
+        k1 = "vrange"
+        if k in kwargs:
+            vmin = kwargs[k]
+        elif k1 in kwargs:
+            vmin = kwargs[k1][0]
+        else:
+            vmin = c.min()
 
-            k = "vmax"
-            if k in kwargs:
-                vmax = kwargs[k]
-            elif k1 in kwargs:
-                vmax = kwargs[k1][1]
-            else:
-                vmax = c.max()
+        k = "vmax"
+        if k in kwargs:
+            vmax = kwargs[k]
+        elif k1 in kwargs:
+            vmax = kwargs[k1][1]
+        else:
+            vmax = c.max()
 
+        if not hold or plot_path.norm_values is None:
             plot_path.norm_values = plt.Normalize(vmin, vmax)
 
-    kk = {}
-    k = "lw"
-    if k in kwargs:
-        kk[k] = kwargs[k]
-    k = "linewidth"
-    if k in kwargs:
-        kk[k] = kwargs[k]
-    lc = LineCollection(segments, norm=plot_path.norm_values, **kk)
-    if isvar:
-        lc.set_array(c)
-    im = subplot.add_collection(lc)
+    im = None
+    if add_lines:
+        kk = {}
+        k = "lw"
+        if k in kwargs:
+            kk[k] = kwargs[k]
+        k = "linewidth"
+        if k in kwargs:
+            kk[k] = kwargs[k]
+        lc = LineCollection(segments, norm=plot_path.norm_values, **kk)
+        if isvar:
+            lc.set_array(c)
+        im = subplot.add_collection(lc)
+
+    s = None
+    for k in "markersize", "ms":
+        if k in kwargs:
+            s = kwargs[k]
+    if not add_lines or s is not None:
+        if s is None:
+            s = 1
+        im1 = subplot.scatter(X, Y, c=c, s=s, vmin=vmin, vmax=vmax)
+        if im is None:
+            im = im1
 
     if not hold:
         subplot.set_xlabel(
@@ -1260,7 +1277,7 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
 
     Parameters
     ----------
-    var : sdf.Block
+    var : SDF.Block
         The SDF variable for the rays to plot
     rays : list
         A list of ray numbers to plot
@@ -1288,13 +1305,13 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
 
         ray_slice = slice(ray_start, ray_stop, skip)
 
-    if isinstance(var, sdf.BlockStitchedPath):
+    if isinstance(var, SDF.BlockStitchedPath):
         v = var.data[0]
         lab = "_label"
         if lab not in kwargs:
             kwargs[lab] = var.name
 
-        if isinstance(v, sdf.BlockStitchedPath):
+        if isinstance(v, SDF.BlockStitchedPath):
             for v in var.data:
                 plot_rays(v, skip=skip, rays=rays, **kwargs)
                 kwargs["hold"] = True
@@ -1305,7 +1322,7 @@ def plot_rays(var, skip=1, rays=None, **kwargs):
         else:
             ray_list = var.data[ray_slice]
 
-        if not isinstance(v, sdf.BlockLagrangianMesh):
+        if not isinstance(v, SDF.BlockLagrangianMesh):
             k = "cbar_label"
             if k not in kwargs or (
                 kwargs[k] and not isinstance(kwargs[k], str)
@@ -2110,8 +2127,8 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
 
     # Export particle arrays
     for k, value in data.__dict__.items():
-        if not isinstance(value, sdf.BlockPointVariable) and not isinstance(
-            value, sdf.BlockPointMesh
+        if not isinstance(value, SDF.BlockPointVariable) and not isinstance(
+            value, SDF.BlockPointMesh
         ):
             continue
         key = re.sub(r"[^a-z0-9]", "_", value.id.lower())
@@ -2120,7 +2137,7 @@ def getdata(fname, wkd=None, verbose=True, squeeze=False):
         else:
             var = value
         dims = str(tuple(int(i) for i in value.dims))
-        if isinstance(value, sdf.BlockPointVariable):
+        if isinstance(value, SDF.BlockPointVariable):
             if verbose:
                 print(key + dims + " = " + value.name)
             globals()[key] = var
@@ -2192,7 +2209,7 @@ def ogrid(skip=None, **kwargs):
 def plotgrid(fname=None, iso=None, title=True):
     global grid
     if (
-        isinstance(fname, sdf.BlockList)
+        isinstance(fname, SDF.BlockList)
         or isinstance(fname, dict)
         or hasattr(fname, "grid")
     ):

{sdfr-1.4.9.dist-info → sdfr-1.4.11.dist-info}/METADATA

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

sdfr-1.4.11.dist-info/RECORD

@@ -0,0 +1,12 @@
+sdfr/__init__.py,sha256=byZ_OGeZGE0_DRH62zS-hFQywi6HJw2ZlVnGmOXNvX8,2081
+sdfr/_commit_info.py,sha256=96ZUGx8sEOcIDbLXfq38l0Av4I1g637NlWE6lg1VsRk,112
+sdfr/_loadlib.py,sha256=AFOSSEuTAu0kMLlVvtE4t_0gDwDF3VQ5HN-nwdNiMDs,2119
+sdfr/SDF.py,sha256=kihp-ljrQlGirTz21GlDudFeEZolMExHFTCUndUmwM0,62747
+sdfr/sdf_helper.py,sha256=Rr4GSF3Sbz7h1q85Z-LWmU6U8ODPZdvzPiZjXZEqans,64086
+sdfr/sdfc_shared.dll,sha256=4cWL8Hst02X7V0XBv7PNdGLrxYFEd7OLv9mPYxPucg0,122880
+sdfr/sdfc_shared.lib,sha256=9tcMgpAVuMTrxheQtOnOEytYiwKn0yzw1AIzzf4JHVs,4270
+sdfr-1.4.11.dist-info/METADATA,sha256=Wr2KjkKHueiOlBs0jEiAQMxPNr6-fFW87YAgTraKB_A,371
+sdfr-1.4.11.dist-info/WHEEL,sha256=7cuQBrKlgrMjywT6nmSZIIhuOog1xNCTkMyVVbw2aow,103
+sdfr-1.4.11.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
+sdfr-1.4.11.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
+sdfr-1.4.11.dist-info/RECORD,,

sdfr-1.4.9.dist-info/RECORD

@@ -1,12 +0,0 @@
-sdfr/__init__.py,sha256=VqHDw9qAiI5qU03pxo6NeCu6hoCzdg98sl7_74ScIHQ,2275
-sdfr/_commit_info.py,sha256=s4cYEkpaJ0-14DfIO16Ggeyv78Z1dJEPsKk4StY1bg8,111
-sdfr/loadlib.py,sha256=AFOSSEuTAu0kMLlVvtE4t_0gDwDF3VQ5HN-nwdNiMDs,2119
-sdfr/SDF.py,sha256=0ltv9XrbR5-WWGmumXO8urGMwS3S_xwSRlnEunkfgxc,43412
-sdfr/sdf_helper.py,sha256=Qg4Jhp69xvoochKt6lNKB6KxqnEnD4vG9GRO5LG0Stk,63666
-sdfr/sdfc_shared.dll,sha256=gr81ZvzAb5j-xE5hSHNKF2uoV5TzIN7_8ushNKIVAxQ,122368
-sdfr/sdfc_shared.lib,sha256=YfbcZ3vBjFYNo0VRChTdIm6GNiU0lTOtSbjq3PLwWow,4270
-sdfr-1.4.9.dist-info/METADATA,sha256=3GF_CJWVjNwP2RVtzUGtZFy7ac4iffykuSDib1TtRoI,370
-sdfr-1.4.9.dist-info/WHEEL,sha256=7cuQBrKlgrMjywT6nmSZIIhuOog1xNCTkMyVVbw2aow,103
-sdfr-1.4.9.dist-info/licenses/LICENSE,sha256=gpLeavs1KxgJFrpL_uVDh0MoDvPfJoZ89A5dSCl4P5U,1652
-sdfr-1.4.9.dist-info/licenses/LICENSE_README.txt,sha256=KlBSoHArwoXbiygx3IJTjtgM7hLNO9o8ZMlZV77nrXs,235
-sdfr-1.4.9.dist-info/RECORD,,