Merge branch 'sb/overview-copyedit' of https://github.com/StephenBarlow/climate
diff --git a/RCMES/CORDEX/cordex.py b/RCMES/CORDEX/cordex.py
index 4b4a4e8..493cd44 100644
--- a/RCMES/CORDEX/cordex.py
+++ b/RCMES/CORDEX/cordex.py
@@ -10,6 +10,7 @@
user_input = sys.argv[1:]
if len(user_input) == 4:
domain, workdir, obs_dir, models_dir = user_input[:]
+ models_dir = (models_dir+'/*').format(domain=domain)
else:
domain = 'NAM-44'
diff --git a/ocw/data_source/local.py b/ocw/data_source/local.py
index 45a57f9..aa418da 100644
--- a/ocw/data_source/local.py
+++ b/ocw/data_source/local.py
@@ -260,6 +260,7 @@
times = utils.decode_time_values(netcdf, time_name)
times = numpy.array(times)
values = ma.array(netcdf.variables[variable_name][:])
+ values = ma.array(values, mask=numpy.isnan(values))
if not variable_unit:
if hasattr(netcdf.variables[variable_name], 'units'):
variable_unit = netcdf.variables[variable_name].units
@@ -536,7 +537,7 @@
if ifile == 0:
data_values = values0
else:
- data_values = numpy.concatenate((data_values, values0))
+ data_values = ma.concatenate((data_values, values0))
times = numpy.array(times)
variable_unit = dataset0.units if not variable_unit else variable_unit
return Dataset(lats, lons, times, data_values,
