feature 1247 climatology settings

docs/Users_Guide/glossary.rst

@@ -8780,3 +8780,183 @@ METplus Configuration Glossary
      See :term:`FCST_PCP_COMBINE_USE_ZERO_ACCUM` for more information.
 
      | *Used by:*  PCPCombine
+
+   ENSEMBLE_STAT_CLIMO_MEAN_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_mean fields for EnsembleStat.
+     Sets "climo_mean = fcst;" in the wrapped MET config file.
+     Only used if :term:`ENSEMBLE_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`ENSEMBLE_STAT_CLIMO_MEAN_USE_OBS`.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_CLIMO_MEAN_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_mean fields for EnsembleStat.
+     Sets "climo_mean = obs;" in the wrapped MET config file.
+     Only used if :term:`ENSEMBLE_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`ENSEMBLE_STAT_CLIMO_MEAN_USE_FCST`.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_CLIMO_STDEV_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_stdev fields for EnsembleStat.
+     Sets "climo_stdev = fcst;" in the wrapped MET config file.
+     Only used if :term:`ENSEMBLE_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`ENSEMBLE_STAT_CLIMO_STDEV_USE_OBS`.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_CLIMO_STDEV_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_stdev fields for EnsembleStat.
+     Sets "climo_stdev = obs;" in the wrapped MET config file.
+     Only used if :term:`ENSEMBLE_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`ENSEMBLE_STAT_CLIMO_STDEV_USE_FCST`.
+
+     | *Used by:* EnsembleStat
+
+   GEN_ENS_PROD_CLIMO_MEAN_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_mean fields for GenEnsProd.
+     Sets "climo_mean = fcst;" in the wrapped MET config file.
+     Only used if :term:`GEN_ENS_PROD_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`GEN_ENS_PROD_CLIMO_MEAN_USE_OBS`.
+
+     | *Used by:* GenEnsProd
+
+   GEN_ENS_PROD_CLIMO_MEAN_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_mean fields for GenEnsProd.
+     Sets "climo_mean = obs;" in the wrapped MET config file.
+     Only used if :term:`GEN_ENS_PROD_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`GEN_ENS_PROD_CLIMO_MEAN_USE_FCST`.
+
+     | *Used by:* GenEnsProd
+
+   GEN_ENS_PROD_CLIMO_STDEV_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_stdev fields for GenEnsProd.
+     Sets "climo_stdev = fcst;" in the wrapped MET config file.
+     Only used if :term:`GEN_ENS_PROD_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`GEN_ENS_PROD_CLIMO_STDEV_USE_OBS`.
+
+     | *Used by:* GenEnsProd
+
+   GEN_ENS_PROD_CLIMO_STDEV_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_stdev fields for GenEnsProd.
+     Sets "climo_stdev = obs;" in the wrapped MET config file.
+     Only used if :term:`GEN_ENS_PROD_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`GEN_ENS_PROD_CLIMO_STDEV_USE_FCST`.
+
+     | *Used by:* GenEnsProd
+
+   GRID_STAT_CLIMO_MEAN_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_mean fields for GridStat.
+     Sets "climo_mean = fcst;" in the wrapped MET config file.
+     Only used if :term:`GRID_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`GRID_STAT_CLIMO_MEAN_USE_OBS`.
+
+     | *Used by:* GridStat
+
+   GRID_STAT_CLIMO_MEAN_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_mean fields for GridStat.
+     Sets "climo_mean = obs;" in the wrapped MET config file.
+     Only used if :term:`GRID_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`GRID_STAT_CLIMO_MEAN_USE_FCST`.
+
+     | *Used by:* GridStat
+
+   GRID_STAT_CLIMO_STDEV_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_stdev fields for GridStat.
+     Sets "climo_stdev = fcst;" in the wrapped MET config file.
+     Only used if :term:`GRID_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`GRID_STAT_CLIMO_STDEV_USE_OBS`.
+
+     | *Used by:* GridStat
+
+   GRID_STAT_CLIMO_STDEV_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_stdev fields for GridStat.
+     Sets "climo_stdev = obs;" in the wrapped MET config file.
+     Only used if :term:`GRID_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`GRID_STAT_CLIMO_STDEV_USE_FCST`.
+
+     | *Used by:* GridStat
+
+   POINT_STAT_CLIMO_MEAN_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_mean fields for PointStat.
+     Sets "climo_mean = fcst;" in the wrapped MET config file.
+     Only used if :term:`POINT_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`POINT_STAT_CLIMO_MEAN_USE_OBS`.
+
+     | *Used by:* PointStat
+
+   POINT_STAT_CLIMO_MEAN_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_mean fields for PointStat.
+     Sets "climo_mean = obs;" in the wrapped MET config file.
+     Only used if :term:`POINT_STAT_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`POINT_STAT_CLIMO_MEAN_USE_FCST`.
+
+     | *Used by:* PointStat
+
+   POINT_STAT_CLIMO_STDEV_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_stdev fields for PointStat.
+     Sets "climo_stdev = fcst;" in the wrapped MET config file.
+     Only used if :term:`POINT_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`POINT_STAT_CLIMO_STDEV_USE_OBS`.
+
+     | *Used by:* PointStat
+
+   POINT_STAT_CLIMO_STDEV_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_stdev fields for PointStat.
+     Sets "climo_stdev = obs;" in the wrapped MET config file.
+     Only used if :term:`POINT_STAT_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`POINT_STAT_CLIMO_STDEV_USE_FCST`.
+
+     | *Used by:* PointStat
+
+   SERIES_ANALYSIS_CLIMO_MEAN_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_mean fields for SeriesAnalysis.
+     Sets "climo_mean = fcst;" in the wrapped MET config file.
+     Only used if :term:`SERIES_ANALYSIS_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`SERIES_ANALYSIS_CLIMO_MEAN_USE_OBS`.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_CLIMO_MEAN_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_mean fields for SeriesAnalysis.
+     Sets "climo_mean = obs;" in the wrapped MET config file.
+     Only used if :term:`SERIES_ANALYSIS_CLIMO_MEAN_FIELD` is unset.
+     See also :term:`SERIES_ANALYSIS_CLIMO_MEAN_USE_FCST`.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_CLIMO_STDEV_USE_FCST
+     If set to True, use the field array from the fcst dictionary for the
+     climo_stdev fields for SeriesAnalysis.
+     Sets "climo_stdev = fcst;" in the wrapped MET config file.
+     Only used if :term:`SERIES_ANALYSIS_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`SERIES_ANALYSIS_CLIMO_STDEV_USE_OBS`.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_CLIMO_STDEV_USE_OBS
+     If set to True, use the field array from the obs dictionary for the
+     climo_stdev fields for SeriesAnalysis.
+     Sets "climo_stdev = obs;" in the wrapped MET config file.
+     Only used if :term:`SERIES_ANALYSIS_CLIMO_STDEV_FIELD` is unset.
+     See also :term:`SERIES_ANALYSIS_CLIMO_STDEV_USE_FCST`.
+
+     | *Used by:* SeriesAnalysis

docs/Users_Guide/wrappers.rst

@@ -238,6 +238,8 @@ METplus Configuration
 | :term:`ENSEMBLE_STAT_CLIMO_MEAN_MATCH_MONTH`
 | :term:`ENSEMBLE_STAT_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`ENSEMBLE_STAT_CLIMO_MEAN_HOUR_INTERVAL`
+| :term:`ENSEMBLE_STAT_CLIMO_MEAN_USE_FCST`
+| :term:`ENSEMBLE_STAT_CLIMO_MEAN_USE_OBS`
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_FILE_NAME`
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_FIELD`
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_REGRID_METHOD`
@@ -248,6 +250,8 @@ METplus Configuration
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_MATCH_MONTH`
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`ENSEMBLE_STAT_CLIMO_STDEV_HOUR_INTERVAL`
+| :term:`ENSEMBLE_STAT_CLIMO_STDEV_USE_FCST`
+| :term:`ENSEMBLE_STAT_CLIMO_STDEV_USE_OBS`
 | :term:`ENSEMBLE_STAT_MASK_GRID`
 | :term:`ENSEMBLE_STAT_CI_ALPHA`
 | :term:`ENSEMBLE_STAT_INTERP_FIELD`
@@ -1064,6 +1068,8 @@ METplus Configuration
 | :term:`GEN_ENS_PROD_CLIMO_MEAN_MATCH_MONTH`
 | :term:`GEN_ENS_PROD_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`GEN_ENS_PROD_CLIMO_MEAN_HOUR_INTERVAL`
+| :term:`GEN_ENS_PROD_CLIMO_MEAN_USE_FCST`
+| :term:`GEN_ENS_PROD_CLIMO_MEAN_USE_OBS`
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_FILE_NAME`
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_FIELD`
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_REGRID_METHOD`
@@ -1074,6 +1080,8 @@ METplus Configuration
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_MATCH_MONTH`
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`GEN_ENS_PROD_CLIMO_STDEV_HOUR_INTERVAL`
+| :term:`GEN_ENS_PROD_CLIMO_STDEV_USE_FCST`
+| :term:`GEN_ENS_PROD_CLIMO_STDEV_USE_OBS`
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_LATLON`
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_MEAN`
 | :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_STDEV`
@@ -2847,6 +2855,8 @@ METplus Configuration
 | :term:`GRID_STAT_CLIMO_MEAN_MATCH_MONTH`
 | :term:`GRID_STAT_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`GRID_STAT_CLIMO_MEAN_HOUR_INTERVAL`
+| :term:`GRID_STAT_CLIMO_MEAN_USE_FCST`
+| :term:`GRID_STAT_CLIMO_MEAN_USE_OBS`
 | :term:`GRID_STAT_CLIMO_STDEV_FILE_NAME`
 | :term:`GRID_STAT_CLIMO_STDEV_FIELD`
 | :term:`GRID_STAT_CLIMO_STDEV_REGRID_METHOD`
@@ -2857,6 +2867,8 @@ METplus Configuration
 | :term:`GRID_STAT_CLIMO_STDEV_MATCH_MONTH`
 | :term:`GRID_STAT_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`GRID_STAT_CLIMO_STDEV_HOUR_INTERVAL`
+| :term:`GRID_STAT_CLIMO_STDEV_USE_FCST`
+| :term:`GRID_STAT_CLIMO_STDEV_USE_OBS`
 | :term:`GRID_STAT_HSS_EC_VALUE`
 | :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_P`
 | :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_MAX_DIST`
@@ -5334,6 +5346,8 @@ Configuration
 | :term:`POINT_STAT_CLIMO_MEAN_MATCH_MONTH`
 | :term:`POINT_STAT_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`POINT_STAT_CLIMO_MEAN_HOUR_INTERVAL`
+| :term:`POINT_STAT_CLIMO_MEAN_USE_FCST`
+| :term:`POINT_STAT_CLIMO_MEAN_USE_OBS`
 | :term:`POINT_STAT_CLIMO_STDEV_FILE_NAME`
 | :term:`POINT_STAT_CLIMO_STDEV_FIELD`
 | :term:`POINT_STAT_CLIMO_STDEV_REGRID_METHOD`
@@ -5344,6 +5358,8 @@ Configuration
 | :term:`POINT_STAT_CLIMO_STDEV_MATCH_MONTH`
 | :term:`POINT_STAT_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`POINT_STAT_CLIMO_STDEV_HOUR_INTERVAL`
+| :term:`POINT_STAT_CLIMO_STDEV_USE_FCST`
+| :term:`POINT_STAT_CLIMO_STDEV_USE_OBS`
 | :term:`POINT_STAT_HSS_EC_VALUE`
 | :term:`POINT_STAT_HIRA_FLAG`
 | :term:`POINT_STAT_HIRA_WIDTH`
@@ -5937,6 +5953,8 @@ METplus Configuration
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_DAY_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_HOUR_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_MEAN_FILE_TYPE`
+| :term:`SERIES_ANALYSIS_CLIMO_MEAN_USE_FCST`
+| :term:`SERIES_ANALYSIS_CLIMO_MEAN_USE_OBS`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_FILE_NAME`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_FIELD`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_REGRID_METHOD`
@@ -5948,6 +5966,8 @@ METplus Configuration
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_DAY_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_HOUR_INTERVAL`
 | :term:`SERIES_ANALYSIS_CLIMO_STDEV_FILE_TYPE`
+| :term:`SERIES_ANALYSIS_CLIMO_STDEV_USE_FCST`
+| :term:`SERIES_ANALYSIS_CLIMO_STDEV_USE_OBS`
 | :term:`SERIES_ANALYSIS_HSS_EC_VALUE`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_FHO`
 | :term:`SERIES_ANALYSIS_OUTPUT_STATS_CTC`

internal_tests/pytests/grid_stat/test_grid_stat_wrapper.py

@@ -423,8 +423,33 @@ def test_handle_climo_file_variables(metplus_config, config_overrides,
                                       '["/some/climo_mean/file.txt"];}'),
           'CLIMO_MEAN_FILE': '"/some/climo_mean/file.txt"'}),
 
+        ({'GRID_STAT_CLIMO_MEAN_FIELD': '{name="UGRD"; level=["P850","P500","P250"];}', },
+         {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {field = [{name="UGRD"; level=["P850","P500","P250"];}];}'}),
+
         ({'GRID_STAT_CLIMO_MEAN_FIELD': '{name="CLM_NAME"; level="(0,0,*,*)";}', },
          {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {field = [{name="CLM_NAME"; level="(0,0,*,*)";}];}'}),
+        # ignore USE_FCST because FIELD is set
+        ({'GRID_STAT_CLIMO_MEAN_FIELD': '{name="CLM_NAME"; level="(0,0,*,*)";}',
+          'GRID_STAT_CLIMO_MEAN_USE_FCST': 'TRUE'},
+         {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {field = [{name="CLM_NAME"; level="(0,0,*,*)";}];}'}),
+        # ignore USE_OBS because FIELD is set
+        ({'GRID_STAT_CLIMO_MEAN_FIELD': '{name="CLM_NAME"; level="(0,0,*,*)";}',
+          'GRID_STAT_CLIMO_MEAN_USE_OBS': 'TRUE'},
+        {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {field = [{name="CLM_NAME"; level="(0,0,*,*)";}];}'}),
+        # use fcst no other climo_mean
+        ({'GRID_STAT_CLIMO_MEAN_USE_FCST': 'TRUE'},
+        {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = fcst;'}),
+        # use obs no other climo_mean
+        ({'GRID_STAT_CLIMO_MEAN_USE_OBS': 'TRUE'},
+         {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = obs;'}),
+        # use fcst with other climo_mean
+        ({'GRID_STAT_CLIMO_MEAN_REGRID_METHOD': 'NEAREST',
+          'GRID_STAT_CLIMO_MEAN_USE_FCST': 'TRUE'},
+         {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {regrid = {method = NEAREST;}}climo_mean = fcst;'}),
+        # use obs with other climo_mean
+        ({'GRID_STAT_CLIMO_MEAN_REGRID_METHOD': 'NEAREST',
+          'GRID_STAT_CLIMO_MEAN_USE_OBS': 'TRUE'},
+         {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {regrid = {method = NEAREST;}}climo_mean = obs;'}),
 
         ({'GRID_STAT_CLIMO_MEAN_REGRID_METHOD': 'NEAREST', },
          {'METPLUS_CLIMO_MEAN_DICT': 'climo_mean = {regrid = {method = NEAREST;}}'}),
@@ -532,6 +557,32 @@ def test_handle_climo_file_variables(metplus_config, config_overrides,
                                       'match_month = TRUE;day_interval = 30;'
                                       'hour_interval = 12;}'),
           'CLIMO_STDEV_FILE': '"/some/climo_stdev/file.txt"'}),
+        # ignore USE_FCST because FIELD is set
+        (
+        {'GRID_STAT_CLIMO_STDEV_FIELD': '{name="CLM_NAME"; level="(0,0,*,*)";}',
+         'GRID_STAT_CLIMO_STDEV_USE_FCST': 'TRUE'},
+        {
+            'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = {field = [{name="CLM_NAME"; level="(0,0,*,*)";}];}'}),
+        # ignore USE_OBS because FIELD is set
+        (
+        {'GRID_STAT_CLIMO_STDEV_FIELD': '{name="CLM_NAME"; level="(0,0,*,*)";}',
+         'GRID_STAT_CLIMO_STDEV_USE_OBS': 'TRUE'},
+        {
+            'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = {field = [{name="CLM_NAME"; level="(0,0,*,*)";}];}'}),
+        # use fcst no other climo_stdev
+        ({'GRID_STAT_CLIMO_STDEV_USE_FCST': 'TRUE'},
+         {'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = fcst;'}),
+        # use obs no other climo_stdev
+        ({'GRID_STAT_CLIMO_STDEV_USE_OBS': 'TRUE'},
+         {'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = obs;'}),
+        # use fcst with other climo_stdev
+        ({'GRID_STAT_CLIMO_STDEV_REGRID_METHOD': 'NEAREST',
+          'GRID_STAT_CLIMO_STDEV_USE_FCST': 'TRUE'},
+         {'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = {regrid = {method = NEAREST;}}climo_stdev = fcst;'}),
+        # use obs with other climo_stdev
+        ({'GRID_STAT_CLIMO_STDEV_REGRID_METHOD': 'NEAREST',
+          'GRID_STAT_CLIMO_STDEV_USE_OBS': 'TRUE'},
+         {'METPLUS_CLIMO_STDEV_DICT': 'climo_stdev = {regrid = {method = NEAREST;}}climo_stdev = obs;'}),
 
         ({'GRID_STAT_GRID_WEIGHT_FLAG': 'COS_LAT', },
          {'METPLUS_GRID_WEIGHT_FLAG': 'grid_weight_flag = COS_LAT;'}),

internal_tests/pytests/ioda2nc/test_ioda2nc_wrapper.py

@@ -39,7 +39,7 @@ def set_minimum_config_settings(config):
          {'METPLUS_MESSAGE_TYPE_MAP': 'message_type_map = [{ key = “AIRCAR”; val = “AIRCAR_PROFILES”; }];'}, ''),
         # 2
         ({'IODA2NC_MESSAGE_TYPE_GROUP_MAP': '{ key = "SURFACE"; val = "ADPSFC,SFCSHP,MSONET";},{ key = "ANYAIR";  val = "AIRCAR,AIRCFT";}', },
-         {'METPLUS_MESSAGE_TYPE_GROUP_MAP': 'message_type_group_map = [{ key = "SURFACE"; val = "ADPSFC, SFCSHP, MSONET";}, { key = "ANYAIR";  val = "AIRCAR, AIRCFT";}];'}, ''),
+         {'METPLUS_MESSAGE_TYPE_GROUP_MAP': 'message_type_group_map = [{ key = "SURFACE"; val = "ADPSFC,SFCSHP,MSONET";}, { key = "ANYAIR";  val = "AIRCAR,AIRCFT";}];'}, ''),
         # 3
         ({'IODA2NC_STATION_ID': 'value1, value2', },
          {'METPLUS_STATION_ID': 'station_id = ["value1", "value2"];'}, ''),

internal_tests/pytests/met_util/test_met_util.py

@@ -11,18 +11,6 @@
 from metplus.util import time_util
 from metplus.util.config_metplus import parse_var_list
 
-@pytest.mark.parametrize(
-    'before, after', [
-        ('string', 'string'),
-        ('"string"', 'string'),
-        ('', ''),
-        ('""', ''),
-        (None, ''),
-    ]
-)
-def test_remove_quotes(before, after):
-    assert(util.remove_quotes(before) == after)
-
 @pytest.mark.parametrize(
     'key, value', [
         ({"gt2.3", "gt5.5"}, True),

internal_tests/pytests/point_stat/test_point_stat_wrapper.py

@@ -442,7 +442,7 @@ def test_met_dictionary_in_var_options(metplus_config):
                                    'shape = SQUARE;'
                                    'prob_cat_thresh = [>1, <=2];}')}),
         ({'POINT_STAT_MESSAGE_TYPE_GROUP_MAP': '{ key = "SURFACE"; val = "ADPSFC,SFCSHP,MSONET";},{ key = "ANYAIR";  val = "AIRCAR,AIRCFT";}', },
-         {'METPLUS_MESSAGE_TYPE_GROUP_MAP': 'message_type_group_map = [{ key = "SURFACE"; val = "ADPSFC, SFCSHP, MSONET";}, { key = "ANYAIR";  val = "AIRCAR, AIRCFT";}];'}),
+         {'METPLUS_MESSAGE_TYPE_GROUP_MAP': 'message_type_group_map = [{ key = "SURFACE"; val = "ADPSFC,SFCSHP,MSONET";}, { key = "ANYAIR";  val = "AIRCAR,AIRCFT";}];'}),
 
     ]
 )