feature 1431 remove obs_prepbufr_map (#1433)

dtcenter · Feb 10, 2022 · ccb8768 · ccb8768
1 parent 09523c3
commit ccb8768
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 26 deletions.
diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
@@ -8593,11 +8593,6 @@ METplus Configuration Glossary
 
      | *Used by:* PB2NC
 
-   PB2NC_OBS_PREPBUFR_MAP
-     Specify the value for 'obs_prepbufr_map' in the MET configuration file for PB2NC.
-
-     | *Used by:* PB2NC
-
    POINT_STAT_HIRA_FLAG
      Specify the value for 'hira.flag' in the MET configuration file for PointStat.
 

diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
@@ -4898,7 +4898,6 @@ METplus Configuration
 | :term:`PB2NC_LEVEL_CATEGORY`
 | :term:`PB2NC_QUALITY_MARK_THRESH`
 | :term:`PB2NC_OBS_BUFR_MAP`
-| :term:`PB2NC_OBS_PREPBUFR_MAP`
 
 .. warning:: **DEPRECATED:**
 
@@ -5098,17 +5097,6 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`PB2NC_OBS_BUFR_MAP`
      - obs_bufr_map
 
-**${METPLUS_OBS_PREPBUFR_MAP}**
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 0
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`PB2NC_OBS_PREPBUFR_MAP`
-     - obs_prepbufr_map
-
 .. _pcp_combine_wrapper:
 
 PCPCombine

diff --git a/internal_tests/pytests/pb2nc/test_pb2nc_wrapper.py b/internal_tests/pytests/pb2nc/test_pb2nc_wrapper.py
@@ -281,8 +281,6 @@ def test_find_input_files(metplus_config, offsets, offset_to_find):
                                            'vld_thresh = 0.1;}')}),
         ({'PB2NC_OBS_BUFR_MAP': '{key="POB"; val="PRES"; },{key="QOB"; val="SPFH";}', },
          {'METPLUS_OBS_BUFR_MAP': 'obs_bufr_map = [{key="POB"; val="PRES"; }, {key="QOB"; val="SPFH";}];'}),
-        ({'PB2NC_OBS_PREPBUFR_MAP': '{key="POB"; val="PRES"; },{key="QOB"; val="SPFH";}', },
-         {'METPLUS_OBS_PREPBUFR_MAP': 'obs_prepbufr_map = [{key="POB"; val="PRES"; }, {key="QOB"; val="SPFH";}];'}),
 
     ]
 )

diff --git a/metplus/wrappers/pb2nc_wrapper.py b/metplus/wrappers/pb2nc_wrapper.py
@@ -36,7 +36,6 @@ class PB2NCWrapper(CommandBuilder):
         'METPLUS_LEVEL_CATEGORY',
         'METPLUS_QUALITY_MARK_THRESH',
         'METPLUS_OBS_BUFR_MAP',
-        'METPLUS_OBS_PREPBUFR_MAP',
     ]
 
     def __init__(self, config, instance=None):
@@ -191,10 +190,6 @@ def create_c_dict(self):
                             data_type='list',
                             extra_args={'remove_quotes': True})
 
-        self.add_met_config(name='obs_prepbufr_map',
-                            data_type='list',
-                            extra_args={'remove_quotes': True})
-
         return c_dict
 
     def set_environment_variables(self, time_info):

diff --git a/parm/met_config/PB2NCConfig_wrapped b/parm/met_config/PB2NCConfig_wrapped
@@ -100,7 +100,6 @@ ${METPLUS_OBS_BUFR_MAP}
 // This map is for PREPBUFR. It will be added into obs_bufr_map.
 // Please do not override this map.
 //obs_prepbufr_map =
-${METPLUS_OBS_PREPBUFR_MAP}
 
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/parm/use_cases/met_tool_wrapper/PB2NC/PB2NC.conf b/parm/use_cases/met_tool_wrapper/PB2NC/PB2NC.conf
@@ -60,4 +60,3 @@ PB2NC_TIME_SUMMARY_VALID_FREQ = 0
 PB2NC_TIME_SUMMARY_VALID_THRESH = 0.0
 
 #PB2NC_OBS_BUFR_MAP =
-#PB2NC_OBS_PREPBUFR_MAP =
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,3 @@ PB2NC_TIME_SUMMARY_VALID_FREQ = 0
		PB2NC_TIME_SUMMARY_VALID_THRESH = 0.0

		#PB2NC_OBS_BUFR_MAP =
		#PB2NC_OBS_PREPBUFR_MAP =