Merge pull request #1100 from xylar/update-mpas-tools

Update to mpas_tools >=1.2.2

Author: xylar

ci/recipe/meta.yaml

@@ -32,7 +32,7 @@ requirements:
     - lxml
     - mache >=1.11.0
     - matplotlib-base >=3.9.0
-    - mpas_tools >=1.1.0,<2.0.0
+    - mpas_tools >=1.2.2,<2.0.0
     - nco >=4.8.1,!=5.2.6
     - netcdf4
     - numpy >=2.0,<3.0

dev-spec.txt

@@ -15,7 +15,7 @@ gsw
 lxml
 mache >=1.11.0
 matplotlib-base>=3.9.0
-mpas_tools >=1.1.0,<2.0.0
+mpas_tools >=1.2.2,<2.0.0
 nco>=4.8.1,!=5.2.6
 netcdf4
 numpy>=2.0,<3.0

mpas_analysis/ocean/climatology_map_bsf.py

@@ -12,7 +12,7 @@
 
 import xarray as xr
 
-from mpas_tools.ocean.barotropic_streamfunction import (
+from mpas_tools.ocean import (
     compute_barotropic_streamfunction,
     shift_barotropic_streamfunction
 )
@@ -216,7 +216,7 @@ def __init__(self, mpas_climatology_task, parent_task,
             variable_list, seasons, comparison_grid_names,
             subtaskName=subtask_name, vertices=True)
 
-        # this reequires a lot of memory so let's reserve all the available
+        # this requires a lot of memory so let's reserve all the available
         # tasks
         parallelTaskCount = self.config.getint('execute', 'parallelTaskCount')
         self.subprocessCount = parallelTaskCount
@@ -316,11 +316,26 @@ def customize_masked_climatology(self, climatology, season):
         config = self.config
 
         ds_mesh = xr.open_dataset(self.restartFileName)
-        ds_mesh = ds_mesh[['cellsOnEdge', 'cellsOnVertex', 'nEdgesOnCell',
-                           'edgesOnCell', 'verticesOnCell', 'verticesOnEdge',
-                           'edgesOnVertex', 'dcEdge', 'dvEdge', 'bottomDepth',
-                           'maxLevelCell', 'latVertex', 'areaTriangle',]]
-        ds_mesh.load()
+        var_list = [
+            'cellsOnEdge',
+            'cellsOnVertex',
+            'nEdgesOnCell',
+            'edgesOnCell',
+            'verticesOnCell',
+            'verticesOnEdge',
+            'edgesOnVertex',
+            'dcEdge',
+            'dvEdge',
+            'bottomDepth',
+            'minLevelCell',
+            'maxLevelCell',
+            'latVertex',
+            'areaTriangle',
+        ]
+        ds_mesh = ds_mesh[var_list].as_numpy()
+
+        masked_filename = self.get_masked_file_name(season)
+        masked_dir = os.path.dirname(masked_filename)
 
         cells_on_vertex = ds_mesh.cellsOnVertex - 1
         lat_vertex = ds_mesh.latVertex
@@ -332,6 +347,7 @@ def customize_masked_climatology(self, climatology, season):
             include_bolus=self.include_bolus,
             include_submesoscale=self.include_submesoscale,
             logger=logger,
+            tmp_dir=masked_dir,
         )
 
         lat_range = config.getexpression(