From 21a9f8c0a51598f15310ede6e99153d5cfec9840 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:54:46 -0600
Subject: [PATCH] per #1713, remove setting of METPLOTPY_BASE env var in each
 use case config file and instead set it in the global config settings for the
 automated test environment, ci-run-all-cases

---
 .github/parm/test_settings.conf                                | 3 +++
 .../s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf     | 2 --
 .../s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf           | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/parm/test_settings.conf b/.github/parm/test_settings.conf
index 05e7a5d005..01cbc7f58d 100644
--- a/.github/parm/test_settings.conf
+++ b/.github/parm/test_settings.conf
@@ -14,3 +14,6 @@ GEMPAKTOCF_JAR = /data/input/GempakToCF.jar
 
 # also set location of GFDL Tracker executables
 GFDL_TRACKER_EXEC = /usr/local/bin
+
+[user_env_vars]
+METPLOTPY_BASE = {METPLUS_BASE}/../METplotpy
\ No newline at end of file
diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf b/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf
index 44a433f6c5..92f9ba76eb 100644
--- a/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf
+++ b/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf
@@ -22,8 +22,6 @@ LOG_LEVEL = "INFO"
 
 INPUT_FILE_NAMES = {INPUT_BASE}/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot/SpaceTimeSpectra_ERAI_P_D200_symm_2spd.nc,{INPUT_BASE}/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot/SpaceTimeSpectra_ERAI_TRMM_P_symm_2spd.nc,{INPUT_BASE}/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot/SpaceTimeSpectra_ERAI_P_D850_symm_2spd.nc
 
-METPLOTPY_BASE = {METPLUS_BASE}/METplotpy
-
 YAML_CONFIG_NAME = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot/spectra_plot.yaml
 
 OUTPUT_DIR = {OUTPUT_BASE}/plots/
diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf b/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf
index c729d81d6d..8130eb37d9 100644
--- a/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf
+++ b/parm/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf
@@ -22,5 +22,4 @@ LOG_LEVEL = "INFO"
 INPUT_FILE_NAME = {INPUT_BASE}/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller/precip.erai.sfc.1p0.2x.2014-2016.nc
 YAML_CONFIG_NAME = {PARM_BASE}/use_cases/model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller/hovmoeller.yaml
 
-METPLOTPY_BASE = {METPLUS_BASE}/../METplotpy
 OUTPUT_DIR = {OUTPUT_BASE}/plots