@@ -2484,6 +2484,43 @@ def test_sgrid():
24842484 }
24852485
24862486
2487+ def test_sgrid_includes_topology_coordinates ():
2488+ """Variables referenced in node/face/edge/volume_coordinates of the
2489+ grid_topology variable should be pulled in by ds.cf[[var]]."""
2490+ roms = sgrid_roms .copy ()
2491+ for pos in ("psi" , "rho" , "u" , "v" ):
2492+ roms [f"lon_{ pos } " ] = ((f"xi_{ pos } " , f"eta_{ pos } " ), np .zeros ((2 , 2 )))
2493+ roms [f"lat_{ pos } " ] = ((f"xi_{ pos } " , f"eta_{ pos } " ), np .zeros ((2 , 2 )))
2494+
2495+ expected_coord_vars = {
2496+ "lon_psi" ,
2497+ "lat_psi" ,
2498+ "lon_rho" ,
2499+ "lat_rho" ,
2500+ "lon_u" ,
2501+ "lat_u" ,
2502+ "lon_v" ,
2503+ "lat_v" ,
2504+ }
2505+ assoc = roms .cf .get_associated_variable_names ("u" )
2506+ assert expected_coord_vars .issubset (set (assoc ["coordinates" ]))
2507+
2508+ subset = roms .cf [["u" ]]
2509+ assert "grid" in subset .variables
2510+ assert expected_coord_vars .issubset (set (subset .variables ))
2511+
2512+ # only dim-compatible coords attach to the DataArray form
2513+ u_da = roms .cf ["u" ]
2514+ assert {"lon_u" , "lat_u" }.issubset (set (u_da .coords ))
2515+
2516+ delft = sgrid_delft .copy ()
2517+ delft ["node_lon" ] = (("inode" , "jnode" ), np .zeros ((2 , 2 )))
2518+ delft ["node_lat" ] = (("inode" , "jnode" ), np .zeros ((2 , 2 )))
2519+ delft ["foo" ] = (("icell" , "jcell" ), np .ones ((2 , 2 )), {"grid" : "grid" })
2520+ delft_subset = delft .cf [["foo" ]]
2521+ assert {"grid" , "node_lon" , "node_lat" }.issubset (set (delft_subset .variables ))
2522+
2523+
24872524def test_ancillary_variables_extra_dim ():
24882525 ds = xr .Dataset (
24892526 {
0 commit comments