From 01502b356d9de7ac9048ed76e135e1a00e6fa63c Mon Sep 17 00:00:00 2001
From: Mallory Row <mallory.row@noaa.gov>
Date: Mon, 25 Oct 2021 17:44:00 +0000
Subject: [PATCH] Add S4 to create Cartopy plots

Refs: #78
---
 scripts/exmaps2d.sh                                | 2 +-
 ush/create_METplus_job_scripts.py                  | 2 +-
 ush/plotting_scripts/plot_maps2d_lat_lon_errors.py | 6 ++++--
 ush/plotting_scripts/plot_mapsda_lat_lon_errors.py | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/exmaps2d.sh b/scripts/exmaps2d.sh
index 02b6f1f..d84f2b2 100755
--- a/scripts/exmaps2d.sh
+++ b/scripts/exmaps2d.sh
@@ -97,7 +97,7 @@ else
 fi
 
 # Run special calculated variables for model2obs
-if [ $machine != "ORION" -a $machine != "S4" -a $machine != "JET" ]; then
+if [ $machine != "ORION" -a $machine != "JET" ]; then
     python $USHverif_global/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
 fi
 
diff --git a/ush/create_METplus_job_scripts.py b/ush/create_METplus_job_scripts.py
index 0dc5dc3..c7b05fe 100644
--- a/ush/create_METplus_job_scripts.py
+++ b/ush/create_METplus_job_scripts.py
@@ -1769,7 +1769,7 @@ def create_job_scripts_maps(start_date_dt, end_date_dt, case, case_abbrev,
                                                         +'job'+str(njob)+'_'
                                                         +model+'.sh')+'\n')
                         job_file.write('\n')
-                    if os.environ['machine'] in ['ORION', 'S4', 'JET']:
+                    if os.environ['machine'] in ['ORION', 'JET']:
                         job_file.write('echo "WARNING: Cartopy not installed '
                                        +'on '+os.environ['machine'].title()
                                        +', cannot create plots."\n')
diff --git a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
index 08eebb5..fc54ba4 100644
--- a/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
+++ b/ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
@@ -284,10 +284,12 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
 # Set up location of Natural Earth files
 if machine == 'HERA':
     config['data_dir']='/home/Mallory.Row/.local/share/cartopy'
-if machine == 'WCOSS_C':
+elif machine == 'WCOSS_C':
     config['data_dir']='/u/emc.verif/.local/share/cartopy'
-if machine == 'WCOSS_DELL_P3':
+elif machine == 'WCOSS_DELL_P3':
     config['data_dir']='/u/emc.verif/.local/share/cartopy'
+elif machine == 'S4':
+    config['data_dir']='/home/dhuber/.local/share/cartopy'
 
 # Set up information
 env_var_model_list = []
diff --git a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
index 30b33a6..8883863 100644
--- a/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
+++ b/ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
@@ -330,10 +330,12 @@ def plot_subplot_data(ax_tmp, map_ax_tmp, plot_data, plot_data_lat,
 # Set up location of Natural Earth files
 if machine == 'HERA':
     config['data_dir']='/home/Mallory.Row/.local/share/cartopy'
-if machine == 'WCOSS_C':
+elif machine == 'WCOSS_C':
     config['data_dir']='/u/emc.verif/.local/share/cartopy'
-if machine == 'WCOSS_DELL_P3':
+elif machine == 'WCOSS_DELL_P3':
     config['data_dir']='/u/emc.verif/.local/share/cartopy'
+elif machine == 'S4':
+    config['data_dir']='/home/dhuber/.local/share/cartopy'
 
 # Set up information
 env_var_model_list = []