responding to PR comments from Jesse

Author: brianpm

.gitignore

@@ -1,13 +1,11 @@
-# Ignore compiled python
-*.pyc
 
 # Ignore editor temporaries and backups
 *~
 .#*
 \#*#
 *.swp
 
-# Igore all the other stuff:
+# Ignore non-source python files:
 __pycache__
 *.py[cod]
 *$py.class
@@ -70,7 +68,6 @@ __pypackages__/
 # Environment
 .env
 .venv
-env/
 venv/
 ENV/
 

lib/adf_diag.py

@@ -223,11 +223,8 @@ def __init__(self, config_file, debug=False):
 
     @property
     def use_defaults(self):
-        ud = self.read_config_var('use_defaults', conf_dict=self.__basic_info)
-        if ud is None:
-            return False
-        else:
-            return ud
+        return self.read_config_var('use_defaults', conf_dict=self.__basic_info)
+        
 
     # Create property needed to return "compare_obs" logical to user:
     @property

lib/adf_variable_defaults.yaml

@@ -1,15 +1,16 @@
 PSL:
   colormap: "Oranges"
   contour_levels_range: [980, 1052, 4]
-  diff_colormap: "PuOr_r"
+   diff_colormap: "PuOr_r"
   diff_contour_range: [-15, 15, 1]
   scale_factor: 0.01
   add_offset: 0
   new_unit: "hPa"
 
 PS:
   colormap: "Oranges"
-  contour_levels_range: [980, 1052, 4]  
+  # contour_levels_range: [980, 1052, 4]  
+  contour_levels: [600,630,660,690,720,750,780,810,840,870,900,930,960,990,1020]
   diff_colormap: "PuOr_r"
   diff_contour_range: [-15, 15, 1]
   scale_factor: 0.01

lib/plotting_functions.py

@@ -165,7 +165,7 @@ def plot_map_and_save(wks, mdlfld, obsfld, diffld, **kwargs):
         levels1 = kwargs['contour_levels']
         norm1 = mpl.colors.Normalize(vmin=min(levels1), vmax=max(levels1))
     elif 'contour_levels_range' in kwargs:
-        assert len(kwargs['contour_levels_range']) == 3
+        assert len(kwargs['contour_levels_range']) == 3, "contour_levels_range must have exactly three entries: min, max, step"
         levels1 = np.arange(*kwargs['contour_levels_range'])
         norm1 = mpl.colors.Normalize(vmin=min(levels1), vmax=max(levels1))
     else:
@@ -188,7 +188,7 @@ def plot_map_and_save(wks, mdlfld, obsfld, diffld, **kwargs):
     if "diff_contour_levels" in kwargs:
         levelsdiff = kwargs["diff_contour_levels"]  # a list of explicit contour levels
     elif "diff_contour_range" in kwargs:
-            assert len(kwargs['diff_contour_range']) == 3  # start, stop, step
+            assert len(kwargs['diff_contour_range']) == 3, "diff_contour_range must have exactly three entries: min, max, step"  
             levelsdiff = np.arange(*kwargs['diff_contour_range'])
     else:
         # set a symmetric color bar for diff:
@@ -219,7 +219,7 @@ def plot_map_and_save(wks, mdlfld, obsfld, diffld, **kwargs):
     for i, a in enumerate(wrap_fields):
 
         if i == len(wrap_fields)-1:
-            levels = levelsdiff #Using 'levels=12' casued len() error in mpl. -JN
+            levels = levelsdiff
             cmap = cmapdiff
             norm = normdiff
         else: