Merge branch 'main' into zdr_bias

ARM-DOE · Aug 29, 2024 · 1b3b2bd · 1b3b2bd
2 parents 83627ed + 2410559
commit 1b3b2bd
Show file tree

Hide file tree

Showing 69 changed files with 3,343 additions and 171 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -0,0 +1,7 @@
+version: 2
+conda:
+  environment: doc/environment.yml
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "mambaforge-4.10"
diff --git a/examples/correct/plot_attenuation.py b/examples/correct/plot_attenuation.py
@@ -7,6 +7,7 @@
 for a polarimetric radar using a Z-PHI method implemented in Py-ART.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/correct/plot_dealias.py b/examples/correct/plot_dealias.py
@@ -6,6 +6,7 @@
 In this example doppler velocities are dealiased using the ial condition of the dealiasing,
 using the region-based dealiasing algorithm in Py-ART.
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/io/plot_nexrad_data_aws.py b/examples/io/plot_nexrad_data_aws.py
@@ -7,6 +7,7 @@
 and plot quick looks of the datasets.
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected])

diff --git a/examples/io/plot_older_nexrad_data_aws.py b/examples/io/plot_older_nexrad_data_aws.py
@@ -7,6 +7,7 @@
 to 2008 that are missing some coordinate metadata.
 
 """
+
 print(__doc__)
 
 

diff --git a/examples/mapping/plot_compare_two_radars_gatemapper.py b/examples/mapping/plot_compare_two_radars_gatemapper.py
@@ -7,6 +7,7 @@
 another radar in Antenna coordinates and compare the fields.
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected]) and Bobby Jackson ([email protected])

diff --git a/examples/mapping/plot_grid_single_sweep_ppi.py b/examples/mapping/plot_grid_single_sweep_ppi.py
@@ -13,6 +13,7 @@
 negligible at low elevation angles common to PPI sweeps.
 
 """
+
 print(__doc__)
 
 # =====================

diff --git a/examples/mapping/plot_map_one_radar_to_grid.py b/examples/mapping/plot_map_one_radar_to_grid.py
@@ -7,6 +7,7 @@
 Cartesian grid.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/mapping/plot_map_two_radars_to_grid.py b/examples/mapping/plot_map_two_radars_to_grid.py
@@ -7,6 +7,7 @@
 coordinates to a Cartesian grid.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_choose_a_colormap.py b/examples/plotting/plot_choose_a_colormap.py
@@ -7,6 +7,7 @@
 and how to add them to your own plots.
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected])

diff --git a/examples/plotting/plot_cross_section.py b/examples/plotting/plot_cross_section.py
@@ -7,6 +7,7 @@
 of your radar grid using the GridMapDisplay
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected])

diff --git a/examples/plotting/plot_modify_colorbar.py b/examples/plotting/plot_modify_colorbar.py
@@ -7,6 +7,7 @@
 within a Py-ART display object.
 
 """
+
 print(__doc__)
 
 # Author: Joe O'Brien ([email protected])

diff --git a/examples/plotting/plot_nexrad_multiple_moments.py b/examples/plotting/plot_nexrad_multiple_moments.py
@@ -7,6 +7,7 @@
 NEXRAD Archive file.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_nexrad_reflectivity.py b/examples/plotting/plot_nexrad_reflectivity.py
@@ -7,6 +7,7 @@
 NEXRAD file.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_ppi_cfradial.py b/examples/plotting/plot_ppi_cfradial.py
@@ -6,6 +6,7 @@
 An example which creates a PPI plot of a Cfradial file.
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected])

diff --git a/examples/plotting/plot_ppi_mdv.py b/examples/plotting/plot_ppi_mdv.py
@@ -6,6 +6,7 @@
 An example which creates a PPI plot of a MDV file using a RadarDisplay object.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_rhi_cfradial.py b/examples/plotting/plot_rhi_cfradial.py
@@ -7,6 +7,7 @@
 a RadarDisplay object.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_rhi_cfradial_singlescan.py b/examples/plotting/plot_rhi_cfradial_singlescan.py
@@ -7,6 +7,7 @@
 a RadarDisplay object.
 
 """
+
 print(__doc__)
 
 import matplotlib.pyplot as plt

diff --git a/examples/plotting/plot_rhi_contours_differential_reflectivity.py b/examples/plotting/plot_rhi_contours_differential_reflectivity.py
@@ -7,6 +7,7 @@
 and adding differnential Reflectivity contours from the same MDV file.
 
 """
+
 print(__doc__)
 
 # Author: Cory Weber ([email protected])

diff --git a/examples/plotting/plot_rhi_data_overlay.py b/examples/plotting/plot_rhi_data_overlay.py
@@ -7,6 +7,7 @@
 and adding Reflectivity contours from the same MDV file.
 
 """
+
 print(__doc__)
 
 # Author: Cory Weber ([email protected])

diff --git a/examples/plotting/plot_rhi_mdv.py b/examples/plotting/plot_rhi_mdv.py
@@ -6,6 +6,7 @@
 An example which creates a RHI plot of a MDV file using a RadarDisplay object.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/plot_rhi_two_panel.py b/examples/plotting/plot_rhi_two_panel.py
@@ -7,6 +7,7 @@
 included in the two panels are reflectivity and doppler velocity.
 
 """
+
 print(__doc__)
 
 # Author: Max Grover ([email protected])

diff --git a/examples/plotting/plot_xsect.py b/examples/plotting/plot_xsect.py
@@ -7,6 +7,7 @@
 of PPI scans and plots both cross sections.
 
 """
+
 print(__doc__)
 
 # Author: Jonathan J. Helmus ([email protected])

diff --git a/examples/plotting/radar-cross-section.ipynb b/examples/plotting/radar-cross-section.ipynb
@@ -8,6 +8,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
+    "\n",
     "import pyart\n",
     "from pyart.testing import get_test_data\n",
     "\n",
@@ -344,7 +345,7 @@
    "outputs": [],
    "source": [
     "fig = plt.figure(figsize=(10, 8))\n",
-    "title = \"($^\\circ$N)\"\n",
+    "title = r\"($^\\circ$N)\"\n",
     "cross.corrected_reflectivity_horizontal.plot(\n",
     "    cmap=\"pyart_HomeyerRainbow\",\n",
     "    x=None,\n",
@@ -362,7 +363,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pyart.graph.common import generate_grid_time_begin, generate_field_name\n",
+    "from pyart.graph.common import generate_field_name, generate_grid_time_begin\n",
     "\n",
     "\n",
     "def generate_cross_section_title(grid, field, start, end):\n",

diff --git a/examples/retrieve/column-example.ipynb b/examples/retrieve/column-example.ipynb
@@ -16,10 +16,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pyart\n",
-    "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
     "import cartopy.crs as ccrs\n",
+    "import matplotlib.pyplot as plt\n",
+    "import numpy as np\n",
+    "\n",
+    "import pyart\n",
     "from pyart.testing import get_test_data"
    ]
   },

diff --git a/examples/retrieve/plot_hydrometeor.py b/examples/retrieve/plot_hydrometeor.py
@@ -53,7 +53,7 @@
     kdp_field="specific_differential_phase",
     rhv_field="uncorrected_cross_correlation_ratio",
     temp_field="temperature",
-)
+)["hydro"]
 
 radar.add_field("radar_echo_classification", hydro)
 

diff --git a/examples/retrieve/plot_hydrometeor_class_x_band.py b/examples/retrieve/plot_hydrometeor_class_x_band.py
@@ -51,7 +51,7 @@
     kdp_field="filtered_corrected_specific_diff_phase",
     rhv_field="RHOHV",
     temp_field="sounding_temperature",
-)
+)["hydro"]
 
 radar.add_field("hydro_classification", hydromet_class, replace_existing=True)
 
@@ -69,7 +69,7 @@
     rhv_field="RHOHV",
     temp_field="sounding_temperature",
     radar_freq=9.2e9,
-)
+)["hydro"]
 
 radar.add_field("hydro_classification", hydromet_class, replace_existing=True)
 
@@ -98,7 +98,7 @@
     rhv_field="RHOHV",
     temp_field="sounding_temperature",
     radar_freq=9.2e9,
-)
+)["hydro"]
 
 radar.add_field("hydro_classification", hydromet_class, replace_existing=True)
 
@@ -121,27 +121,25 @@
     "Lime",
     "Yellow",
     "Red",
-    "Fuchsia",
 ]
 cmaphid = colors.ListedColormap(hid_colors)
 cmapmeth = colors.ListedColormap(hid_colors[0:6])
 cmapmeth_trop = colors.ListedColormap(hid_colors[0:7])
 
 
 def adjust_fhc_colorbar_for_pyart(cb):
-    cb.set_ticks(np.arange(1.4, 10, 0.9))
+    cb.set_ticks(np.arange(1.4, 9, 0.9))
     cb.ax.set_yticklabels(
         [
-            "Drizzle",
-            "Rain",
-            "Ice Crystals",
             "Aggregates",
-            "Wet Snow",
+            "Ice Crystals",
+            "Light rain",
+            "Rain",
             "Vertical Ice",
-            "LD Graupel",
+            "Wet snow",
             "HD Graupel",
-            "Hail",
-            "Big Drops",
+            "Melting hail",
+            "Dry hail or high-density graupel",
         ]
     )
     cb.ax.set_ylabel("")

diff --git a/examples/retrieve/wavelet_echo_class_example.ipynb b/examples/retrieve/wavelet_echo_class_example.ipynb
@@ -74,8 +74,9 @@
     }
    ],
    "source": [
-    "import pyart\n",
-    "import numpy as np"
+    "import numpy as np\n",
+    "\n",
+    "import pyart"
    ]
   },
   {
@@ -281,10 +282,9 @@
    "source": [
     "# Required imports\n",
     "\n",
-    "import matplotlib.pyplot as plt\n",
-    "import matplotlib.colors as mcolors\n",
     "import cartopy.crs as ccrs\n",
-    "\n",
+    "import matplotlib.colors as mcolors\n",
+    "import matplotlib.pyplot as plt\n",
     "\n",
     "display = pyart.graph.GridMapDisplay(grid)\n",
     "\n",

diff --git a/examples/xradar/plot_dealias_xradar.py b/examples/xradar/plot_dealias_xradar.py
@@ -23,7 +23,7 @@
 tree = xd.io.open_cfradial1_datatree(filename)
 
 # Give the tree Py-ART radar methods
-radar = pyart.xradar.Xradar(tree)
+radar = tree.pyart.to_radar()
 
 # Determine the nyquist velocity using the maximum radial velocity from the first sweep
 nyq = radar["sweep_0"]["mean_doppler_velocity"].max().values

diff --git a/examples/xradar/plot_grid_xradar.py b/examples/xradar/plot_grid_xradar.py
@@ -21,7 +21,7 @@
 tree = xd.io.open_cfradial1_datatree(filename)
 
 # Give the tree Py-ART radar methods
-radar = pyart.xradar.Xradar(tree)
+radar = tree.pyart.to_radar()
 
 # Grid using 11 vertical levels, and 101 horizontal grid cells at a resolution on 1 km
 grid = pyart.map.grid_from_radars(

diff --git a/examples/xradar/plot_xradar.py b/examples/xradar/plot_xradar.py
@@ -21,7 +21,7 @@
 tree = xd.io.open_cfradial1_datatree(filename)
 
 # Give the tree Py-ART radar methods
-radar = pyart.xradar.Xradar(tree)
+radar = tree.pyart.to_radar()
 
 # Plot the Reflectivity Field (corrected_reflectivity_horizontal)
 display = pyart.graph.RadarMapDisplay(radar)

diff --git a/pyart/__check_build/__init__.py b/pyart/__check_build/__init__.py
@@ -1,6 +1,7 @@
 """ Module to give helpful messages to the user that did not
 compile Py-ART properly.
 """
+
 import os
 
 INPLACE_MSG = """

diff --git a/pyart/core/__init__.py b/pyart/core/__init__.py
@@ -13,6 +13,7 @@
 from .transforms import cartesian_vectors_to_geographic  # noqa
 from .transforms import geographic_to_cartesian  # noqa
 from .transforms import geographic_to_cartesian_aeqd  # noqa
+from .transforms import cartesian_to_antenna  # noqa
 from .wind_profile import HorizontalWindProfile  # noqa
 
 __all__ = [s for s in dir() if not s.startswith("_")]
diff --git a/pyart/core/transforms.py b/pyart/core/transforms.py
@@ -78,6 +78,33 @@ def antenna_to_cartesian(ranges, azimuths, elevations):
     return x, y, z
 
 
+def cartesian_to_antenna(x, y, z):
+    """
+    Returns antenna coordinates from Cartesian coordinates.
+
+    Parameters
+    ----------
+    x, y, z : array
+        Cartesian coordinates in meters from the radar.
+
+    Returns
+    -------
+    ranges : array
+        Distances to the center of the radar gates (bins) in m.
+    azimuths : array
+        Azimuth angle of the radar in degrees. [-180., 180]
+    elevations : array
+        Elevation angle of the radar in degrees.
+
+    """
+    ranges = np.sqrt(x**2.0 + y**2.0 + z**2.0)
+    elevations = np.rad2deg(np.arctan(z / np.sqrt(x**2.0 + y**2.0)))
+    azimuths = np.rad2deg(np.arctan2(x, y))  # [-180, 180]
+    azimuths[azimuths < 0.0] += 360.0  # [0, 360]
+
+    return ranges, azimuths, elevations
+
+
 def antenna_vectors_to_cartesian(ranges, azimuths, elevations, edges=False):
     """
     Calculate Cartesian coordinate for gates from antenna coordinate vectors.