pre-release

davidhassell · davidhassell · commit 0d68338d6083 · 2023-10-11T08:16:34.000+01:00
diff --git a/cf/test/test_regrid_mesh.py b/cf/test/test_regrid_mesh.py
@@ -64,7 +64,6 @@ def _remove_tmpfiles():
 meshloc = {
     "face": esmpy.MeshLoc.ELEMENT,
     "node": esmpy.MeshLoc.NODE,
-    None: None,
 }
 
 
@@ -91,16 +90,14 @@ def esmpy_regrid(coord_sys, method, src, dst, **kwargs):
 
     src_meshloc = None
     dst_meshloc = None
-    src_domain_topology = src.domain_topology(default=None)
-    dst_domain_topology = dst.domain_topology(default=None)
-    if src_domain_topology is not None:
-        src_meshloc = src_domain_topology.get_cell()
 
-    if dst_domain_topology is not None:
-        dst_meshloc = dst_domain_topology.get_cell()
+    domain_topology = src.domain_topology(default=None)
+    if domain_topology is not None:
+        src_meshloc = meshloc[domain_topology.get_cell()]
 
-    src_meshloc = meshloc[src_meshloc]
-    dst_meshloc = meshloc[dst_meshloc]
+    domain_topology = dst.domain_topology(default=None)
+    if domain_topology is not None:
+        dst_meshloc = meshloc[domain_topology.get_cell()]
 
     src_field = esmpy.Field(
         esmpy_regrid.srcfield.grid, meshloc=src_meshloc, name="src"
@@ -292,6 +289,26 @@ def test_Field_regrid_grid_to_mesh(self):
         with self.assertRaises(ValueError):
             src.regrids(dst, method="nearest_dtos")
 
+    @unittest.skipUnless(esmpy_imported, "Requires esmpy/ESMF package.")
+    def test_Field_regrid_mesh_cartesian(self):
+        self.assertFalse(cf.regrid_logging())
+
+        # Cartesian regridding involving meshes is not currently
+        # supported
+        src = self.src_mesh
+        dst = self.dst_mesh
+        with self.assertRaises(ValueError):
+            src.regridc(dst, method="linear")
+
+        dst = self.grid
+        with self.assertRaises(ValueError):
+            src.regridc(dst, method="linear")
+
+        src = self.grid
+        dst = self.dst_mesh
+        with self.assertRaises(ValueError):
+            src.regridc(dst, method="linear")
+
 
 if __name__ == "__main__":
     print("Run date:", datetime.datetime.now())
