update UGRID test to match cfdm

Author: davidhassell

cf/test/test_UGRID.py

@@ -295,6 +295,18 @@ def test_read_write_UGRID_domain(self):
             ugrid = cf.read(self.filename3, domain=True)
             face, edge, point = (2, 1, 0)
 
+            # Get the new face, edge, point order indices for the
+            # domains read from disk (don't hard-wire these, as
+            # implementation choices in netcdfread.py might change the
+            # order :))
+            for i, u in enumerate(ugrid):
+                if u.domain_topology().get_cell() == "point":
+                    point = i
+                elif u.domain_topology().get_cell() == "edge":
+                    edge = i
+                elif u.domain_topology().get_cell() == "face":
+                    face = i
+
 
 if __name__ == "__main__":
     print("Run date:", datetime.datetime.now())

cf/test/test_collapse.py

@@ -824,7 +824,7 @@ def test_Field_collapse_ugrid(self):
 
         # Check the collpsed fields writes
         cf.write(f, tmpfile)
-        
+
     def test_Field_collapse_HEALPix(self):
         """Test HEALPix collapses."""
         f0 = cf.example_field(12)