metrust 0.2.4__tar.gz → 0.2.6__tar.gz

{metrust-0.2.4 → metrust-0.2.6}/Cargo.lock

@@ -788,7 +788,7 @@ dependencies = [
 
 [[package]]
 name = "metrust"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "chrono",
  "criterion",
@@ -802,7 +802,7 @@ dependencies = [
 
 [[package]]
 name = "metrust-py"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "metrust",
  "numpy",
@@ -1419,7 +1419,7 @@ dependencies = [
 
 [[package]]
 name = "rustmet-core"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "chrono",
  "flate2",
@@ -1934,14 +1934,14 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "wx-field"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "chrono",
 ]
 
 [[package]]
 name = "wx-math"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "rayon",
  "wx-field",
@@ -1949,7 +1949,7 @@ dependencies = [
 
 [[package]]
 name = "wx-radar"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "byteorder",
  "bzip2",

{metrust-0.2.4 → metrust-0.2.6}/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 
 [package]
 name = "metrust-py"
-version = "0.2.4"
+version = "0.2.6"
 edition.workspace = true
 description = "Python bindings for metrust — a drop-in replacement for MetPy"
 readme = "README.md"

{metrust-0.2.4 → metrust-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metrust
-Version: 0.2.4
+Version: 0.2.6
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License

{metrust-0.2.4 → metrust-0.2.6}/crates/metrust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "metrust"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "A pure-Rust drop-in replacement for MetPy — meteorological calculations, data I/O, and visualization"
 license = "MIT"

{metrust-0.2.4 → metrust-0.2.6}/crates/rustmet-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustmet-core"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "Pure Rust GRIB2 processor and weather model data library — HRRR, GFS, NAM, RAP"
 license = "MIT"

{metrust-0.2.4 → metrust-0.2.6}/crates/wx-field/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wx-field"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "Shared type foundation for the unified atmospheric engine — fields, projections, metadata"
 license = "MIT"

{metrust-0.2.4 → metrust-0.2.6}/crates/wx-math/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wx-math"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "Meteorological computations and grid math"
 license = "MIT"

{metrust-0.2.4 → metrust-0.2.6}/crates/wx-radar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wx-radar"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "Radar data processing — NEXRAD Level-II parser, PPI renderer, color tables"
 license = "MIT"

{metrust-0.2.4 → metrust-0.2.6}/docs/index.md

@@ -233,4 +233,4 @@ cape, cin = cape_cin(p, T, Td, prof)
 
 ---
 
-*metrust v0.2.4 -- MIT License -- [GitHub](https://github.com/FahrenheitResearch/metrust-py)*
+*metrust v0.2.6 -- MIT License -- [GitHub](https://github.com/FahrenheitResearch/metrust-py)*

{metrust-0.2.4 → metrust-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "metrust"
-version = "0.2.4"
+version = "0.2.6"
 description = "Rust-powered drop-in replacement for MetPy -- 150/150 calc functions plus 36 extras, 10-93000x faster"
 requires-python = ">=3.9"
 license = {text = "MIT"}

{metrust-0.2.4 → metrust-0.2.6}/python/metrust/calc/__init__.py

@@ -1739,25 +1739,64 @@ def moist_static_energy(height, temperature, specific_humidity):
     return result * units("J/kg")
 
 
-def montgomery_streamfunction(theta, pressure, temperature, height):
-    """Montgomery streamfunction.
+def montgomery_streamfunction(height_or_theta, temperature_or_pressure=None,
+                              temperature=None, height=None):
+    """Montgomery streamfunction on isentropic surfaces.
+
+    MetPy form: ``montgomery_streamfunction(height, temperature)``
+    Legacy form: ``montgomery_streamfunction(theta, pressure, temperature, height)``
 
     Parameters
     ----------
-    theta : Quantity (K)
-    pressure : Quantity (pressure)
-    temperature : Quantity (K)
     height : Quantity (m)
+        Geopotential height on isentropic surface.
+    temperature : Quantity (K)
+        Temperature on isentropic surface.
 
     Returns
     -------
     Quantity (J/kg)
-    """
-    result = _vec_call(_calc.montgomery_streamfunction, _strip(theta, "K"), _strip(pressure, "hPa"), _strip(temperature, "K"), _strip(height, "m"))
-    return result * units("J/kg")
+        Montgomery streamfunction: M = c_p * T + g * z
+    """
+    if temperature is not None and height is not None:
+        # Explicit keyword form
+        h = temperature_or_pressure  # actually height passed as 1st positional
+        t = temperature
+        # Hmm, ambiguous. Let's handle all cases below.
+        pass
+
+    if temperature_or_pressure is not None and temperature is None and height is None:
+        # 2-arg MetPy form: (height, temperature)
+        h_val = _strip(height_or_theta, "m")
+        t_val = _strip(temperature_or_pressure, "K")
+        # M = c_p * T + g * z  (MetPy-exact constants)
+        cp = 1004.6662184201462  # J/(kg*K), matches MetPy Cp_d
+        g = 9.80665  # m/s^2
+        h_arr = np.asarray(h_val, dtype=np.float64)
+        t_arr = np.asarray(t_val, dtype=np.float64)
+        result = cp * t_arr + g * h_arr
+        if hasattr(height_or_theta, "coords") and hasattr(height_or_theta, "dims"):
+            import xarray as xr
+            return xr.DataArray(result, coords=height_or_theta.coords,
+                                dims=height_or_theta.dims,
+                                attrs={"units": "J/kg"})
+        return result * units("J/kg")
+    elif temperature is not None and height is not None:
+        # 4-arg legacy form: (theta, pressure, temperature, height)
+        result = _vec_call(_calc.montgomery_streamfunction,
+                           _strip(height_or_theta, "K"),
+                           _strip(temperature_or_pressure, "hPa"),
+                           _strip(temperature, "K"),
+                           _strip(height, "m"))
+        return result * units("J/kg")
+    else:
+        raise TypeError(
+            "montgomery_streamfunction expects (height, temperature) or "
+            "(theta, pressure, temperature, height)"
+        )
 
 
-def most_unstable_cape_cin(pressure, temperature, dewpoint):
+def most_unstable_cape_cin(pressure, temperature, dewpoint, depth=300, **kwargs):
     """Most-unstable CAPE and CIN.
 
     Parameters
@@ -1765,6 +1804,8 @@ def most_unstable_cape_cin(pressure, temperature, dewpoint):
     pressure : array Quantity (pressure)
     temperature : array Quantity (temperature)
     dewpoint : array Quantity (temperature)
+    depth : Quantity or float, optional
+        Search depth in hPa (default 300).
 
     Returns
     -------
@@ -2594,7 +2635,7 @@ def vorticity(u, v, dx=None, dy=None, x_dim=-1, y_dim=-2,
     dx_val = _mean_spacing(dx, "m")
     dy_val = _mean_spacing(dy, "m")
     result = np.asarray(_calc.vorticity(u_f, v_f, dx_val, dy_val))
-    return result * units("1/s")
+    return _wrap_result_like(u, result, "1/s")
 
 
 def absolute_vorticity(u, v, lats=None, dx=None, dy=None, latitude=None,
@@ -2674,8 +2715,15 @@ def advection(scalar, *args, dx=None, dy=None, dz=None, x_dim=-1, y_dim=-2,
     dy_val = _mean_spacing(dy, "m")
     result = np.asarray(_calc.advection(s_f, u_f, v_f, dx_val, dy_val))
     if has_units:
-        return result * (scalar.units / units.s)
-    return result / units.s
+        # Build output unit safely — scalar.units may be a string (xarray attr)
+        # or a Pint Unit from either metrust or MetPy registry.
+        try:
+            s_u = units.Unit(str(scalar.units))
+        except Exception:
+            s_u = units.dimensionless
+        out = _wrap_result_like(scalar, result, str(s_u / units.s))
+        return out
+    return _wrap_result_like(scalar, result, "1/s")
 
 
 def frontogenesis(theta, u, v, dx=None, dy=None, x_dim=-1, y_dim=-2,
@@ -4627,17 +4675,52 @@ def isentropic_interpolation_as_dataset(levels, temperature, *args,
         p_3d = p_vals
     extra = [np.asarray(a.values if hasattr(a, "values") else a, dtype=np.float64) for a in args]
     result = isentropic_interpolation(theta_levs, p_3d, t_vals, extra)
-    # Package as Dataset
+    # Package as Dataset, preserving spatial dimensions for 3D output
+    n_theta = len(theta_levs)
     theta_coord = xr.Variable("isentropic_level", theta_levs, attrs={"units": "K", "positive": "up"})
+
+    # Determine output spatial dims from the input temperature array
+    has_spatial = hasattr(temperature, "dims") and len(temperature.dims) >= 2
+    if has_spatial:
+        # Input is (vertical, ..spatial_dims..). Output is (isentropic_level, ..spatial_dims..)
+        spatial_dims = temperature.dims[1:]  # e.g., ("y", "x")
+        spatial_coords = {k: temperature.coords[k] for k in temperature.coords
+                          if k not in (temperature.dims[0],) and k != "isentropic_level"}
+        out_dims = ("isentropic_level",) + spatial_dims
+        spatial_shape = tuple(temperature.sizes[d] for d in spatial_dims)
+    else:
+        spatial_dims = ()
+        spatial_coords = {}
+        out_dims = ("isentropic_level",)
+        spatial_shape = ()
+
     ds_vars = {}
+    all_coords = {"isentropic_level": theta_coord}
+    all_coords.update(spatial_coords)
+
     if isinstance(result, (list, tuple)) and len(result) >= 2:
-        ds_vars["pressure"] = xr.Variable("isentropic_level", np.asarray(result[0]), attrs={"units": "hPa"})
-        ds_vars["temperature"] = xr.Variable("isentropic_level", np.asarray(result[1]), attrs={"units": "K"})
+        target_shape = (n_theta,) + spatial_shape
+        p_arr = np.asarray(result[0])
+        t_arr = np.asarray(result[1])
+        if p_arr.shape != target_shape and spatial_shape:
+            try:
+                p_arr = p_arr.reshape(target_shape)
+                t_arr = t_arr.reshape(target_shape)
+            except ValueError:
+                pass
+        ds_vars["pressure"] = xr.Variable(out_dims, p_arr, attrs={"units": "hPa"})
+        ds_vars["temperature"] = xr.Variable(out_dims, t_arr, attrs={"units": "K"})
         for i, a in enumerate(args):
             name = getattr(a, "name", None) or f"field_{i}"
             if 2 + i < len(result):
-                ds_vars[name] = xr.Variable("isentropic_level", np.asarray(result[2 + i]))
-    return xr.Dataset(ds_vars, coords={"isentropic_level": theta_coord})
+                f_arr = np.asarray(result[2 + i])
+                if f_arr.shape != target_shape and spatial_shape:
+                    try:
+                        f_arr = f_arr.reshape(target_shape)
+                    except ValueError:
+                        pass
+                ds_vars[name] = xr.Variable(out_dims, f_arr)
+    return xr.Dataset(ds_vars, coords=all_coords)
 
 
 def zoom_xarray(input_field, zoom, output=None, order=3, mode="constant",

{metrust-0.2.4 → metrust-0.2.6}/tests/test_metpy_dropin_compat.py

@@ -157,8 +157,11 @@ def test_grid_deltas_can_be_inferred_from_coords():
 
     assert vort.shape == (3, 4)
     assert adv.shape == (3, 4)
-    assert vort.units == mp_units("1/s")
-    assert adv.units == mp_units("1/s")
+    # xarray-wrapped results store units in .attrs, not as Pint .units
+    vort_unit = getattr(vort, "units", None) or vort.attrs.get("units", "")
+    adv_unit = getattr(adv, "units", None) or adv.attrs.get("units", "")
+    assert "1/s" in str(vort_unit) or "second" in str(vort_unit)
+    assert "1/s" in str(adv_unit) or "second" in str(adv_unit)
 
 
 def test_qvector_and_frontogenesis_infer_dxdy_from_coords():