Squashed 'averager/pyAverager/' changes from 1cc306a..018f31f

018f31f Merge pull request NCAR#44 from NCAR/devel
f28eccb Merge pull request NCAR#43 from NCAR/char_bug
6fbc661 Bump verison number
92a2b8c Merge pull request NCAR#42 from NCAR/char_bug
e67cc3a Update to the previous fix:
37afc58 Merge pull request NCAR#41 from NCAR/char_bug
e4b2715 Fix bug with character identification. The code was only checking for 'S1'.  Compressed netcdf4 files identify characters as 'S3'.
e3f121e Merge pull request NCAR#40 from NCAR/devel
28f36ec Merge pull request NCAR#38 from NCAR/devel
3563c85 Merge pull request NCAR#35 from NCAR/devel
0f5eb0b Merge pull request NCAR#34 from NCAR/devel
34747e1 Merge pull request NCAR#29 from NCAR/devel
fa67fce Merge pull request NCAR#26 from NCAR/devel
4ac6f44 Merge pull request NCAR#24 from NCAR/devel
3fc272d Merge pull request NCAR#22 from NCAR/devel
108739b Merge pull request NCAR#20 from NCAR/devel
490ba39 Merge pull request NCAR#18 from NCAR/devel
d34c46e Merge pull request NCAR#15 from NCAR/devel
d2290b6 Merge pull request NCAR#9 from NCAR/devel
2436413 Merge pull request NCAR#6 from NCAR-CISL-ASAP/devel
2125a4f Merge pull request NCAR#4 from NCAR-CISL-ASAP/devel
c51daf1 Merge pull request NCAR#1 from NCAR-CISL-ASAP/devel

git-subtree-dir: averager/pyAverager
git-subtree-split: 018f31ff4013fa0b240470003f27025811aeaf11

README

@@ -1,4 +1,4 @@
-December 13, 2017
+February 14, 2018
 
 ======================================
 
@@ -9,7 +9,7 @@ PyAverager
 A package used for computing averages from climate model output.
 
 Authors:  Sheri Mickelson, Kevin Paul, and John Dennis
-Version:  0.9.14
+Version:  0.9.15
 Copyright:  Contained within LICENSE.txt
 Comments and feedback:  [email protected]
 

pyaverager/__init__.py

@@ -2,5 +2,5 @@
 
 import PyAverager, specification, PreProc
 
-__version__ = "0.9.14"
+__version__ = "0.9.15"
 

pyaverager/climAverager.py

@@ -703,15 +703,15 @@ def time_concat(var,years,hist_dict,ave_info,file_dict,ave_type,simplecomm,all_f
                     timer.start("Recv Average Time")
                     r_rank,results = simplecomm.collect(tag=CONCAT_TAG)
                     r_rank,var_val = simplecomm.collect(tag=CONCAT_VAL_TAG)
-                    if results['dtype'] == 'S1':
+                    if results['dtype'] == 'S1' or results['dtype'] == 'c':
                         var_val = var_val[0]
                     ti = results['index']
                     var_n = results['name']
                     timer.stop("Recv Average Time")
                 else:
                     var_n = var
                     ti = time_index
-                    if var_val.dtype == 'S1':
+                    if var_val.dtype == 'S1' or var_val.dtype == 'c':
                         var_val = var_val[0]
                 timer.start("Write Netcdf Averages")
                 climFileIO.write_averages(all_files_vars, var_val, var_n, index=ti) 

pyaverager/rover.py

@@ -513,7 +513,7 @@ def check_if_series_var(f, vn, unlimited):
     if_char = False
     var = f.variables[vn]
 
-    if (var.typecode() == 'S1'):
+    if (var.typecode() == 'S1' or var.typecode() == 'c'):
         if_series = False
         if_char = True
     elif (vn == unlimited):
@@ -524,7 +524,7 @@ def check_if_series_var(f, vn, unlimited):
     # if it doesn't contain the unlimited dimension (time), not a series var
     elif (unlimited not in var.dimensions):
         if_series = False  
-    elif (var.typecode() == 'S1'):
+    elif (var.typecode() == 'S1' or var.typecode() == 'c'):
         if_series = False
         if_char = True
 

setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name='PyAverager',
-      version='0.9.14',
+      version='0.9.15',
       description='Parallel Python Averager for Climate Data',
       author='Sheri Mickelson',
       author_email='[email protected]',