Merge pull request #506 from jukent/snake_case

Updates to Gallery to use new function names and kwargs
NCAR · Jun 30, 2023 · c81cac7 · c81cac7
2 parents e02e89d + 6595f89
commit c81cac7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 deletions.
diff --git a/Gallery/MapProjections/NCL_sat_1.py b/Gallery/MapProjections/NCL_sat_1.py
@@ -90,14 +90,21 @@
 
 # low pressure contour levels- these will be plotted
 # as a subscript to an 'L' symbol.
-lowCLabels = gv.findLocalExtrema(pressure,
-                                 eType='Low',
-                                 highVal=1040,
-                                 lowVal=975)
+lowCLabels = gv.find_local_extrema(pressure,
+                                   eType='Low',
+                                   highVal=1040,
+                                   lowVal=975)
 
 # Plot Clabels
-gv.plotCLabels(ax, p, ccrs.Geodetic(), proj, clabel_locations=regularCLabels)
-gv.plotELabels(pressure, ccrs.Geodetic(), proj, clabel_locations=lowCLabels)
+gv.plot_contour_labels(ax,
+                       p,
+                       ccrs.Geodetic(),
+                       proj,
+                       clabel_locations=regularCLabels)
+gv.plot_extrema_labels(pressure,
+                       ccrs.Geodetic(),
+                       proj,
+                       label_locations=lowCLabels)
 
 # Use gv function to set title and subtitles
 gv.set_titles_and_labels(ax,

diff --git a/Gallery/MapProjections/NCL_sat_2.py b/Gallery/MapProjections/NCL_sat_2.py
@@ -89,8 +89,8 @@
 
 # low pressure contour levels- these will be plotted
 # as a subscript to an 'L' symbol.
-lowClevels = gv.findLocalExtrema(pressure, lowVal=995, eType='Low')
-highClevels = gv.findLocalExtrema(pressure, highVal=1042, eType='High')
+lowClevels = gv.find_local_extrema(pressure, lowVal=995, eType='Low')
+highClevels = gv.find_local_extrema(pressure, highVal=1042, eType='High')
 
 # Label regular contours with automatic matplotlib labeling
 # Specify the levels to label every other contour level
@@ -102,16 +102,16 @@
           fmt="%.0f")
 
 # Label low and high contours
-gv.plotELabels(wrap_pressure,
-               ccrs.Geodetic(),
-               proj,
-               clabel_locations=lowClevels,
-               label='L')
-gv.plotELabels(wrap_pressure,
-               ccrs.Geodetic(),
-               proj,
-               clabel_locations=highClevels,
-               label='H')
+gv.plot_extrema_labels(wrap_pressure,
+                       ccrs.Geodetic(),
+                       proj,
+                       label_locations=lowClevels,
+                       label='L')
+gv.plot_extrema_labels(wrap_pressure,
+                       ccrs.Geodetic(),
+                       proj,
+                       label_locations=highClevels,
+                       label='H')
 
 # Use gv function to set title and subtitles
 gv.set_titles_and_labels(ax,

diff --git a/Plots/Contours/NCL_minmax_3.py b/Plots/Contours/NCL_minmax_3.py
@@ -187,11 +187,11 @@ def plotLabels(coord_locations, label):
 contours = ax.contourf(data, cmap=cmap, levels=levels)
 lines = ax.contour(contours, linewidths=0.5, linestyles='solid', colors='black')
 
-# Find local min/max extrema with GeoCAT-Viz findLocalExtrema
+# Find local min/max extrema with GeoCAT-Viz find_local_extrema
 # Use below command instead after PR#46 in Viz is merged
-# lmin = gv.findLocalExtrema(data, eType='Low', highVal=12, lowVal=-10, eps=7)
-lmin = gv.findLocalExtrema(data, eType='Low', highVal=12, lowVal=-10)
-lmax = gv.findLocalExtrema(data, eType='High', highVal=12, lowVal=-10)
+# lmin = gv.find_local_extrema(data, eType='Low', highVal=12, lowVal=-10, eps=7)
+lmin = gv.find_local_extrema(data, eType='Low', highVal=12, lowVal=-10)
+lmax = gv.find_local_extrema(data, eType='High', highVal=12, lowVal=-10)
 
 # Plot labels for local extrema
 plotLabels(lmin, 'L')