remove LOOP_ORDER from MakePlots wrapper and tests

dtcenter · Sep 30, 2022 · a44c866 · a44c866
1 parent c325ed9
commit a44c866
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/internal/tests/pytests/plotting/make_plots/test_make_plots.conf b/internal/tests/pytests/plotting/make_plots/test_make_plots.conf
@@ -5,8 +5,6 @@ STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/plotting/stat_analysis
 MAKE_PLOTS_SCRIPTS_DIR = {METPLUS_BASE}/ush/plotting_scripts
 MAKE_PLOTS_INPUT_DIR = {STAT_ANALYSIS_OUTPUT_DIR}
 MAKE_PLOTS_OUTPUT_DIR = {OUTPUT_BASE}/plotting/make_plots
-# Location of configuration files used by MET applications
-CONFIG_DIR = {PARM_BASE}/use_cases/plotting/met_config
 
 [config]
 # LOOP_METHOD must be set to processes for plotting
@@ -66,7 +64,7 @@ FCST_VAR1_LEVELS = P1000, P850
 OBS_VAR1_NAME = HGT
 OBS_VAR1_LEVELS = P1000, P850
 
-STAT_ANALYSIS_CONFIG_FILE = {CONFIG_DIR}/STATAnalysisConfig
+STAT_ANALYSIS_CONFIG_FILE = {PARM_BASE}/met_config/STATAnalysisConfig_wrapped
 
 # REQUIRED LISTS
 MODEL_LIST = {MODEL1}, {MODEL2}

diff --git a/internal/tests/pytests/plotting/make_plots/test_make_plots_wrapper.py b/internal/tests/pytests/plotting/make_plots/test_make_plots_wrapper.py
@@ -47,7 +47,7 @@ def test_create_c_dict(metplus_config):
     mp = make_plots_wrapper(metplus_config)
     # Test 1
     c_dict = mp.create_c_dict()
-    assert(c_dict['LOOP_ORDER'] == 'processes')
+
     # NOTE: MakePlots relies on output from StatAnalysis
     #       so its input resides in the output of StatAnalysis
     assert(c_dict['INPUT_BASE_DIR'] == mp.config.getdir('OUTPUT_BASE')

diff --git a/metplus/wrappers/make_plots_wrapper.py b/metplus/wrappers/make_plots_wrapper.py
@@ -105,7 +105,6 @@ def create_c_dict(self):
             self.config.getstr('config', 'LOG_MAKE_PLOTS_VERBOSITY',
                                c_dict['VERBOSITY'])
         )
-        c_dict['LOOP_ORDER'] = self.config.getstr('config', 'LOOP_ORDER')
         c_dict['INPUT_BASE_DIR'] = self.config.getdir('MAKE_PLOTS_INPUT_DIR')
         c_dict['OUTPUT_BASE_DIR'] = self.config.getdir('MAKE_PLOTS_OUTPUT_DIR')
         c_dict['SCRIPTS_BASE_DIR'] = self.config.getdir('MAKE_PLOTS_SCRIPTS_DIR')