disdrodb 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

disdrodb/psd/models.py

@@ -32,7 +32,7 @@ import xarray as xr
 from scipy.interpolate import PchipInterpolator, interp1d
 from scipy.special import gamma as gamma_f
 
-from disdrodb import DIAMETER_DIMENSION
+from disdrodb.constants import DIAMETER_DIMENSION
 from disdrodb.utils.warnings import suppress_warnings
 
 # Check if pytmatrix is available
@@ -79,7 +79,7 @@ def check_diameter_inputs(D):
             raise ValueError("Expecting a 1-dimensional diameter array.")
         if D.size == 0:
             raise ValueError("Expecting a non-empty diameter array.")
-        return xr.DataArray(D, dims=DIAMETER_DIMENSION)
+        return D  # If xr.DataArray(D, dims=DIAMETER_DIMENSION) make pytmatrix failing !
     raise TypeError(f"Invalid diameter type: {type(D)}")
 
 
@@ -93,7 +93,7 @@ def get_psd_model_formula(psd_model):
     return PSD_MODELS_DICT[psd_model].formula
 
 
-def create_psd(psd_model, parameters):  # TODO: check name around
+def create_psd(psd_model, parameters):
     """Define a PSD from a dictionary or xr.Dataset of parameters."""
     psd_class = get_psd_model(psd_model)
     psd = psd_class.from_parameters(parameters)
@@ -121,6 +121,8 @@ class XarrayPSD(PSD):
     def __call__(self, D):
         """Compute the PSD."""
         D = check_diameter_inputs(D)
+        if self.has_xarray_parameters() and not np.isscalar(D):
+            D = xr.DataArray(D, dims=DIAMETER_DIMENSION)
         with suppress_warnings():
             return self.formula(D=D, **self.parameters)
 
@@ -302,7 +304,7 @@ class ExponentialPSD(XarrayPSD):
         Lambda: the inverse scale parameter
 
     Args (call):
-        D: the particle diameter.
+        D: the particle diameter in millimeter.
 
     Returns (call):
         The PSD value for the given diameter.
@@ -377,7 +379,7 @@ class GammaPSD(ExponentialPSD):
         mu: the shape parameter [-]
 
     Args (call):
-        D: the particle diameter.
+        D: the particle diameter in millimeter.
 
     Returns (call):
         The PSD value for the given diameter.
@@ -478,7 +480,7 @@ class NormalizedGammaPSD(XarrayPSD):
         mu: the shape parameter.
 
     Args (call):
-        D: the particle diameter.
+        D: the particle diameter in millimeter.
 
     Returns (call):
         The PSD value for the given diameter.
@@ -695,6 +697,7 @@ class BinnedPSD(PSD):
         """
         # Ensure D is numpy array of correct dimension
         D = np.asanyarray(check_diameter_inputs(D))
+
         # Define interpolator
         interpolator = define_interpolator(
             bin_edges=self.bin_edges,

disdrodb/routines/__init__.py

@@ -0,0 +1,54 @@
+# -----------------------------------------------------------------------------.
+# Copyright (c) 2021-2023 DISDRODB developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------.
+"""DISDRODB L0 software."""
+from disdrodb.routines.wrappers import (
+    create_summary,
+    create_summary_station,
+    run_l0,
+    run_l0_station,
+    run_l0a,
+    run_l0a_station,
+    run_l0b,
+    run_l0b_station,
+    run_l0c,
+    run_l0c_station,
+    run_l1,
+    run_l1_station,
+    run_l2e,
+    run_l2e_station,
+    run_l2m,
+    run_l2m_station,
+)
+
+__all__ = [
+    "create_summary",
+    "create_summary_station",
+    "run_l0",
+    "run_l0_station",
+    "run_l0a",
+    "run_l0a_station",
+    "run_l0b",
+    "run_l0b_station",
+    "run_l0c",
+    "run_l0c_station",
+    "run_l1",
+    "run_l1_station",
+    "run_l2e",
+    "run_l2e_station",
+    "run_l2m",
+    "run_l2m_station",
+]