doppy 0.3.5__tar.gz → 0.3.6__tar.gz

{doppy-0.3.5 → doppy-0.3.6}/Cargo.lock

@@ -106,7 +106,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "doppy_rs"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "doprs",
  "numpy",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "doprs"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "chrono",
  "rayon",

{doppy-0.3.5 → doppy-0.3.6}/Cargo.toml

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

{doppy-0.3.5 → doppy-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.3.5
+Version: 0.3.6
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -131,7 +131,7 @@ raws_bg = doppy.raw.HaloBg.from_srcs(LIST_OF_BACKGROUND_FILES)
 raw_system_params = doppy.raw.HaloSysParams.from_src(SYSTEM_PARAMS_FILENAME)
 
 # Windcube WLS200S
-raws_wls200s = doppy.raw.WindCube.from_vad_srcs(LIST_OF_VAD_NETCDF_FILES)
+raws_wls200s = doppy.raw.WindCube.from_vad_or_dbs_srcs(LIST_OF_VAD_NETCDF_FILES)
 
 # Windcube WLS70
 raws_wls70 = doppy.raw.Wls70.from_srcs(LIST_OF_RTD_FILES)

{doppy-0.3.5 → doppy-0.3.6}/README.md

@@ -92,7 +92,7 @@ raws_bg = doppy.raw.HaloBg.from_srcs(LIST_OF_BACKGROUND_FILES)
 raw_system_params = doppy.raw.HaloSysParams.from_src(SYSTEM_PARAMS_FILENAME)
 
 # Windcube WLS200S
-raws_wls200s = doppy.raw.WindCube.from_vad_srcs(LIST_OF_VAD_NETCDF_FILES)
+raws_wls200s = doppy.raw.WindCube.from_vad_or_dbs_srcs(LIST_OF_VAD_NETCDF_FILES)
 
 # Windcube WLS70
 raws_wls70 = doppy.raw.Wls70.from_srcs(LIST_OF_RTD_FILES)

{doppy-0.3.5 → doppy-0.3.6}/src/doppy/data/cache.py

@@ -1,4 +1,5 @@
 import gzip
+import logging
 import shutil
 from io import BytesIO
 from pathlib import Path
@@ -25,7 +26,12 @@ def cached_record(
         path.parent.mkdir(parents=True, exist_ok=True)
         content = session.get(record["downloadUrl"]).content
         if record["filename"].endswith(".gz"):
-            content = gzip.decompress(content)
+            try:
+                content = gzip.decompress(content)
+            except EOFError:
+                logging.error(f"Failed to recompress {record['filename']}")
+                raise
+
         with path.open("wb") as f:
             f.write(content)
         return BytesIO(content)

{doppy-0.3.5 → doppy-0.3.6}/src/doppy/product/wind.py

@@ -129,7 +129,7 @@ class Wind:
         | Sequence[BufferedIOBase],
         options: Options | None = None,
     ) -> Wind:
-        raws = doppy.raw.WindCube.from_vad_srcs(data)
+        raws = doppy.raw.WindCube.from_vad_or_dbs_srcs(data)
 
         if len(raws) == 0:
             raise doppy.exceptions.NoDataError("WindCube data missing")
@@ -140,6 +140,13 @@ class Wind:
             .non_strictly_increasing_timesteps_removed()
             .reindex_scan_indices()
         )
+        # select scans with most frequent elevation angle from range (15,85)
+        raw = raw[(raw.elevation > 15) & (raw.elevation < 85)]
+        elevation_ints = raw.elevation.round().astype(int)
+        unique_elevations, counts = np.unique(elevation_ints, return_counts=True)
+        most_frequent_elevation = unique_elevations[np.argmax(counts)]
+        raw = raw[elevation_ints == most_frequent_elevation]
+
         if len(raw.time) == 0:
             raise doppy.exceptions.NoDataError("No suitable data for the wind product")
 
@@ -168,7 +175,9 @@ class Wind:
         mask = _compute_mask(wind, rmse) | np.any(np.isnan(wind), axis=2)
         if not np.allclose(elevation, elevation[0]):
             raise ValueError("Elevation is expected to stay same")
-        height = np.array(raw.height, dtype=np.float64)
+        if not (raw.height == raw.height[0]).all():
+            raise ValueError("Unexpected heights")
+        height = np.array(raw.height[0], dtype=np.float64)
         return Wind(
             time=time,
             height=height,

{doppy-0.3.5 → doppy-0.3.6}/src/doppy/raw/windcube.py

@@ -16,8 +16,8 @@ from doppy.utils import merge_all_equal
 @dataclass
 class WindCube:
     time: npt.NDArray[datetime64]  # dim: (time, )
-    radial_distance: npt.NDArray[np.int64]  # dim: (radial_distance, )
-    height: npt.NDArray[np.int64]  # dim: (radial_distance, )
+    radial_distance: npt.NDArray[np.int64]  # dim: (time, radial_distance)
+    height: npt.NDArray[np.int64]  # dim: (time,radial_distance)
     azimuth: npt.NDArray[np.float64]  # dim: (time, )
     elevation: npt.NDArray[np.float64]  # dim: (time, )
     cnr: npt.NDArray[np.float64]  # dim: (time, radial_distance)
@@ -27,28 +27,28 @@ class WindCube:
     system_id: str
 
     @classmethod
-    def from_vad_srcs(
+    def from_vad_or_dbs_srcs(
         cls,
         data: Sequence[str]
         | Sequence[Path]
         | Sequence[bytes]
         | Sequence[BufferedIOBase],
     ) -> list[WindCube]:
-        return [WindCube.from_vad_src(src) for src in data]
+        return [WindCube.from_vad_or_dbs_src(src) for src in data]
 
     @classmethod
-    def from_vad_src(cls, data: str | Path | bytes | BufferedIOBase) -> WindCube:
+    def from_vad_or_dbs_src(cls, data: str | Path | bytes | BufferedIOBase) -> WindCube:
         data_bytes = _src_to_bytes(data)
         nc = Dataset("inmemory.nc", "r", memory=data_bytes)
-        return _from_vad_src(nc)
+        return _from_vad_or_dbs_src(nc)
 
     @classmethod
     def merge(cls, raws: list[WindCube]) -> WindCube:
         return WindCube(
             scan_index=_merge_scan_index([r.scan_index for r in raws]),
             time=np.concatenate([r.time for r in raws]),
-            height=_merge_range_vars([r.height for r in raws]),
-            radial_distance=_merge_range_vars([r.radial_distance for r in raws]),
+            height=np.concatenate([r.height for r in raws]),
+            radial_distance=np.concatenate([r.radial_distance for r in raws]),
             azimuth=np.concatenate([r.azimuth for r in raws]),
             elevation=np.concatenate([r.elevation for r in raws]),
             radial_velocity=np.concatenate([r.radial_velocity for r in raws]),
@@ -71,8 +71,8 @@ class WindCube:
         if isinstance(index, (int, slice, list, np.ndarray)):
             return WindCube(
                 time=self.time[index],
-                radial_distance=self.radial_distance,
-                height=self.height,
+                radial_distance=self.radial_distance[index],
+                height=self.height[index],
                 azimuth=self.azimuth[index],
                 elevation=self.elevation[index],
                 radial_velocity=self.radial_velocity[index],
@@ -113,13 +113,6 @@ class WindCube:
         return self
 
 
-def _merge_range_vars(vars: list[npt.NDArray[np.int64]]) -> npt.NDArray[np.int64]:
-    var = np.concatenate([v[np.newaxis, :] for v in vars])
-    if not (var[0] == var).all():
-        raise ValueError("Cannot merge unequal range variable")
-    return np.array(var[0], dtype=np.int64)
-
-
 def _merge_scan_index(index_list: list[npt.NDArray[np.int64]]) -> npt.NDArray[np.int64]:
     if len(index_list) == 0:
         raise ValueError("cannot merge empty list")
@@ -150,7 +143,7 @@ def _src_to_bytes(data: str | Path | bytes | BufferedIOBase) -> bytes:
     raise TypeError("Unsupported data type")
 
 
-def _from_vad_src(nc: Dataset) -> WindCube:
+def _from_vad_or_dbs_src(nc: Dataset) -> WindCube:
     scan_index_list = []
     time_list = []
     cnr_list = []
@@ -181,17 +174,11 @@ def _from_vad_src(nc: Dataset) -> WindCube:
         height_list.append(_extract_int64_or_raise(group["measurement_height"]))
         scan_index_list.append(np.full(group["time"][:].shape, i, dtype=np.int64))
 
-    height = np.concatenate(height_list)
-    if not (height == height[0]).all():
-        raise ValueError("Unexpected heights")
-    radial_distance = np.concatenate(range_list)
-    if not (radial_distance == radial_distance[0]).all():
-        raise ValueError("Unexpected range")
     return WindCube(
         scan_index=np.concatenate(scan_index_list),
         time=np.concatenate(time_list),
-        radial_distance=radial_distance[0],
-        height=height[0],
+        radial_distance=np.concatenate(range_list),
+        height=np.concatenate(height_list),
         azimuth=np.concatenate(azimuth_list),
         elevation=np.concatenate(elevation_list),
         radial_velocity=np.concatenate(radial_wind_speed_list),