cloudnetpy 1.72.2__tar.gz → 1.73.0__tar.gz

{cloudnetpy-1.72.2/cloudnetpy.egg-info → cloudnetpy-1.73.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.72.2
+Version: 1.73.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/instruments/__init__.py

@@ -1,4 +1,5 @@
 from .basta import basta2nc
+from .bowtie import bowtie2nc
 from .ceilo import ceilo2nc
 from .copernicus import copernicus2nc
 from .disdrometer import parsivel2nc, thies2nc

cloudnetpy-1.73.0/cloudnetpy/instruments/bowtie.py

@@ -0,0 +1,95 @@
+from os import PathLike
+
+from cloudnetpy import output
+from cloudnetpy.constants import G_TO_KG, MM_H_TO_M_S
+from cloudnetpy.exceptions import ValidTimeStampError
+from cloudnetpy.instruments.instruments import FMCW94
+from cloudnetpy.instruments.nc_radar import NcRadar
+from cloudnetpy.metadata import MetaData
+
+
+def bowtie2nc(
+    bowtie_file: str | PathLike,
+    output_file: str,
+    site_meta: dict,
+    uuid: str | None = None,
+    date: str | None = None,
+) -> str:
+    """Converts data from 'BOW-TIE' campaign cloud radar on RV-Meteor into
+       Cloudnet Level 1b netCDF file.
+
+    Args:
+        bowtie_file: Input filename.
+        output_file: Output filename.
+        site_meta: Dictionary containing information about the site. Required key
+            value pair is `name`. Optional are `latitude`, `longitude`, `altitude`.
+        uuid: Set specific UUID for the file.
+        date: Expected date as YYYY-MM-DD of all profiles in the file.
+
+    Returns:
+        UUID of the generated file.
+
+    Raises:
+        ValidTimeStampError: No valid timestamps found.
+
+    """
+    keymap = {
+        "Zh": "Zh",
+        "v": "v",
+        "width": "width",
+        "ldr": "ldr",
+        "kurt": "kurtosis",
+        "Skew": "skewness",
+        "SNR": "SNR",
+        "time": "time",
+        "range": "range",
+        "lwp": "lwp",
+        "SurfRelHum": "relative_humidity",
+        "rain": "rainfall_rate",
+        "Nyquist_velocity": "nyquist_velocity",
+        "range_offsets": "chirp_start_indices",
+    }
+
+    with Bowtie(bowtie_file, site_meta) as bowtie:
+        bowtie.init_data(keymap)
+        bowtie.add_time_and_range()
+        if date is not None:
+            bowtie.check_date(date)
+        bowtie.add_radar_specific_variables()
+        bowtie.add_site_geolocation()
+        bowtie.add_height()
+        bowtie.convert_units()
+        bowtie.test_if_all_masked()
+    attributes = output.add_time_attribute(ATTRIBUTES, bowtie.date)
+    output.update_attributes(bowtie.data, attributes)
+    return output.save_level1b(bowtie, output_file, uuid)
+
+
+class Bowtie(NcRadar):
+    def __init__(self, full_path: str | PathLike, site_meta: dict):
+        super().__init__(full_path, site_meta)
+        self.instrument = FMCW94
+        self.date = self.get_date()
+
+    def convert_units(self):
+        self.data["lwp"].data *= G_TO_KG
+        self.data["rainfall_rate"].data *= MM_H_TO_M_S
+        self.data["relative_humidity"].data /= 100
+
+    def check_date(self, date: str):
+        if "-".join(self.date) != date:
+            raise ValidTimeStampError
+
+
+ATTRIBUTES: dict = {
+    "v": MetaData(
+        long_name="Doppler velocity",
+        units="m s-1",
+        comment=(
+            "This parameter is the radial component of the velocity, with positive\n"
+            "velocities are away from the radar. It was corrected for the heave\n"
+            "motion of the ship. A rolling average over 3 time steps has been\n"
+            "applied to it."
+        ),
+    ),
+}

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/instruments/cloudnet_instrument.py

@@ -7,7 +7,7 @@ from numpy import ma
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray
 from cloudnetpy.exceptions import ValidTimeStampError
-from cloudnetpy.instruments.instruments import BASTA, FMCW35, FMCW94, HATPRO, Instrument
+from cloudnetpy.instruments.instruments import BASTA, FMCW35, FMCW94, Instrument
 
 
 class CloudnetInstrument:
@@ -23,12 +23,13 @@ class CloudnetInstrument:
         for key in ("latitude", "longitude", "altitude"):
             value = None
             source = None
-            # From source data (BASTA, RPG-FMCW, HATPRO).
+            # From source data (BASTA, RPG-FMCW).
             # Should be the accurate GPS coordinates.
+            # HATPRO is handled elsewhere.
             if (
                 value is None
                 and self.instrument is not None
-                and self.instrument in (BASTA, FMCW94, FMCW35, HATPRO)
+                and self.instrument in (BASTA, FMCW94, FMCW35)
             ):
                 data = None
                 if (

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/instruments/hatpro.py

@@ -106,9 +106,21 @@ def hatpro2l1c(
     if "irt" in hatpro.data:
         hatpro.data["irt"].dimensions = ("time", "ir_channel")
 
-    for key in ("latitude", "longitude", "altitude"):
-        value = float(ma.mean(hatpro.data[key].data))
-        hatpro.data[key] = CloudnetArray(value, key)
+    lat = hatpro.data["latitude"].data
+    lon = hatpro.data["longitude"].data
+    valid_latlon = (lat != 0) | (lon != 0)
+    if np.any(valid_latlon):
+        lat = float(ma.mean(lat[valid_latlon]))
+        lon = float(ma.mean(lon[valid_latlon]))
+        latlon_source = "GPS"
+    else:
+        lat = site_meta["latitude"]
+        lon = site_meta["longitude"]
+        latlon_source = "site coordinates"
+    alt = float(site_meta["altitude"])
+    hatpro.data["latitude"] = CloudnetArray(lat, "latitude", source=latlon_source)
+    hatpro.data["longitude"] = CloudnetArray(lon, "longitude", source=latlon_source)
+    hatpro.data["altitude"] = CloudnetArray(alt, "altitude", source="site coordinates")
 
     attrs_copy = ATTRIBUTES_1B01.copy()
     attributes = output.add_time_attribute(attrs_copy, hatpro.date)

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/instruments/rpg.py

@@ -445,10 +445,6 @@ RPG_ATTRIBUTES = {
         long_name="Number of spectral samples in each chirp sequence",
         units="1",
     ),
-    "chirp_start_indices": MetaData(
-        long_name="Chirp sequences start indices",
-        units="1",
-    ),
     "number_of_averaged_chirps": MetaData(
         long_name="Number of averaged chirps in sequence",
         units="1",
@@ -517,10 +513,6 @@ RPG_ATTRIBUTES = {
         long_name="PC temperature",
         units="K",
     ),
-    "skewness": MetaData(
-        long_name="Skewness of spectra",
-        units="1",
-    ),
     "kurtosis": MetaData(
         long_name="Kurtosis of spectra",
         units="1",

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/metadata.py

@@ -93,6 +93,10 @@ COMMON_ATTRIBUTES = {
         long_name="Kurtosis of spectra",
         units="1",
     ),
+    "skewness": MetaData(
+        long_name="Skewness of spectra",
+        units="1",
+    ),
     "nyquist_velocity": MetaData(long_name="Nyquist velocity", units="m s-1"),
     "radar_frequency": MetaData(long_name="Radar transmit frequency", units="GHz"),
     "beta": MetaData(
@@ -190,4 +194,8 @@ COMMON_ATTRIBUTES = {
         units="dB",
         comment="SNR threshold used in data screening.",
     ),
+    "chirp_start_indices": MetaData(
+        long_name="Chirp sequences start indices",
+        units="1",
+    ),
 }

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
-MINOR = 72
-PATCH = 2
+MINOR = 73
+PATCH = 0
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.72.2
+Version: 1.73.0
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.72.2 → cloudnetpy-1.73.0}/cloudnetpy.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ cloudnetpy/categorize/attenuations/melting_attenuation.py
 cloudnetpy/categorize/attenuations/rain_attenuation.py
 cloudnetpy/instruments/__init__.py
 cloudnetpy/instruments/basta.py
+cloudnetpy/instruments/bowtie.py
 cloudnetpy/instruments/ceilo.py
 cloudnetpy/instruments/ceilometer.py
 cloudnetpy/instruments/cl61d.py