wavespectra 4.1.0__tar.gz → 4.2.0__tar.gz

{wavespectra-4.1.0/wavespectra.egg-info → wavespectra-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavespectra
-Version: 4.1.0
+Version: 4.2.0
 Summary: Library for ocean wave spectra
 Author-email: Wavespectra Developers <r.guedes@oceanum.science>
 Maintainer-email: Rafael Guedes <r.guedes@oceanum.science>, Tom Durrant <t.durrant@oceanum.science>

{wavespectra-4.1.0 → wavespectra-4.2.0}/pyproject.toml

@@ -97,7 +97,7 @@ docs = [
 [tool.setuptools.package-data]
 "wavespectra.core" = ["*.yml"]
 "wavespectra.output" = ["*.yml"]
-"wavespectra.partition.specpart" = ["specpartc.c", "specpartc.h", "specpartc_wrap.c"]
+"wavespectra.partition.specpart" = ["specpart.c", "specpart.h", "specpart_wrap.c"]
 
 [tool.setuptools.dynamic]
 version = {attr = "wavespectra.__version__"}

{wavespectra-4.1.0 → wavespectra-4.2.0}/setup.py

@@ -5,10 +5,10 @@ setup(
     name="wavespectra",
     ext_modules=[
         Extension(
-            name="wavespectra.partition.specpartc",
+            name="wavespectra.partition.specpart",
             sources=[
-                "wavespectra/partition/specpart/specpartc_wrap.c",
-                "wavespectra/partition/specpart/specpartc.c",
+                "wavespectra/partition/specpart/specpart_wrap.c",
+                "wavespectra/partition/specpart/specpart.c",
             ],
             include_dirs=[get_numpy_include()],
         )

{wavespectra-4.1.0 → wavespectra-4.2.0}/wavespectra/__init__.py

@@ -13,7 +13,7 @@ except ImportError:
     warnings.warn("Cannot import accessors at the main module level")
 
 
-__version__ = "4.1.0"
+__version__ = "4.2.0"
 
 
 def _import_functions(pkgname="input", prefix="read"):

{wavespectra-4.1.0 → wavespectra-4.2.0}/wavespectra/core/select.py

@@ -1,4 +1,5 @@
 """Interpolate stations."""
+
 import logging
 
 import numpy as np
@@ -16,24 +17,34 @@ class Coordinates:
         dset (xr.Dataset): Dataset object to slice from.
         lons (array): Longitudes to slice.
         lats (array): Latitudes to slice.
-        dset_lons (array): Dataset longitudes for optimising.
-        dset_lats (array): Dataset latitudes for optimising.
+        sitename (str): Name of site dimension.
+        lonname (str): Name of longitude coordinate.
+        latname (str): Name of latitude coordinate.
 
     """
 
-    def __init__(self, dset, lons, lats, dset_lons=None, dset_lats=None):
+    def __init__(
+        self,
+        dset,
+        lons,
+        lats,
+        sitename=attrs.SITENAME,
+        lonname=attrs.LONNAME,
+        latname=attrs.LATNAME,
+    ):
+        # Ensure arrays
+        lons = lons if not np.isscalar(lons) else [lons]
+        lats = lats if not np.isscalar(lats) else [lats]
+
         self.dset = dset
         self._lons = np.array(lons)
         self.lats = np.array(lats)
+        self.sitename = sitename
+        self.lonname = lonname
+        self.latname = latname
 
-        if dset_lons is None:
-            self.dset_lons = dset[attrs.LONNAME].values
-        else:
-            self.dset_lons = dset_lons
-        if dset_lats is None:
-            self.dset_lats = dset[attrs.LATNAME].values
-        else:
-            self.dset_lats = dset_lats
+        self.dset_lons = dset[self.lonname].values
+        self.dset_lats = dset[self.latname].values
 
         self._validate()
 
@@ -46,9 +57,9 @@ class Coordinates:
         """Few input checks."""
         assert len(self._lons) == len(self.lats), "lons and lats must have same size."
         if (
-            attrs.LONNAME in self.dset.dims
-            or attrs.LATNAME in self.dset.dims
-            or attrs.SITENAME not in self.dset.dims
+            self.lonname in self.dset.dims
+            or self.latname in self.dset.dims
+            or self.sitename not in self.dset.dims
         ):
             raise NotImplementedError("sel only supports stations not gridded data.")
 
@@ -143,9 +154,10 @@ def sel_nearest(
     tolerance=2.0,
     unique=False,
     exact=False,
-    dset_lons=None,
-    dset_lats=None,
     missing="raise",
+    sitename=attrs.SITENAME,
+    lonname=attrs.LONNAME,
+    latname=attrs.LATNAME,
 ):
     """Select sites from nearest distance.
 
@@ -156,11 +168,12 @@ def sel_nearest(
         tolerance (float): Maximum distance to use site for interpolation.
         unique (bool): Only returns unique sites in case of repeated inexact matches.
         exact (bool): Require exact matches.
-        dset_lons (array): Longitude of stations in dset.
-        dset_lats (array): Latitude of stations in dset.
         missing (str): Action to take if no site is found within tolerance:
             - 'raise': raise an error
             - 'ignore': skip site
+        sitename (str): Name of site dimension.
+        lonname (str): Name of longitude coordinate.
+        latname (str): Name of latitude coordinate.
 
     Returns:
         Selected SpecDataset at locations defined by (lons, lats).
@@ -172,7 +185,7 @@ def sel_nearest(
 
     """
     coords = Coordinates(
-        dset, lons=lons, lats=lats, dset_lons=dset_lons, dset_lats=dset_lats
+        dset, lons=lons, lats=lats, sitename=sitename, lonname=lonname, latname=latname
     )
 
     station_ids = []
@@ -207,19 +220,26 @@ def sel_nearest(
             f"No site in dataset found within tolerance={tolerance} deg of any site "
             f"{list(zip(coords.lons, coords.lats))}"
         )
-    dsout = dset.isel(**{attrs.SITENAME: station_ids})
+    dsout = dset.isel(**{sitename: station_ids})
 
     # Return longitudes in the convention provided
     if coords.consistent is False:
         dsout.lon.values = coords._swap_longitude_convention(dsout.lon.values)
 
-    dsout = dsout.assign_coords({attrs.SITENAME: np.arange(len(station_ids))})
+    dsout = dsout.assign_coords({sitename: np.arange(len(station_ids))})
 
     return dsout
 
 
 def sel_idw(
-    dset, lons, lats, tolerance=2.0, max_sites=4, dset_lons=None, dset_lats=None
+    dset,
+    lons,
+    lats,
+    tolerance=2.0,
+    max_sites=4,
+    sitename=attrs.SITENAME,
+    lonname=attrs.LONNAME,
+    latname=attrs.LATNAME,
 ):
     """Select sites from inverse distance weighting.
 
@@ -229,8 +249,9 @@ def sel_idw(
         lats (array): Latitude of sites to interpolate spectra at.
         tolerance (float): Maximum distance to use site for interpolation.
         max_sites (int): Maximum number of neighbour sites to use for interpolation.
-        dset_lons (array): Longitude of stations in dset.
-        dset_lats (array): Latitude of stations in dset.
+        sitename (str): Name of site dimension.
+        lonname (str): Name of longitude coordinate.
+        latname (str): Name of latitude coordinate.
 
     Returns:
         Selected SpecDataset at locations defined by (lons, lats).
@@ -242,10 +263,10 @@ def sel_idw(
 
     """
     coords = Coordinates(
-        dset, lons=lons, lats=lats, dset_lons=dset_lons, dset_lats=dset_lats
+        dset, lons=lons, lats=lats, sitename=sitename, lonname=lonname, latname=latname
     )
 
-    mask = dset.isel(site=0, drop=True) * np.nan
+    mask = dset.isel({sitename: 0}, drop=True) * np.nan
     dsout = []
     for lon, lat in zip(coords.lons, coords.lats):
         closest_ids, closest_dist = coords.nearer(lon, lat, tolerance, max_sites)
@@ -271,23 +292,23 @@ def sel_idw(
             sumfac = float(1.0 / sum(factors))
             ind = indices.pop(0)
             fac = factors.pop(0)
-            weighted = float(fac) * dset.isel(site=ind, drop=True)
+            weighted = float(fac) * dset.isel({sitename: ind}, drop=True)
             for ind, fac in zip(indices, factors):
-                weighted += float(fac) * dset.isel(site=ind, drop=True)
+                weighted += float(fac) * dset.isel({sitename: ind}, drop=True)
             if len(indices) > 0:
                 weighted *= sumfac
             dsout.append(weighted)
 
     # Concat sites into dataset
-    dsout = xr.concat(dsout, dim=attrs.SITENAME)
+    dsout = xr.concat(dsout, dim=sitename)
     for dvar in dsout.data_vars:
         if set(dsout[dvar].dims) == set(dset[dvar].dims):
             dsout[dvar] = dsout[dvar].transpose(*dset[dvar].dims)
 
     # Redefining coordinates and variables
-    dsout[attrs.SITENAME] = np.arange(len(coords.lons))
-    dsout[attrs.LONNAME] = ((attrs.SITENAME), coords.lons)
-    dsout[attrs.LATNAME] = ((attrs.SITENAME), coords.lats)
+    dsout[sitename] = np.arange(len(coords.lons))
+    dsout[lonname] = ((sitename), coords.lons)
+    dsout[latname] = ((sitename), coords.lats)
 
     # Return longitudes in the convention provided
     if coords.consistent is False:
@@ -299,7 +320,15 @@ def sel_idw(
     return dsout
 
 
-def sel_bbox(dset, lons, lats, tolerance=0.0, dset_lons=None, dset_lats=None):
+def sel_bbox(
+    dset,
+    lons,
+    lats,
+    tolerance=0.0,
+    sitename=attrs.SITENAME,
+    lonname=attrs.LONNAME,
+    latname=attrs.LATNAME,
+):
     """Select sites within bbox.
 
     Args:
@@ -307,8 +336,9 @@ def sel_bbox(dset, lons, lats, tolerance=0.0, dset_lons=None, dset_lats=None):
         lons (array): Longitude of sites to interpolate spectra at.
         lats (array): Latitude of sites to interpolate spectra at.
         tolerance (float): Extend bbox extents by.
-        dset_lons (array): Longitude of stations in dset.
-        dset_lats (array): Latitude of stations in dset.
+        sitename (str): Name of site dimension.
+        lonname (str): Name of longitude coordinate.
+        latname (str): Name of latitude coordinate.
 
     Returns:
         Selected SpecDataset within bbox defined by:
@@ -321,7 +351,7 @@ def sel_bbox(dset, lons, lats, tolerance=0.0, dset_lons=None, dset_lats=None):
 
     """
     coords = Coordinates(
-        dset, lons=lons, lats=lats, dset_lons=dset_lons, dset_lats=dset_lats
+        dset, lons=lons, lats=lats, sitename=sitename, lonname=lonname, latname=latname
     )
 
     minlon = min(coords.lons) - tolerance
@@ -359,12 +389,12 @@ def sel_bbox(dset, lons, lats, tolerance=0.0, dset_lons=None, dset_lats=None):
             f"[{max(coords._lons) + tolerance}, {maxlat}])"
         )
 
-    dsout = dset.isel(**{attrs.SITENAME: station_ids})
+    dsout = dset.isel(**{sitename: station_ids})
 
     # Return longitudes in the convention provided
     if coords.consistent is False:
         dsout.lon.values = coords._swap_longitude_convention(dsout.lon.values)
 
-    dsout = dsout.assign_coords({attrs.SITENAME: np.arange(len(station_ids))})
+    dsout = dsout.assign_coords({sitename: np.arange(len(station_ids))})
 
     return dsout

{wavespectra-4.1.0 → wavespectra-4.2.0}/wavespectra/partition/partition.py

@@ -3,7 +3,7 @@ from itertools import combinations
 import numpy as np
 import xarray as xr
 
-from wavespectra.partition import specpartc
+from wavespectra.partition import specpart
 from wavespectra.core.utils import (
     set_spec_attributes,
     regrid_spec,
@@ -829,7 +829,7 @@ def np_ptm1(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Wind sea mask
@@ -909,7 +909,7 @@ def np_ptm2(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Wind sea mask
@@ -979,7 +979,7 @@ def np_ptm3(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Assign partitioned arrays from raw spectrum and morphological boundaries
@@ -1051,7 +1051,7 @@ def np_hp01(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Assign partitioned arrays from raw spectrum and morphological boundaries
@@ -1144,7 +1144,7 @@ def np_hp01_wseabins(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Assign partitioned arrays from raw spectrum and morphological boundaries
@@ -1240,7 +1240,7 @@ def np_hp01_wseafrac_wseabins(
 
     """
     # Use smooth spectrum to define morphological boundaries
-    watershed_map = specpartc.partition(spectrum_smooth.astype(np.float32), ihmax)
+    watershed_map = specpart.partition(spectrum_smooth.astype(np.float32), ihmax)
     nparts = watershed_map.max()
 
     # Assign partitioned arrays from raw spectrum and morphological boundaries

wavespectra-4.1.0/wavespectra/partition/specpart/specpartc.c → wavespectra-4.2.0/wavespectra/partition/specpart/specpart.c

@@ -1,7 +1,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "specpartc.h"
+#include "specpart.h"
 
 static int nspec= 0, mk = -1, mth = -1, npart=0;
 /*     ----------------------------------------------------------------

wavespectra-4.1.0/wavespectra/partition/specpart/specpartc_wrap.c → wavespectra-4.2.0/wavespectra/partition/specpart/specpart_wrap.c

@@ -1,30 +1,30 @@
 #include <Python.h>
 #include "numpy/arrayobject.h"
-#include "specpartc.h"
+#include "specpart.h"
 
-static PyObject * specpartc(PyObject *self, PyObject *args);
+static PyObject * specpart(PyObject *self, PyObject *args);
 
 /* ==== Set up the methods table ====================== */
-static PyMethodDef specpartc_methods[] = {
-  {"partition", specpartc, METH_VARARGS, "Description"},
+static PyMethodDef specpart_methods[] = {
+  {"partition", specpart, METH_VARARGS, "Description"},
   {NULL, NULL, 0, NULL}
 };
 
-static struct PyModuleDef specpartc_definition  = { 
+static struct PyModuleDef specpart_definition  = { 
     PyModuleDef_HEAD_INIT,
-    "specpartc",
+    "specpart",
     "A Python module that prints 'hello world' from C code.",
     -1, 
-    specpartc_methods
+    specpart_methods
 };
 
-PyMODINIT_FUNC PyInit_specpartc(void) {
+PyMODINIT_FUNC PyInit_specpart(void) {
   Py_Initialize();
   import_array();
-  return PyModule_Create(&specpartc_definition);
+  return PyModule_Create(&specpart_definition);
 }
 
-static PyObject * specpartc(PyObject *self, PyObject *args)
+static PyObject * specpart(PyObject *self, PyObject *args)
 {
   PyArrayObject *specin, *ipartout;  // The python objects to be extracted from the args
   float * spec;

{wavespectra-4.1.0 → wavespectra-4.2.0}/wavespectra/specdataset.py

@@ -124,8 +124,6 @@ class SpecDataset(metaclass=Plugin):
         lats,
         method="idw",
         tolerance=2.0,
-        dset_lons=None,
-        dset_lats=None,
         **kwargs,
     ):
         """Select stations near or at locations defined by (lons, lats) vector.
@@ -140,10 +138,6 @@ class SpecDataset(metaclass=Plugin):
                 * None: Only exact matches.
             - tolerance (float): Maximum distance between locations and original stations
               for inexact matches.
-            - dset_lons (array): Longitude of stations in dset, not required but could
-              help improove speed.
-            - dset_lats (array): Latitude of stations in dset, not required but could
-              help improove speed.
             - kwargs: Extra keywargs to pass to the respective sel function
               (i.e., `sel_nearest`, `sel_idw`).
 
@@ -154,9 +148,6 @@ class SpecDataset(metaclass=Plugin):
             - `tolerance` behaves differently with methods 'idw' and 'nearest'. In 'idw'
               sites with no neighbours within `tolerance` are masked whereas in
               'nearest' an exception is raised.
-            - `dset_lons`, `dset_lats` are not required but can improve performance when
-              `dset` is chunked with site=1 (expensive to access site coords) and
-              improve precision if projected coors are provided at high latitudes.
 
         """
         funcs = {
@@ -173,18 +164,11 @@ class SpecDataset(metaclass=Plugin):
             )
         if method is None:
             kwargs.update({"exact": True})
-        # Providing station coordinates is a lot more efficient for chunked datasets
-        if dset_lons is None:
-            dset_lons = self.dset[attrs.LONNAME].values
-        if dset_lats is None:
-            dset_lats = self.dset[attrs.LATNAME].values
         dsout = func(
             dset=self.dset,
             lons=lons,
             lats=lats,
             tolerance=tolerance,
-            dset_lons=dset_lons,
-            dset_lats=dset_lats,
             **kwargs,
         )
         return dsout

{wavespectra-4.1.0 → wavespectra-4.2.0/wavespectra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavespectra
-Version: 4.1.0
+Version: 4.2.0
 Summary: Library for ocean wave spectra
 Author-email: Wavespectra Developers <r.guedes@oceanum.science>
 Maintainer-email: Rafael Guedes <r.guedes@oceanum.science>, Tom Durrant <t.durrant@oceanum.science>

{wavespectra-4.1.0 → wavespectra-4.2.0}/wavespectra.egg-info/SOURCES.txt

@@ -65,6 +65,6 @@ wavespectra/partition/__init__.py
 wavespectra/partition/hanson_and_phillips_2001.py
 wavespectra/partition/partition.py
 wavespectra/partition/tracking.py
-wavespectra/partition/specpart/specpartc.c
-wavespectra/partition/specpart/specpartc.h
-wavespectra/partition/specpart/specpartc_wrap.c
+wavespectra/partition/specpart/specpart.c
+wavespectra/partition/specpart/specpart.h
+wavespectra/partition/specpart/specpart_wrap.c