Merge pull request #555 from xylar/fix-xarray-sizes

Change xarray `dims` --> `sizes`

Author: xylar

conda_package/mpas_tools/mesh/creation/sort_mesh.py

@@ -11,22 +11,22 @@ def sort_mesh(mesh):
     """
     Sort cells, edges and duals in the mesh
     to improve cache-locality
-    
+
     Parameters
     ----------
     mesh : xarray.Dataset
         A dataset containing an MPAS mesh to sort
-        
+
     Returns
     -------
     mesh : xarray.Dataset
         A dataset containing the sorted MPAS mesh
     """
     # Authors: Darren Engwirda
 
-    ncells = mesh.dims["nCells"]
-    nedges = mesh.dims["nEdges"]
-    nduals = mesh.dims["nVertices"]
+    ncells = mesh.sizes["nCells"]
+    nedges = mesh.sizes["nEdges"]
+    nduals = mesh.sizes["nVertices"]
 
     cell_fwd = np.arange(0, ncells) + 1
     cell_rev = np.arange(0, ncells) + 1
@@ -110,8 +110,8 @@ def sort_mesh(mesh):
     mesh["indexToEdgeID"][:] = np.arange(nedges) + 1
 
     return mesh
-    
-    
+
+
 def main():
     parser = argparse.ArgumentParser(
         description=__doc__,
@@ -135,7 +135,7 @@ def main():
               args.sort_file), "graph.info"), "w") as fptr:
         cellsOnCell = mesh["cellsOnCell"].values
 
-        ncells = mesh.dims["nCells"]
+        ncells = mesh.sizes["nCells"]
         nedges = np.count_nonzero(cellsOnCell) // 2
 
         fptr.write(f"{ncells} {nedges}\n")
@@ -152,15 +152,15 @@ def main():
 def _sort_fwd(data, fwd):
     """
     Apply a forward permutation to a mesh array
-    
+
     Parameters
     ----------
     data : array-like
         An MPAS mesh array to permute
-        
+
     fwd : numpy.ndarray
-        An array of integers defining the permutation       
-    
+        An array of integers defining the permutation
+
     Returns
     -------
     data : numpy.ndarray
@@ -174,15 +174,15 @@ def _sort_fwd(data, fwd):
 def _sort_rev(data, rev):
     """
     Apply a reverse permutation to a mesh array
-    
+
     Parameters
     ----------
     data : array-like
         An MPAS mesh array to permute
-        
+
     rev : numpy.ndarray
-        An array of integers defining the permutation       
-    
+        An array of integers defining the permutation
+
     Returns
     -------
     data : numpy.ndarray
@@ -197,17 +197,17 @@ def _sort_rev(data, rev):
 def _cell_del2(mesh):
     """
     Form cell-to-cell sparse adjacency graph
-    
+
     Parameters
     ----------
     mesh : xarray.Dataset
         A dataset containing an MPAS mesh to sort
-        
+
     Returns
     -------
     del2 : scipy.sparse.csr_matrix
         The cell-to-cell adjacency graph as a sparse matrix
-    """    
+    """
     xvec = np.array([], dtype=np.int8)
     ivec = np.array([], dtype=np.int32)
     jvec = np.array([], dtype=np.int32)
@@ -236,6 +236,6 @@ def _cell_del2(mesh):
 
     return csr_matrix((xvec, (ivec, jvec)))
 
-    
+
 if (__name__ == "__main__"):\
     main()

conda_package/mpas_tools/ocean/moc.py

@@ -121,11 +121,11 @@ def _extract_southern_boundary(mesh, mocMask, latBuffer, logger):
     boundary.
     """
 
-    nCells = mesh.dims['nCells']
-    nEdges = mesh.dims['nEdges']
+    nCells = mesh.sizes['nCells']
+    nEdges = mesh.sizes['nEdges']
 
-    nRegions = mocMask.dims['nRegions']
-    assert(mocMask.dims['nCells'] == nCells)
+    nRegions = mocMask.sizes['nRegions']
+    assert(mocMask.sizes['nCells'] == nCells)
 
     # convert to python zero-based indices
     cellsOnEdge = mesh.variables['cellsOnEdge'].values-1
@@ -241,8 +241,8 @@ def _add_transects_to_moc(mesh, mocMask, southernBoundaryEdges,
 
     nTransects = len(southernBoundaryEdges)
 
-    nEdges = mesh.dims['nEdges']
-    nVertices = mesh.dims['nVertices']
+    nEdges = mesh.sizes['nEdges']
+    nVertices = mesh.sizes['nVertices']
 
     maxEdgesInTransect = numpy.amax([len(southernBoundaryEdges[iTransect])
                                      for iTransect in range(nTransects)])