Merge branch 'feature_cartopy_s4' into develop

Refs: #78
NOAA-EMC · Oct 26, 2021 · b4795e4 · b4795e4
2 parents e3b5363 + 2e2ce29
commit b4795e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 = []