Merge pull request #286 from Deltares/285-improve-performance-of-_get…

…_topology-by-not-accessing-dataarray-each-time

prevent accessing each var again when looping over dataset vars

xugrid/core/dataarray_accessor.py

@@ -422,7 +422,7 @@ def to_geodataframe(
         else:
             ds = self.obj.to_dataset()
 
-        variables = [var for var in ds.data_vars if dim in ds[var].dims]
+        variables = [var for var in ds.data_vars if dim in ds.variables[var].dims]
         # TODO deal with time-dependent data, etc.
         # Basically requires checking which variables are static, which aren't.
         # For non-static, requires repeating all geometries.

xugrid/core/dataset_accessor.py

@@ -546,7 +546,7 @@ def to_geodataframe(self, dim_order=None) -> "geopandas.GeoDataFrame":  # type:
             else:
                 raise ValueError("invalid topology dimension on grid")
 
-            variables = [var for var in ds.data_vars if dim in ds[var].dims]
+            variables = [var for var in ds.data_vars if dim in ds.variables[var].dims]
             if variables:
                 data = ds[variables].to_dataframe(dim_order=dim_order)
             else:

xugrid/ugrid/conventions.py

@@ -181,7 +181,11 @@ def default_topology_attrs(name: str, topology_dimension: int):
 
 
 def _get_topology(ds: xr.Dataset) -> List[str]:
-    return [k for k in ds.data_vars if ds[k].attrs.get("cf_role") == "mesh_topology"]
+    return [
+        var
+        for var in ds.data_vars
+        if ds.variables[var].attrs.get("cf_role") == "mesh_topology"
+    ]
 
 
 def _infer_xy_coords(

xugrid/ugrid/partitioning.py

@@ -202,7 +202,7 @@ def validate_partition_objects(
         unique_vars = set(chain(*allvars))
         # Check dimensions
         dims_per_var = [
-            {ds[var].dims for ds in data_objects if var in ds.data_vars}
+            {ds.variables[var].dims for ds in data_objects if var in ds.data_vars}
             for var in unique_vars
         ]
         for var, vardims in zip(unique_vars, dims_per_var):