Made changes to add a MET_BIN_DIR to replace /bin throughout - issue #…

…502
dtcenter · Jun 9, 2020 · 2678739 · 2678739
1 parent 8e832fa
commit 2678739
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 45 deletions.
diff --git a/internal_tests/pytests/stat_analysis/test_stat_analysis_wrapper.py b/internal_tests/pytests/stat_analysis/test_stat_analysis_wrapper.py
@@ -125,8 +125,8 @@ def test_get_command():
     st = stat_analysis_wrapper()
     # Test 1
     expected_command = (
-        st.config.getdir('MET_INSTALL_DIR')
-        +'/bin/stat_analysis '
+        st.config.getdir('MET_BIN_DIR')
+        +'/stat_analysis '
         +'-lookin /path/to/lookin_dir '
         +'-config /path/to/STATAnalysisConfig'
         +' '

diff --git a/metplus/util/feature_util.py b/metplus/util/feature_util.py
@@ -63,9 +63,9 @@ def retrieve_and_regrid(tmp_filename, cur_init, cur_storm, out_dir, config):
 
     # Get variables, etc. from param/config file.
     model_data_dir = config.getdir('EXTRACT_TILES_GRID_INPUT_DIR')
-    met_install_dir = config.getdir('MET_INSTALL_DIR')
-    regrid_data_plane_exe = os.path.join(met_install_dir,
-                                         'bin/regrid_data_plane')
+    met_bin_dir = config.getdir('MET_BIN_DIR')
+    regrid_data_plane_exe = os.path.join(met_bin_dir,
+                                         'regrid_data_plane')
 
     overwrite_flag = config.getbool('config', 'EXTRACT_TILES_OVERWRITE_TRACK')
 

diff --git a/metplus/wrappers/ascii2nc_wrapper.py b/metplus/wrappers/ascii2nc_wrapper.py
@@ -30,8 +30,8 @@
 class ASCII2NCWrapper(CommandBuilder):
     def __init__(self, config, logger):
         self.app_name = "ascii2nc"
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/ensemble_stat_wrapper.py b/metplus/wrappers/ensemble_stat_wrapper.py
@@ -31,8 +31,8 @@ class EnsembleStatWrapper(CompareGriddedWrapper):
     """
     def __init__(self, config, logger):
         self.app_name = 'ensemble_stat'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/extract_tiles_wrapper.py b/metplus/wrappers/extract_tiles_wrapper.py
@@ -44,14 +44,14 @@ class ExtractTilesWrapper(CommandBuilder):
     def __init__(self, config, logger):
         self.app_name = 'extract_tiles'
         super().__init__(config, logger)
-        met_install_dir = self.config.getdir('MET_INSTALL_DIR')
+        met_bin_dir = self.config.getdir('MET_BIN_DIR')
         self.tc_pairs_dir = self.config.getdir('EXTRACT_TILES_PAIRS_INPUT_DIR')
         self.overwrite_flag = self.config.getbool('config',
                                               'EXTRACT_TILES_OVERWRITE_TRACK')
         self.addl_filter_opts = \
             self.config.getstr('config', 'EXTRACT_TILES_FILTER_OPTS')
         self.filtered_out_dir = self.config.getdir('EXTRACT_TILES_OUTPUT_DIR')
-        self.tc_stat_exe = os.path.join(met_install_dir, 'bin/tc_stat')
+        self.tc_stat_exe = os.path.join(met_bin_dir, 'tc_stat')
 
     def run_at_time(self, input_dict):
         """!Loops over loop strings and calls run_at_time_loop_string() to process data

diff --git a/metplus/wrappers/gen_vx_mask_wrapper.py b/metplus/wrappers/gen_vx_mask_wrapper.py
@@ -30,8 +30,8 @@ class GenVxMaskWrapper(CommandBuilder):
 
     def __init__(self, config, logger):
         self.app_name = "gen_vx_mask"
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/grid_stat_wrapper.py b/metplus/wrappers/grid_stat_wrapper.py
@@ -29,8 +29,8 @@ class GridStatWrapper(CompareGriddedWrapper):
     '''
     def __init__(self, config, logger):
         self.app_name = 'grid_stat'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/mode_wrapper.py b/metplus/wrappers/mode_wrapper.py
@@ -25,8 +25,8 @@ def __init__(self, config, logger):
         # only set app variables if not already set by MTD (subclass)
         if not hasattr(self, 'app_name'):
             self.app_name = 'mode'
-            self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                         'bin', self.app_name)
+            self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                            self.app_name)
         super().__init__(config, logger)
 
     def add_merge_config_file(self, time_info):

diff --git a/metplus/wrappers/mtd_wrapper.py b/metplus/wrappers/mtd_wrapper.py
@@ -25,8 +25,8 @@ class MTDWrapper(MODEWrapper):
 
     def __init__(self, config, logger):
         self.app_name = 'mtd'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
         self.fcst_file = None
         self.obs_file = None

diff --git a/metplus/wrappers/pb2nc_wrapper.py b/metplus/wrappers/pb2nc_wrapper.py
@@ -28,8 +28,8 @@ class PB2NCWrapper(CommandBuilder):
 
     def __init__(self, config, logger):
         self.app_name = 'pb2nc'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/pcp_combine_wrapper.py b/metplus/wrappers/pcp_combine_wrapper.py
@@ -39,8 +39,8 @@ class PCPCombineWrapper(ReformatGriddedWrapper):
 
     def __init__(self, config, logger):
         self.app_name = 'pcp_combine'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
         self.inaddons = []
         self.method = ""

diff --git a/metplus/wrappers/point2grid_wrapper.py b/metplus/wrappers/point2grid_wrapper.py
@@ -30,8 +30,8 @@ class Point2GridWrapper(CommandBuilder):
 
     def __init__(self, config, logger):
         self.app_name = "point2grid"
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/point_stat_wrapper.py b/metplus/wrappers/point_stat_wrapper.py
@@ -25,8 +25,8 @@ class PointStatWrapper(CompareGriddedWrapper):
 
     def __init__(self, config, logger):
         self.app_name = 'point_stat'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/regrid_data_plane_wrapper.py b/metplus/wrappers/regrid_data_plane_wrapper.py
@@ -30,8 +30,8 @@ class RegridDataPlaneWrapper(ReformatGriddedWrapper):
     '''
     def __init__(self, config, logger):
         self.app_name = 'regrid_data_plane'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                     self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/series_analysis_wrapper.py b/metplus/wrappers/series_analysis_wrapper.py
@@ -29,8 +29,8 @@
 class SeriesAnalysisWrapper(CompareGriddedWrapper):
     def __init__(self, config, logger):
         self.app_name = "series_analysis"
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
 
     def create_c_dict(self):

diff --git a/metplus/wrappers/series_by_init_wrapper.py b/metplus/wrappers/series_by_init_wrapper.py
@@ -32,8 +32,8 @@ class SeriesByInitWrapper(CommandBuilder):
     """
 
     def __init__(self, config, logger):
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin/series_analysis')
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                     'series_analysis')
         self.app_name = os.path.basename(self.app_path)
         super().__init__(config, logger)
         # Retrieve any necessary values (dirs, executables)
@@ -668,8 +668,8 @@ def generate_plots(self, sorted_filter_init, tile_dir):
            Returns:
         """
         background_map = self.config.getbool('config', 'SERIES_ANALYSIS_BACKGROUND_MAP')
-        plot_data_plane_exe = os.path.join(self.config.getdir('MET_INSTALL_DIR'),
-                                           'bin/plot_data_plane')
+        plot_data_plane_exe = os.path.join(self.config.getdir('MET_BIN_DIR'),
+                                           'plot_data_plane')
 
         full_vars_list = feature_util.retrieve_var_name_levels(self.config)
         for cur_var in full_vars_list:

diff --git a/metplus/wrappers/series_by_lead_wrapper.py b/metplus/wrappers/series_by_lead_wrapper.py
@@ -45,8 +45,8 @@ def __init__(self, config, logger):
         self.fhr_group_labels = []
         self.stat_list = util.getlist(self.config.getstr('config', 'SERIES_ANALYSIS_STAT_LIST'))
         self.plot_data_plane_exe = os.path.join(
-            self.config.getdir('MET_INSTALL_DIR'),
-            'bin/plot_data_plane')
+            self.config.getdir('MET_BIN_DIR'),
+            'plot_data_plane')
 
         self.convert_exe = self.config.getexe('CONVERT')
         self.ncap2_exe = self.config.getexe('NCAP2')
@@ -55,9 +55,9 @@ def __init__(self, config, logger):
         if not self.convert_exe or not self.ncap2_exe or not self.ncdump_exe or not self.rm_exe:
             self.isOK = False
 
-        met_install_dir = self.config.getdir('MET_INSTALL_DIR')
-        self.series_analysis_exe = os.path.join(met_install_dir,
-                                                'bin/series_analysis')
+        met_bin_dir = self.config.getdir('MET_BIN_DIR')
+        self.series_analysis_exe = os.path.join(met_bin_dir,
+                                                'series_analysis')
         self.input_dir = self.config.getdir('SERIES_ANALYSIS_INPUT_DIR')
         self.series_lead_filtered_out_dir = \
             self.config.getdir('SERIES_ANALYSIS_FILTERED_OUTPUT_DIR')

diff --git a/metplus/wrappers/stat_analysis_wrapper.py b/metplus/wrappers/stat_analysis_wrapper.py
@@ -31,8 +31,8 @@ class StatAnalysisWrapper(CommandBuilder):
          ensemble_stat, and wavelet_stat
     """
     def __init__(self, config, logger):
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin/stat_analysis')
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                     'stat_analysis')
         self.app_name = os.path.basename(self.app_path)
         super().__init__(config, logger)
 

diff --git a/metplus/wrappers/tc_pairs_wrapper.py b/metplus/wrappers/tc_pairs_wrapper.py
@@ -45,8 +45,8 @@ class TCPairsWrapper(CommandBuilder):
 
     def __init__(self, config, logger):
         self.app_name = 'tc_pairs'
-        self.app_path = os.path.join(config.getdir('MET_INSTALL_DIR'),
-                                     'bin', self.app_name)
+        self.app_path = os.path.join(config.getdir('MET_BIN_DIR'),
+                                        self.app_name)
         super().__init__(config, logger)
         self.adeck = []
         self.bdeck = []

diff --git a/metplus/wrappers/tc_stat_wrapper.py b/metplus/wrappers/tc_stat_wrapper.py
@@ -81,7 +81,7 @@ def create_c_dict(self):
                 'directory not found in config file. Exiting.')
             sys.exit(1)
         c_dict['APP_PATH'] = os.path.join(
-            self.config.getdir('MET_INSTALL_DIR'), 'bin/tc_stat')
+            self.config.getdir('MET_BIN_DIR'), 'tc_stat')
 
         c_dict['APP_NAME'] = os.path.basename(c_dict['APP_PATH'])