Merge pull request #330 from dopplershift/cleanup

Cleanup

notebooks/CartoPy/CartoPy.ipynb

@@ -374,12 +374,12 @@
    "source": [
     "# Create some synthetic gridded wind data\n",
     "import numpy as np\n",
-    "from metpy.calc import get_wind_speed\n",
+    "from metpy.calc import wind_speed\n",
     "\n",
     "# Note that all of these winds have u = 0 -> south wind\n",
     "v = np.full((5, 5), 10, dtype=np.float64) + 10 * np.arange(5)\n",
     "u = np.zeros_like(v)\n",
-    "speed = get_wind_speed(u, v)\n",
+    "speed = wind_speed(u, v)\n",
     "x, y = np.meshgrid(np.linspace(-120, -60, 5), np.linspace(25, 50, 5))\n",
     "\n",
     "# Plot as normal\n",

notebooks/Command_Line_Tools/synopticplot.py

@@ -161,7 +161,7 @@ def make_basemap(proj):
 
     # Contour the GFS data
     c = ax.contour(gfs_lon_grid, gfs_lat_grid, gfs_data_grid, colors='C3',
-                   lw=2, transform=ccrs.PlateCarree())
+                   linewidths=2, transform=ccrs.PlateCarree())
 
     plt.clabel(c, fontsize=14, inline=1, inline_spacing=1, fmt='%i', rightside_up=True)
 

notebooks/MetPy_Case_Study/MetPy_Case_Study.ipynb

@@ -410,7 +410,7 @@
     "\n",
     "MetPy has a large and growing list of functions to calculate many different atmospheric quantities. Here we want to use some classic functions to calculate wind speed, advection, planetary vorticity, relative vorticity, and divergence.\n",
     "\n",
-    "* Wind Speed: `mpcalc.get_wind_speed()`\n",
+    "* Wind Speed: `mpcalc.wind_speed()`\n",
     "* Advection: `mpcalc.advection()`\n",
     "* Planetary Vorticity: `mpcalc.coriolis_parameter()`\n",
     "* Relative Vorticity: `mpcalc.vorticity()`\n",
@@ -605,7 +605,7 @@
     "\n",
     "Calculating wind speed is not a difficult calculation, but MetPy offers a function to calculate it easily keeping units so that it is easy to convert units for plotting purposes.\n",
     "\n",
-    "[`get_wind_speed(uwnd, vwnd)`](https://unidata.github.io/MetPy/latest/api/generated/metpy.calc.get_wind_speed.html#metpy.calc.get_wind_speed)\n",
+    "[`wind_speed(uwnd, vwnd)`](https://unidata.github.io/MetPy/latest/api/generated/metpy.calc.wind_speed.html#metpy.calc.wind_speed)\n",
     "\n",
     "**Geostrophic Wind**\n",
     "\n",
@@ -630,7 +630,7 @@
    "outputs": [],
    "source": [
     "# Divergence 300 hPa, Ageostrophic Wind\n",
-    "wspd_300 = mpcalc.get_wind_speed(uwnd_300, vwnd_300).to('kts')\n",
+    "wspd_300 = mpcalc.wind_speed(uwnd_300, vwnd_300).to('kts')\n",
     "\n",
     "div_300 = mpcalc.divergence(uwnd_300, vwnd_300, dx, dy, dim_order='yx')\n",
     "ugeo_300, vgeo_300 = mpcalc.geostrophic_wind(hght_300, f, dx, dy, dim_order='yx')\n",

notebooks/Metpy_Introduction/Introduction to MetPy.ipynb

@@ -387,7 +387,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Let's use the `get_wind_dir` function from MetPy to calculate wind direction from these values. Remember you can look at the docstring or the website for help."
+    "Let's use the `wind_direction` function from MetPy to calculate wind direction from these values. Remember you can look at the docstring or the website for help."
    ]
   },
   {
@@ -396,7 +396,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "direction = mpcalc.get_wind_dir(u, v)\n",
+    "direction = mpcalc.wind_direction(u, v)\n",
     "print(direction)"
    ]
   },
@@ -406,7 +406,7 @@
    "source": [
     "<div class=\"alert alert-success\">\n",
     "    <b>EXERCISE</b>:\n",
-    "    <li>Calculate the wind speed using the `get_wind_speed` function.</li>\n",
+    "    <li>Calculate the wind speed using the `wind_speed` function.</li>\n",
     "    <li>Print the wind speed in m/s and mph.</li>\n",
     "</div>"
    ]
@@ -427,7 +427,7 @@
     "<button data-toggle=\"collapse\" data-target=\"#sol3\" class='btn btn-primary'>View Solution</button>\n",
     "<div id=\"sol3\" class=\"collapse\">\n",
     "<code><pre>\n",
-    "speed = mpcalc.get_wind_speed(u, v)\n",
+    "speed = mpcalc.wind_speed(u, v)\n",
     "print(speed)\n",
     "print(speed.to('mph'))\n",
     "</pre></code>\n",
@@ -475,7 +475,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.6.6"
   }
  },
  "nbformat": 4,