Fix pymatrix fortran leak bug, add diameter_min option, improve L2M parameters defaults (#244)

* Improve L2M GS defaults

* Fix doc typos

* Fix pytmatrix bug and add diameter_min argument

* Fix L0C bug when missing time block

* Improve DWD reader and add pytmatrix missing tests

* Improve test coverage

* Fix test

Author: ghiggi

disdrodb/api/checks.py

@@ -119,14 +119,64 @@ def check_scattering_table_dir(scattering_table_dir: str):
 
 
 def check_measurement_interval(measurement_interval):
-    """Check measurement interval validity."""
+    """Check measurement interval validity.
+
+    The measurement interval must be a positive natural number.
+    It can be specified as an int or a float (but must represent a whole number)
+
+    Parameters
+    ----------
+    measurement_interval : int or float
+        The measurement interval value to validate.
+
+    Returns
+    -------
+    int
+        The validated measurement interval as an integer.
+
+    Raises
+    ------
+    ValueError
+        If the measurement interval is not a valid positive natural number.
+    TypeError
+        If the measurement interval has an invalid type.
+    """
+    # Check for None
+    if measurement_interval is None:
+        raise ValueError("'measurement_interval' cannot be None.")
+
+    # Check for empty string
     if isinstance(measurement_interval, str) and measurement_interval == "":
-        raise ValueError("measurement_interval' must be specified as an integer value.")
-    if isinstance(measurement_interval, type(None)):
-        raise ValueError("measurement_interval' can not be None.")
-    if isinstance(measurement_interval, str) and not measurement_interval.isdigit():
-        raise ValueError("measurement_interval' is not a positive digit.")
-    return int(measurement_interval)
+        raise ValueError("'measurement_interval' must be specified as an integer value.")
+
+    # Check for boolean (bool is subclass of int, so check before int)
+    if isinstance(measurement_interval, bool):
+        raise TypeError("'measurement_interval' cannot be a boolean.")
+
+    # Handle string input
+    if isinstance(measurement_interval, str):
+        if not measurement_interval.isdigit():
+            raise ValueError("'measurement_interval' is not a positive integer.")
+        raise ValueError("'measurement_interval' must be specified as number, not as string'")
+
+    # Handle numeric input (int or float)
+    if isinstance(measurement_interval, (int, float)):
+        # Check if positive
+        if measurement_interval <= 0:
+            raise ValueError("'measurement_interval' must be a positive number.")
+
+        # Check if it's a whole number (no decimals)
+        if measurement_interval != int(measurement_interval):
+            raise ValueError(
+                f"'measurement_interval' must be a natural number without decimals. Got {measurement_interval}.",
+            )
+
+        return int(measurement_interval)
+
+    # Invalid type
+    raise TypeError(
+        f"'measurement_interval' must be an int or float. Got {type(measurement_interval).__name__}.",
+    )
 
 
 def check_measurement_intervals(measurement_intervals):
@@ -611,7 +661,7 @@ def check_time(time):
     if isinstance(time, np.ndarray):
         if np.issubdtype(time.dtype, np.datetime64):
             if time.size == 1:
-                time = time[0].astype("datetime64[s]").tolist()
+                time = np.atleast_1d(time)[0].astype("datetime64[s]").tolist()
             else:
                 raise ValueError("Expecting a single timestep!")
         else:

disdrodb/api/io.py

@@ -570,7 +570,11 @@ def preprocess(ds):
     # Subset time
     if start_time is not None or end_time is not None:
         ds = filter_dataset_by_time(ds, start_time=start_time, end_time=end_time)
-
+        # Close connection and raise error if no timesteps available
+        if ds.sizes["time"] == 0:
+            ds.close()
+            del ds
+            raise ValueError(f"No timesteps available between {start_time} and {end_time}")
     # Ensure coordinates are already loaded in memory
     for coord in list(ds.coords):
         ds[coord] = ds[coord].load()

disdrodb/cli/pytmatrix_lut.py

@@ -0,0 +1,53 @@
+import os
+
+import click
+
+from disdrodb.scattering.routines import calculate_scatterer
+
+
+@click.command(context_settings={"help_option_names": ["-h", "--help"]})
+@click.option("--frequency", type=float, required=True, help="Radar frequency [GHz]")
+@click.option("--num-points", type=int, default=1024, show_default=True)
+@click.option("--diameter-min", type=float, default=0, show_default=True, help="Min diameter [mm]")
+@click.option("--diameter-max", type=float, default=8.0, show_default=True, help="Max diameter [mm]")
+@click.option("--canting-angle-std", type=float, default=7.0, show_default=True, help="Canting angle std [deg]")
+@click.option("--axis-ratio-model", type=str, default="Thurai2007", show_default=True)
+@click.option("--permittivity-model", type=str, default="Turner2016", show_default=True)
+@click.option("--water-temperature", type=float, default=10.0, show_default=True, help="Water temperature [°C]")
+@click.option("--elevation-angle", type=float, default=0.0, show_default=True)
+@click.argument("output", type=click.Path(dir_okay=False))
+def main(
+    frequency,
+    num_points,
+    diameter_min,
+    diameter_max,
+    canting_angle_std,
+    axis_ratio_model,
+    permittivity_model,
+    water_temperature,
+    elevation_angle,
+    output,
+):
+    """
+    Compute ONE pyTMatrix scattering LUT in a fresh Python process.
+
+    OUTPUT is the full path to the .pkl LUT file.
+    """
+    click.echo("Initializing pyTMatrix LUT generation...")
+
+    scatterer = calculate_scatterer(
+        frequency=frequency,
+        num_points=num_points,
+        diameter_min=diameter_min,
+        diameter_max=diameter_max,
+        canting_angle_std=canting_angle_std,
+        axis_ratio_model=axis_ratio_model,
+        water_temperature=water_temperature,
+        permittivity_model=permittivity_model,
+        elevation_angle=elevation_angle,
+    )
+
+    os.makedirs(os.path.dirname(output), exist_ok=True)
+    scatterer.psd_integrator.save_scatter_table(output)
+
+    click.echo(f"✔ LUT written to {output}")

disdrodb/etc/products/L2E/LPM/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/LPM_V0/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/ODM470/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/PARSIVEL/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/PARSIVEL2/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/PWS100/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007

disdrodb/etc/products/L2E/global.yaml

@@ -28,6 +28,7 @@ radar_enabled: False
 radar_options:
   frequency: ["S", "C", "X", "Ku", "K", "Ka", "W"]
   num_points: 1024
+  diameter_min: 0
   diameter_max: 10
   canting_angle_std: 7
   axis_ratio_model: Thurai2007