From 239d446490969a5ffd0e580cb438f27917316ffc Mon Sep 17 00:00:00 2001
From: Alice Bertini <aliceb@ucar.edu>
Date: Wed, 24 Apr 2019 19:06:01 -0600
Subject: [PATCH] add check for trailing "/" in XML variables
 ATMDIAG_test_path_history_subdir and ATMDIAG_cntl_path_history_subdir which
 causes problem when globbing single variable timeseries files for the
 averager

---
 diag_utils/diag_utils/diagUtilsLib.py            | 5 +++--
 diagnostics/diagnostics/atm/atm_avg_generator.py | 6 ++++++
 diagnostics/requirements.txt                     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/diag_utils/diag_utils/diagUtilsLib.py b/diag_utils/diag_utils/diagUtilsLib.py
index 0525b914..7178bebf 100755
--- a/diag_utils/diag_utils/diagUtilsLib.py
+++ b/diag_utils/diag_utils/diagUtilsLib.py
@@ -200,11 +200,12 @@ def checkHistoryFiles(tseries, dout_s_root, case, rstart_year, rstop_year, comp,
     """
     if tseries.upper() in ['T','TRUE'] :
         htype = 'series'
-##        in_dir = '{0}/{1}/proc/tseries/month_1'.format(dout_s_root, comp)
     else :
         htype = 'slice'
-##        in_dir = '{0}/{1}/hist'.format(dout_s_root, comp)
 
+    # make sure subdir does not include a trailing "/"
+    if subdir.endswith('/'):
+        subdir = subdir[:-1]
     in_dir = '{0}/{1}/{2}'.format(dout_s_root, comp, subdir)
 
     # check the in_dir directory exists 
diff --git a/diagnostics/diagnostics/atm/atm_avg_generator.py b/diagnostics/diagnostics/atm/atm_avg_generator.py
index bb601e74..c15ee9ba 100644
--- a/diagnostics/diagnostics/atm/atm_avg_generator.py
+++ b/diagnostics/diagnostics/atm/atm_avg_generator.py
@@ -417,6 +417,12 @@ def initialize_envDict(envDict, caseroot, debugMsg, standalone):
     if envDict['plot_SON_climo']:
         envDict['seas'].append('SON')
 
+    if envDict['test_path_history_subdir'].endswith('/'):
+        envDict['test_path_history_subdir'] = envDict['test_path_history_subdir'][:-1]
+
+    if envDict['cntl_path_history_subdir'].endswith('/'):
+        envDict['cntl_path_history_subdir'] = envDict['cntl_path_history_subdir'][:-1]
+
     return envDict
 
 #======
diff --git a/diagnostics/requirements.txt b/diagnostics/requirements.txt
index f9b052a3..f58e174b 100644
--- a/diagnostics/requirements.txt
+++ b/diagnostics/requirements.txt
@@ -1,3 +1,3 @@
-jinja2==2.7.3
+jinja2>=2.10
 numpy>=1.8.1
 ilamb>=2.1