dev

davidhassell · davidhassell · commit 2ebe7b80c8b6 · 2023-09-26T18:51:01.000+01:00
diff --git a/cf/field.py b/cf/field.py
@@ -3507,7 +3507,7 @@ def weights(
             domain_axes = self.domain_axes(todict=True)
 
             for da_key in domain_axes:
-                if Weights.geometry_area(
+                if Weights.polygon_area(
                     self,
                     da_key,
                     comp,
@@ -3520,7 +3520,7 @@ def weights(
                 ):
                     # Found area weights from polygon geometries
                     pass
-                elif Weights.geometry_line(
+                elif Weights.line_length(
                     self,
                     da_key,
                     comp,
@@ -3690,7 +3690,7 @@ def weights(
                     pass
                 else:
                     # Found area weights from UGRID/geometry cells
-                    Weights.geometry_area(
+                    Weights.polygon_area(
                         self,
                         None,
                         comp,
@@ -3710,7 +3710,7 @@ def weights(
                         f"{axis!r}"
                     )
 
-                if Weights.geometry_area(
+                if Weights.polygon_area(
                     self,
                     da_key,
                     comp,
@@ -3723,7 +3723,7 @@ def weights(
                 ):
                     # Found area weights from polygon geometries
                     pass
-                elif Weights.geometry_line(
+                elif Weights.line_length(
                     self,
                     da_key,
                     comp,
diff --git a/cf/weights.py b/cf/weights.py
@@ -422,7 +422,7 @@ def field_scalar(cls, f, methods=False):
         return f
 
     @classmethod
-    def geometry_area(
+    def polygon_area(
         cls,
         f,
         domain_axis,
@@ -478,7 +478,7 @@ def geometry_area(
 
         from .units import Units
 
-        axis, aux_X, aux_Y, aux_Z = cls.yyy(
+        axis, aux_X, aux_Y, aux_Z = cls._geometry_cells(
             f, domain_axis, "polygon", methods=methods, auto=auto
         )
 
@@ -585,7 +585,7 @@ def geometry_area(
 
         col0 = cols.item(0)
         equal_nodes = (cols == col0).all()
-        if  equal_nodes:
+        if equal_nodes:
             # All polygons have the same number of nodes, so we can
             # use an integer and a slice in place of two integer
             # arrays, which is much faster.
@@ -756,7 +756,7 @@ def geometry_area(
         return True
 
     @classmethod
-    def geometry_line(
+    def line_length(
         cls,
         f,
         domain_axis,
@@ -807,7 +807,7 @@ def geometry_line(
         """
         from .units import Units
 
-        axis, aux_X, aux_Y, aux_Z = cls.yyy(
+        axis, aux_X, aux_Y, aux_Z = cls._geometry_cells(
             f, domain_axis, "line", methods=methods, auto=auto
         )
 
@@ -945,7 +945,7 @@ def geometry_volume(
         """
         from .units import Units
 
-        axis, aux_X, aux_Y, aux_Z = cls.yyy(
+        axis, aux_X, aux_Y, aux_Z = cls._geometry_cells(
             f, "polygon", methods=methods, auto=auto
         )
 
@@ -979,7 +979,7 @@ def geometry_volume(
 
         if not methods:
             # Initialise cell volumes as the cell areas
-            areas = cls.geometry_area(
+            areas = cls.polygon_area(
                 f,
                 weights,
                 weights_axes,
@@ -1431,7 +1431,9 @@ def scale(cls, w, scale):
         return w
 
     @classmethod
-    def yyy(cls, f, domain_axis, geometry_type, methods=False, auto=False):
+    def _geometry_cells(
+        cls, f, domain_axis, geometry_type, methods=False, auto=False
+    ):
         """Checks whether weights can be created for given coordinates.
 
         .. versionadded:: UGRIDVER
@@ -1463,8 +1465,10 @@ def yyy(cls, f, domain_axis, geometry_type, methods=False, auto=False):
 
         for key, aux in auxiliary_coordinates_1d.items():
             aux_axis = f.get_data_axes(key)[0]
-            dt = f.domain_topology(default=None, filter_by_axis=(aux_axis,))
-            if dt is None and aux.get_geometry(None) != geometry_type:
+            topology = f.domain_topology(
+                default=None, filter_by_axis=(aux_axis,)
+            )
+            if topology is None and aux.get_geometry(None) != geometry_type:
                 continue
 
             # Still here? Then this auxiliary coordinate has either UGRID
