Merge 064a465 into 0f7282c

.gitignore

@@ -158,3 +158,6 @@ docs/notebook-examples.txt
 benchmarks/env
 benchmarks/results
 benchmarks/html
+meshfiles
+scratch.py
+docs

benchmarks/mpas_ocean.py

@@ -36,8 +36,6 @@ class DatasetBenchmark:
 
 
     def setup(self, resolution, *args, **kwargs):
-
-
         self.uxds = ux.open_dataset(file_path_dict[resolution][0], file_path_dict[resolution][1])
 
     def teardown(self, resolution, *args, **kwargs):
@@ -50,7 +48,6 @@ class GridBenchmark:
     params = [['480km', '120km'], ]
 
     def setup(self, resolution, *args, **kwargs):
-
         self.uxgrid = ux.open_grid(file_path_dict[resolution][0])
 
     def teardown(self, resolution, *args, **kwargs):
@@ -144,6 +141,27 @@ class HoleEdgeIndices(DatasetBenchmark):
     def time_construct_hole_edge_indices(self, resolution):
         ux.grid.geometry._construct_hole_edge_indices(self.uxds.uxgrid.edge_face_connectivity)
 
+class ZonalMean(DatasetBenchmark):
+
+    def setup(self, resolution, *args, **kwargs):
+        self.uxds = ux.open_dataset(file_path_dict[resolution][0], file_path_dict[resolution][1])
+        self.uxds.uxgrid.normalize_cartesian_coordinates()
+    def time_zonal_mean(self, resolution):
+        self.uxds['bottomDepth'].zonal_mean()
+
+class ZonalMeanExcludingBounds(DatasetBenchmark):
+
+    param_names = DatasetBenchmark.param_names + ['lat_step_size']
+    params = DatasetBenchmark.params + [[5, 10, 20, 40]]
+
+    def setup(self, resolution, *args, **kwargs):
+        self.uxds = ux.open_dataset(file_path_dict[resolution][0], file_path_dict[resolution][1])
+        self.uxds.uxgrid.normalize_cartesian_coordinates()
+        self.uxds.uxgrid.bounds
+
+    def time_zonal_mean(self, resolution, lat_step_size):
+        self.uxds['bottomDepth'].zonal_mean(lat_deg=(-90, 90, lat_step_size))
+
 class CheckNorm:
     param_names = ['resolution']
     params = ['480km', '120km']

docs/internal_api/index.rst

@@ -225,6 +225,15 @@ Integration
    grid.integrate._get_faces_constLat_intersection_info
 
 
+Zonal Mean
+----------
+.. autosummary::
+   :toctree: generated/
+
+   core.zonal._get_candidate_faces_at_constant_latitude
+   core.zonal._non_conservative_zonal_mean_constant_one_latitude
+   core.zonal._non_conservative_zonal_mean_constant_latitudes
+
 Remapping
 =========