Use more stable version of connectivity indices

.cirrus.yml

@@ -20,11 +20,11 @@ env:
   SKIP_TEST_TASK: ""
   SKIP_BENCHMARK_TASK: ""
   # Maximum cache period (in weeks) before forcing a new cache upload.
-  CACHE_PERIOD: "2"
+  CACHE_PERIOD: "0"
   # Increment the build number to force new conda cache upload.
-  CONDA_CACHE_BUILD: "1"
+  CONDA_CACHE_BUILD: "0"
   # Increment the build number to force new nox cache upload.
-  NOX_CACHE_BUILD: "2"
+  NOX_CACHE_BUILD: "0"
   # Increment the build number to force new pip cache upload.
   PIP_CACHE_BUILD: "0"
   # Pip package to be installed.
@@ -109,8 +109,6 @@ test_task:
   only_if: ${SKIP_TEST_TASK} == ""
   auto_cancellation: true
   matrix:
-    env:
-      PY_VER: "3.7"
     env:
       PY_VER: "3.8"
       COVERAGE: "true"

esmf_regrid/experimental/unstructured_scheme.py

@@ -121,7 +121,7 @@ def _mesh_to_MeshInfo(mesh):
     assert mesh.topology_dimension == 2
     meshinfo = MeshInfo(
         np.stack([coord.points for coord in mesh.node_coords], axis=-1),
-        mesh.face_node_connectivity.indices,
+        mesh.face_node_connectivity.indices_by_location(),
         mesh.face_node_connectivity.start_index,
     )
     return meshinfo
@@ -578,9 +578,9 @@ def _regrid_rectilinear_to_unstructured__perform(src_cube, regrid_info, mdtol):
     )
 
     face_node = mesh.face_node_connectivity
-    # In face_node_connectivity: `src`= face, `tgt` = node, so you want to
-    # get the length of the `src` dimension.
-    n_faces = face_node.shape[face_node.src_dim]
+    # In face_node_connectivity: `location`= face, `connected` = node, so
+    # you want to get the length of the `location` dimension.
+    n_faces = face_node.shape[face_node.location_axis]
 
     # Apply regrid to all the chunks of src_cube, ensuring first that all
     # chunks cover the entire horizontal plane (otherwise they would break

noxfile.py

@@ -16,13 +16,13 @@
 
 
 #: Default to reusing any pre-existing nox environments.
-nox.options.reuse_existing_virtualenvs = True
+nox.options.reuse_existing_virtualenvs = False
 
 #: Name of the package to test.
 PACKAGE = "esmf_regrid"
 
 #: Cirrus-CI environment variable hook.
-PY_VER = os.environ.get("PY_VER", ["3.7", "3.8"])
+PY_VER = os.environ.get("PY_VER", ["3.8"])
 
 #: Cirrus-CI environment variable hook.
 COVERAGE = os.environ.get("COVERAGE", False)