doppy 0.5.1__tar.gz → 0.5.3__tar.gz

{doppy-0.5.1 → doppy-0.5.3}/Cargo.lock

@@ -34,9 +34,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bumpalo"
@@ -46,9 +46,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
 [[package]]
 name = "cc"
-version = "1.2.15"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
  "shlex",
 ]
@@ -106,7 +106,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "doppy_rs"
-version = "0.5.1"
+version = "0.5.3"
 dependencies = [
  "doprs",
  "numpy",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "doprs"
-version = "0.5.1"
+version = "0.5.3"
 dependencies = [
  "chrono",
  "rayon",
@@ -124,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "heck"
@@ -159,9 +159,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "js-sys"
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "lock_api"
@@ -277,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
 
 [[package]]
 name = "parking_lot"
@@ -312,9 +312,9 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
@@ -384,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
@@ -419,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
 dependencies = [
  "bitflags",
 ]
@@ -463,9 +463,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustversion"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
 
 [[package]]
 name = "scopeguard"
@@ -487,9 +487,9 @@ checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -504,15 +504,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
 
 [[package]]
 name = "wasm-bindgen"

{doppy-0.5.1 → doppy-0.5.3}/Cargo.toml

@@ -4,6 +4,6 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.5.1"
+version = "0.5.3"
 authors = ["Niko Leskinen <niko.leskinen@fmi.fi>"]
 license-file = "LICENSE"

{doppy-0.5.1 → doppy-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doppy
-Version: 0.5.1
+Version: 0.5.3
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{doppy-0.5.1 → doppy-0.5.3}/crates/doprs/src/raw/halo_hpl.rs

@@ -29,6 +29,22 @@ pub struct Info {
     pub start_time: i64, // Unix-timestamp
     pub system_id: String,
     pub instrument_spectral_width: Option<f64>,
+    range_formula: Option<RangeFormula>,
+}
+
+#[derive(Debug, Clone)]
+enum RangeFormula {
+    Common,      //(range gate + 0.5) * Gate length
+    Overlapping, //Gate length / 2 + (range gate x 3)
+}
+
+impl RangeFormula {
+    fn compute_distance(&self, gate_index: f64, range_gate_length: f64) -> f64 {
+        match self {
+            RangeFormula::Common => (gate_index + 0.5) * range_gate_length,
+            RangeFormula::Overlapping => range_gate_length / 2.0 + gate_index * 3.0,
+        }
+    }
 }
 
 #[derive(Debug, Default, Clone)]
@@ -97,7 +113,11 @@ pub fn from_bytes_src(content: &[u8]) -> Result<HaloHpl, RawParseError> {
         }
     }
     let info = parse_header(&buf_header)?;
-    let data = parse_data(&mut cur, info.ngates, info.range_gate_length)?;
+    let range_formula = info
+        .range_formula
+        .as_ref()
+        .ok_or("Cannot find range formula")?;
+    let data = parse_data(&mut cur, info.ngates, info.range_gate_length, range_formula)?;
     Ok(HaloHpl { info, data })
 }
 
@@ -105,6 +125,7 @@ fn parse_data(
     cur: &mut Cursor<&[u8]>,
     ngates: u64,
     range_gate_length: f64,
+    range_formula: &RangeFormula,
 ) -> Result<Data, RawParseError> {
     let (n1d, n2d) = infer_data_shape(cur)?;
     if ngates < 1 || n1d < 3 || n2d < 4 {
@@ -161,7 +182,7 @@ fn parse_data(
         time: data_1d[0].clone(),
         radial_distance: gate
             .iter()
-            .map(|&x| (x + 0.5) * range_gate_length)
+            .map(|&x| range_formula.compute_distance(x, range_gate_length))
             .collect(),
         azimuth: data_1d[1].clone(),
         elevation: data_1d[2].clone(),
@@ -249,8 +270,13 @@ fn parse_header(header_bytes: &[u8]) -> Result<Info, RawParseError> {
                 info.instrument_spectral_width = Some(captures[1].parse()?);
             } else {
                 match line.as_str() {
-                    "Altitude of measurement (center of gate) = (range gate + 0.5) * Gate length" => (),
-                    "Range of measurement (center of gate) = (range gate + 0.5) * Gate length" => (),
+                    "Altitude of measurement (center of gate) = (range gate + 0.5) * Gate length" |
+                    "Range of measurement (center of gate) = (range gate + 0.5) * Gate length" => {
+                        info.range_formula = Some(RangeFormula::Common)
+                    },
+                    "Range of measurement (center of gate) = Gate length / 2 + (range gate x 3)" => {
+                        info.range_formula = Some(RangeFormula::Overlapping)
+                    },
                     "Data line 1: Decimal time (hours)  Azimuth (degrees)  Elevation (degrees) Pitch (degrees) Roll (degrees)" => (),
                     "Data line 1: Decimal time (hours)  Azimuth (degrees)  Elevation (degrees)" => (),
                     "f9.6,1x,f6.2,1x,f6.2" => (),

{doppy-0.5.1 → doppy-0.5.3}/src/doppy/product/turbulence.py

@@ -1,4 +1,3 @@
-# type: ignore
 from __future__ import annotations
 
 from dataclasses import dataclass
@@ -94,18 +93,18 @@ def _compute_variance(vert: VerticalWind, period: float) -> VarResult:
     N_cumsum = N_i.cumsum(axis=0)
 
     def N_func(i: int, j: int) -> npt.NDArray[np.float64]:
-        return N_cumsum[j] - N_cumsum[i] + N_i[i]
+        return np.array(N_cumsum[j] - N_cumsum[i] + N_i[i], dtype=np.float64)
 
     def S(i: int, j: int) -> npt.NDArray[np.float64]:
-        return X_cumsum[j] - X_cumsum[i] + X[i]
+        return np.array(X_cumsum[j] - X_cumsum[i] + X[i], dtype=np.float64)
 
     def S2(i: int, j: int) -> npt.NDArray[np.float64]:
-        return X2_cumsum[j] - X2_cumsum[i] + X2[i]
+        return np.array(X2_cumsum[j] - X2_cumsum[i] + X2[i], dtype=np.float64)
 
     def var_ij(i: int, j: int) -> npt.NDArray[np.float64]:
         N = N_func(i, j)
         with np.errstate(invalid="ignore"):
-            return (S2(i, j) - S(i, j) ** 2 / N) / N
+            return np.array((S2(i, j) - S(i, j) ** 2 / N) / N, dtype=np.float64)
 
     half_period = np.timedelta64(int(1e6 * period / 2), "us")
     period_start = np.full(vert.w.shape, np.datetime64("NaT", "us"))
@@ -147,7 +146,7 @@ def _length_scale_low(
 
 def _preprocess_horiontal_wind(
     vert: VerticalWind, hori: HorizontalWind, options: Options
-):
+) -> npt.NDArray[np.float64]:
     if np.isnan(hori.V).any():
         raise ValueError("horizontal wind speed cannot contains NaNs")
     trg_points = np.meshgrid(vert.time, vert.height, indexing="ij")
@@ -186,8 +185,8 @@ def _rolling_mean_over_time(
 
     S = arr.cumsum(axis=0)
 
-    def rolling_mean(i: int, j: int) -> npt.NDArray[np.flaat64]:
-        return (S[j] - S[i] + arr[i]) / (j - i + 1)
+    def rolling_mean(i: int, j: int) -> npt.NDArray[np.float64]:
+        return np.array((S[j] - S[i] + arr[i]) / (j - i + 1), dtype=np.float64)
 
     half_period = np.timedelta64(int(period * 0.5e6), "us")
     rol_mean = np.full(arr.shape, np.nan, dtype=np.float64)
@@ -208,7 +207,7 @@ def _compute_dissipation_rate(
     variance: npt.NDArray[np.float64],
     length_scale_lower: npt.NDArray[np.float64],
     length_scale_upper: npt.NDArray[np.float64],
-):
+) -> npt.NDArray[np.float64]:
     """
     Parameters
     ----------
@@ -225,10 +224,10 @@ def _compute_dissipation_rate(
             * (length_scale_upper ** (2 / 3) - length_scale_lower ** (2 / 3))
             ** (-3 / 2)
         )
-    return dr
+    return np.array(dr, dtype=np.float64)
 
 
-def _next_valid_from_mask(mask):
+def _next_valid_from_mask(mask: npt.NDArray[np.bool_]) -> npt.NDArray[np.int64]:
     """
     mask[t,v] (time,value)
 
@@ -244,10 +243,10 @@ def _next_valid_from_mask(mask):
     for t in reversed(range(n - 1)):
         N[t][~mask[t]] = t
         N[t][mask[t]] = N[t + 1][mask[t]]
-    return N
+    return np.array(N, dtype=np.int64)
 
 
-def _prev_valid_from_mask(mask):
+def _prev_valid_from_mask(mask: npt.NDArray[np.bool_]) -> npt.NDArray[np.int64]:
     """
     mask[t,v] (time,value)
 
@@ -262,4 +261,4 @@ def _prev_valid_from_mask(mask):
     for t in range(1, n):
         N[t][~mask[t]] = t
         N[t][mask[t]] = N[t - 1][mask[t]]
-    return N
+    return np.array(N, dtype=np.int64)