resolve xarray dims->sizes

Author: wx4stg

pyxlma/lmalib/grid.py

@@ -132,7 +132,7 @@ def assign_regular_bins(dsg, ds, var_to_grid_map, pixel_id_var='pixel_id',
             var_dim = ds[var_name].dims[0]
         else:
             assert var_dim == ds[var_name].dims[0]
-        if ds.dims[var_dim] < 1:
+        if ds.sizes[var_dim] < 1:
             # No data on the dim, set in_range to nothing and stop checking other vars
             in_range = []
             have_data = False

pyxlma/lmalib/io/read.py

@@ -113,7 +113,7 @@ def dataset(filenames, sort_time=True):
             ds = to_dataset(lma_file, event_id_start=next_event_id).set_index(
                 {'number_of_stations':'station_code', 'number_of_events':'event_id'})
             lma_data.append(ds)
-            next_event_id += ds.dims['number_of_events']
+            next_event_id += ds.sizes['number_of_events']
         except:
             raise
     ds = combine_datasets(lma_data)

pyxlma/lmalib/traversal.py

@@ -77,7 +77,7 @@ def __init__(self, dataset, entity_id_vars, parent_id_vars):
         self.child_to_parent = collections.OrderedDict()
         self.parent_to_child = collections.OrderedDict()
         for (entity_var, parent_var) in self._descend():
-            if dataset.dims[dataset[entity_var].dims[0]] == 0:
+            if dataset.sizes[dataset[entity_var].dims[0]] == 0:
                 # No data, so groupby will fail in xarray > 0.13
                 entity_grouper = None
             else:
@@ -86,7 +86,7 @@ def __init__(self, dataset, entity_id_vars, parent_id_vars):
             if parent_var is None:
                 parent_grouper = None
             else:
-                if dataset.dims[dataset[parent_var].dims[0]] == 0:
+                if dataset.sizes[dataset[parent_var].dims[0]] == 0:
                     # No data, so groupby will fail in xarray > 0.13
                     parent_grouper = None
                 else:

tests/test_coords.py

@@ -20,7 +20,6 @@ def test_geographic():
     geosys = GeographicSystem()
     ecef_coords = geosys.toECEF(test_lons, test_lats, test_alts)
     lons, lats, alts = geosys.fromECEF(*ecef_coords)
-
     assert np.allclose(ecef_coords[0], test_ecef_X)
     assert np.allclose(ecef_coords[1], test_ecef_Y)
     assert np.allclose(ecef_coords[2], test_ecef_Z)
@@ -32,7 +31,6 @@ def test_geographic_one_point():
     geosys = GeographicSystem()
     ecef_coords = geosys.toECEF(np.atleast_1d(test_lons[-1]), np.atleast_1d(test_lats[-1]), np.atleast_1d(test_alts[-1]))
     lons, lats, alts = geosys.fromECEF(*ecef_coords)
-
     assert np.allclose(ecef_coords[0], test_ecef_X[-1])
     assert np.allclose(ecef_coords[1], test_ecef_Y[-1])
     assert np.allclose(ecef_coords[2], test_ecef_Z[-1])