cloudnetpy 1.65.2__tar.gz → 1.65.4__tar.gz

{cloudnetpy-1.65.2/cloudnetpy.egg-info → cloudnetpy-1.65.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.65.2
+Version: 1.65.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/categorize/atmos_utils.py

@@ -1,13 +1,8 @@
-from typing import Final
-
 import numpy as np
 from numpy import ma
 
 import cloudnetpy.constants as con
 
-HPA_TO_P: Final = 100
-P_TO_HPA: Final = 0.01
-
 
 def calc_wet_bulb_temperature(model_data: dict) -> np.ndarray:
     """Returns wet bulb temperature.
@@ -80,7 +75,7 @@ def calc_saturation_vapor_pressure(temperature: np.ndarray) -> np.ndarray:
             + 0.42873e-3 * (10 ** (4.76955 * (1 - ratio)) - 1)
             + 0.78614
         )
-    ) * HPA_TO_P
+    ) * con.HPA_TO_PA
 
 
 def calc_psychrometric_constant(pressure: np.ndarray) -> np.ndarray:
@@ -114,7 +109,7 @@ def calc_dew_point_temperature(vapor_pressure: np.ndarray) -> np.ndarray:
     """
     vaisala_parameters_over_water = (6.116441, 7.591386, 240.7263)
     a, m, tn = vaisala_parameters_over_water
-    dew_point_celsius = tn / ((m / np.log10(vapor_pressure * P_TO_HPA / a)) - 1)
+    dew_point_celsius = tn / ((m / np.log10(vapor_pressure * con.PA_TO_HPA / a)) - 1)
     return c2k(dew_point_celsius)
 
 
@@ -126,8 +121,3 @@ def c2k(temp: np.ndarray) -> np.ndarray:
 def k2c(temp: np.ndarray) -> np.ndarray:
     """Converts Kelvins to Celsius."""
     return ma.array(temp) - 273.15
-
-
-def mmh2ms(data: np.ndarray) -> np.ndarray:
-    """Converts mm h-1 to m s-1."""
-    return data / con.SEC_IN_HOUR * con.MM_TO_M

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/constants.py

@@ -30,3 +30,6 @@ G_TO_KG: Final = 1e-3
 M_S_TO_MM_H: Final = SEC_IN_HOUR / MM_TO_M
 MM_H_TO_M_S: Final = 1 / M_S_TO_MM_H
 GHZ_TO_HZ: Final = 1e9
+HPA_TO_PA: Final = 100
+PA_TO_HPA: Final = 1 / HPA_TO_PA
+KM_H_TO_M_S: Final = 1000 / SEC_IN_HOUR

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/instruments/disdrometer/thies.py

@@ -154,6 +154,16 @@ class Thies(Disdrometer):
             units, process, rows = read_toa5(filename)
             for row in rows:
                 self._read_line(row["RawString"], row["TIMESTAMP"])
+        elif first_line.startswith("Datetime [utc];Device address;"):
+            with open(filename) as file:
+                first_line = file.readline()
+                for line in file:
+                    timestamp, telegram = line.split(";", maxsplit=1)
+                    fixed_telegram = telegram.strip().rstrip(";") + ";"
+                    parsed_timestamp = datetime.datetime.strptime(
+                        timestamp, "%Y-%m-%d %H:%M:%S"
+                    )
+                    self._read_line(fixed_telegram, parsed_timestamp)
         else:
             with open(filename) as file:
                 for line in file:

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/instruments/rpg.py

@@ -10,9 +10,8 @@ from numpy import ma
 from rpgpy import RPGFileError
 
 from cloudnetpy import output, utils
-from cloudnetpy.categorize.atmos_utils import mmh2ms
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.constants import G_TO_KG
+from cloudnetpy.constants import G_TO_KG, HPA_TO_PA, KM_H_TO_M_S, MM_H_TO_M_S
 from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
@@ -307,8 +306,11 @@ class Fmcw(Rpg):
 
     def convert_units(self) -> None:
         """Converts units."""
-        self.data["rainfall_rate"].data = mmh2ms(self.data["rainfall_rate"].data)
+        self.data["rainfall_rate"].data = self.data["rainfall_rate"].data * MM_H_TO_M_S
         self.data["lwp"].data *= G_TO_KG
+        self.data["relative_humidity"].data /= 100
+        self.data["air_pressure"].data *= HPA_TO_PA
+        self.data["wind_speed"].data *= KM_H_TO_M_S
 
     @staticmethod
     def _get_instrument(data: dict):

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/instruments/rpg_reader.py

@@ -71,8 +71,8 @@ class Fmcw94Bin:
             "QF": "quality_flag",
             "RR": "rainfall_rate",
             "RelHum": "relative_humidity",
-            "EnvTemp": "temperature",
-            "BaroP": "pressure",
+            "EnvTemp": "air_temperature",
+            "BaroP": "air_pressure",
             "WS": "wind_speed",
             "WD": "wind_direction",
             "DDVolt": "voltage",

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/instruments/weather_station.py

@@ -8,7 +8,7 @@ from numpy import ma
 from cloudnetpy import output
 from cloudnetpy.categorize import atmos_utils
 from cloudnetpy.cloudnetarray import CloudnetArray
-from cloudnetpy.constants import MM_H_TO_M_S, SEC_IN_HOUR
+from cloudnetpy.constants import HPA_TO_PA, MM_H_TO_M_S, SEC_IN_HOUR
 from cloudnetpy.exceptions import ValidTimeStampError, WeatherStationDataError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.cloudnet_instrument import CloudnetInstrument
@@ -137,7 +137,7 @@ class WS(CloudnetInstrument):
         self.data["rainfall_rate"].data = rainfall_rate / 60 / 1000  # mm/min -> m/s
 
     def convert_pressure(self) -> None:
-        self.data["air_pressure"].data = self.data["air_pressure"][:] * 100  # hPa to Pa
+        self.data["air_pressure"].data = self.data["air_pressure"][:] * HPA_TO_PA
 
     def normalize_rainfall_amount(self) -> None:
         if "rainfall_amount" in self.data:

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4}/cloudnetpy/version.py

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

{cloudnetpy-1.65.2 → cloudnetpy-1.65.4/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.65.2
+Version: 1.65.4
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License