Repository: climate Updated Branches: refs/heads/master 94fb8d6bc -> 77463b926
CLIMATE-930 - multiple file loader forces 2D lats and lons Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/032c317b Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/032c317b Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/032c317b Branch: refs/heads/master Commit: 032c317be039565645a5c41e39415166720e1109 Parents: 94fb8d6 Author: Alex <ago...@users.noreply.github.com> Authored: Thu Sep 28 21:59:13 2017 -0700 Committer: Alex <ago...@users.noreply.github.com> Committed: Thu Sep 28 21:59:13 2017 -0700 ---------------------------------------------------------------------- ocw/data_source/local.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/032c317b/ocw/data_source/local.py ---------------------------------------------------------------------- diff --git a/ocw/data_source/local.py b/ocw/data_source/local.py index 896032f..45a57f9 100644 --- a/ocw/data_source/local.py +++ b/ocw/data_source/local.py @@ -518,11 +518,8 @@ def load_dataset_from_multiple_netcdf_files(variable_name, variable_unit=None, dataset0 = load_file(nc_files[0], variable_name, lat_name=lat_name, lon_name=lon_name, time_name=time_name) - if dataset0.lons.ndim == 1 and dataset0.lats.ndim == 1: - lons, lats = numpy.meshgrid(dataset0.lons, dataset0.lats) - elif dataset0.lons.ndim == 2 and dataset0.lats.ndim == 2: - lons = dataset0.lons - lats = dataset0.lats + lons = dataset0.lons + lats = dataset0.lats if mask_file: mask_dataset = load_file(mask_file, mask_variable)
