use 1 based indexing for node and element ids in new node masking tests, add back some missing symbols

Author: rokuingh

src/addon/esmpy/src/esmpy/test/test_api/test_mesh.py

@@ -19,6 +19,7 @@
 from esmpy.util.mesh_utilities import *
 from numpy.testing import assert_array_equal
 
+from esmpy.api.constants import FileFormat
 
 @pytest.mark.parametrize(
     "mask_value",
@@ -31,6 +32,7 @@
         [[0, 0, 0, 0], [-1, -1, -1, -1], [1, 1, 1, 1]],
     ),
 )
+
 def test_add_nodes_with_mask(mask_value):
     """Check adding masked nodes to a mesh."""
     if mask_value is None:
@@ -44,7 +46,7 @@ def test_add_nodes_with_mask(mask_value):
 
     mesh.add_nodes(
         len(xy_of_points),
-        np.arange(len(xy_of_points)),
+        np.arange(len(xy_of_points))+1, #PR204 esmpy currently uses 1-based indexing for mesh node ids
         xy_of_points,
         np.zeros(len(xy_of_points), dtype=int),
         node_mask=mask,
@@ -67,7 +69,7 @@ def test_add_nodes_with_mask_bad():
     with pytest.raises(ValueError):
         mesh.add_nodes(
             len(xy_of_points),
-            np.arange(len(xy_of_points)),
+            np.arange(len(xy_of_points))+1, #PR204 esmpy currently uses 1-based indexing for mesh node ids
             xy_of_points,
             np.zeros(len(xy_of_points), dtype=int),
             node_mask=[1, 2, 3],

src/addon/esmpy/src/esmpy/test/test_api/test_regrid.py

@@ -10,6 +10,7 @@
 from esmpy.api.constants import _ESMF_PIO
 from esmpy.api.constants import _ESMF_USE_INMEM_FACTORS
 from esmpy.api.constants import CoordSys
+from esmpy.api.constants import GridItem
 from esmpy.api.constants import LineType
 from esmpy.api.constants import Region
 from esmpy.api.constants import StaggerLoc
@@ -23,6 +24,7 @@
 from esmpy.api.mesh import MeshElemType
 from esmpy.api.mesh import MeshLoc
 from esmpy.api.regrid import Regrid
+from esmpy.api.regrid import RegridFromFile
 from esmpy.api.regrid import RegridMethod
 from esmpy.test.base import TestBase
 from esmpy.util.cache_data import DATA_DIR
@@ -82,18 +84,18 @@ def create_raster_field(x_of_col, y_of_row, node_mask=None):
 
     mesh.add_nodes(
         n_points,
-        id_of_point.flatten(),
+        id_of_point.flatten()+1, #PR204 esmpy currently uses 1-based indexing for mesh node ids
         xy_of_point.flatten(),
         np.zeros(n_points, dtype=int),
         node_mask=node_mask,
     )
 
     mesh.add_elements(
         n_elements,
-        np.arange(n_elements, dtype=int),
+        np.arange(n_elements, dtype=int)+1, #PR204 esmpy currently uses 1-based indexing for mesh element ids
         np.full(n_elements, MeshElemType.QUAD, dtype=int),
         points_at_element,
-        xy_of_element,
+        xy_of_element, #PR204 this is an optional parameter, should use a keyword to specify which desired
     )
 
     return Field(mesh, meshloc=MeshLoc.NODE)