Merge pull request #53 from fmalatino/fix/computegridoption

Changes to test configurations options and externals for parsing

ndsl/stencils/corners.py

@@ -989,7 +989,6 @@ def fill_corners_dgrid_defn(
     x_out: FloatField,
     y_in: FloatField,
     y_out: FloatField,
-    mysign: float,
 ):
     """
     Args:
@@ -998,7 +997,7 @@ def fill_corners_dgrid_defn(
         y_in (in):
         y_out (inout):
     """
-    from __externals__ import i_end, i_start, j_end, j_start
+    from __externals__ import i_end, i_start, j_end, j_start, mysign
 
     with computation(PARALLEL), interval(...):
         # sw corner

ndsl/stencils/testing/conftest.py

@@ -79,8 +79,8 @@ def pytest_addoption(parser):
     parser.addoption(
         "--topology",
         action="store",
-        default="cube-sphere",
-        help='Topology of the grid. "cube-sphere" means a 6-faced grid, "doubly-periodic" means a 1 tile grid. Default to "cube-sphere".',
+        default="cubed-sphere",
+        help='Topology of the grid. "cubed-sphere" means a 6-faced grid, "doubly-periodic" means a 1 tile grid. Default to "cubed-sphere".',
     )
 
 
@@ -189,7 +189,7 @@ def get_ranks(metafunc, layout):
     if only_rank is None:
         if topology == "doubly-periodic":
             total_ranks = layout[0] * layout[1]
-        elif topology == "cube-sphere":
+        elif topology == "cubed-sphere":
             total_ranks = 6 * layout[0] * layout[1]
         else:
             raise NotImplementedError(f"Topology {topology} is unknown.")
@@ -370,7 +370,7 @@ def generate_parallel_stencil_tests(metafunc, *, backend: str):
 
 
 def get_communicator(comm, layout, topology_mode):
-    if (MPI.COMM_WORLD.Get_size() > 1) and (topology_mode == "doubly-periodic"):
+    if (MPI.COMM_WORLD.Get_size() > 1) and (topology_mode == "cubed-sphere"):
         partitioner = CubedSpherePartitioner(TilePartitioner(layout))
         communicator = CubedSphereCommunicator(comm, partitioner)
     else:

ndsl/stencils/testing/test_translate.py

@@ -389,7 +389,7 @@ def test_parallel_savepoint(
         )
     if case.testobj.skip_test:
         return
-    if grid and not case.testobj.compute_grid_option:
+    if (grid == "compute") and not case.testobj.compute_grid_option:
         pytest.xfail(f"Grid compute option not used for test {case.savepoint_name}")
     input_data = dataset_to_dict(case.ds_in)
     # run python version of functionality