tests

Author: pbrubeck

tests/firedrake/multigrid/test_poisson_gmg_extruded.py

@@ -2,16 +2,16 @@
 import pytest
 
 
-def run_poisson(typ):
-    if typ == "mg":
+def run_poisson(solver_type, periodic=False):
+    if solver_type == "mg":
         parameters = {"snes_type": "ksponly",
                       "ksp_type": "preonly",
                       "pc_type": "mg",
                       "pc_mg_type": "full",
                       "mg_levels_ksp_type": "chebyshev",
                       "mg_levels_ksp_max_it": 2,
                       "mg_levels_pc_type": "jacobi"}
-    elif typ == "fas":
+    elif solver_type == "fas":
         parameters = {"snes_type": "fas",
                       "snes_fas_type": "full",
                       "fas_coarse_snes_type": "ksponly",
@@ -25,7 +25,7 @@ def run_poisson(typ):
                       "fas_levels_ksp_convergence_test": "skip",
                       "snes_max_it": 1,
                       "snes_convergence_test": "skip"}
-    elif typ == "newtonfas":
+    elif solver_type == "newtonfas":
         parameters = {"snes_type": "newtonls",
                       "ksp_type": "preonly",
                       "pc_type": "none",
@@ -47,22 +47,21 @@ def run_poisson(typ):
                       "npc_snes_max_it": 1,
                       "npc_snes_convergence_test": "skip"}
     else:
-        raise RuntimeError("Unknown parameter set '%s' request", typ)
+        raise RuntimeError("Unknown parameter set '%s' request", solver_type)
 
     N = 10
     base = UnitIntervalMesh(N)
     basemh = MeshHierarchy(base, 2)
-    mh = ExtrudedMeshHierarchy(basemh, height=1, base_layer=N)
+    mh = ExtrudedMeshHierarchy(basemh, height=1, base_layer=N, periodic=periodic)
 
     V = FunctionSpace(mh[-1], 'CG', 2)
 
     u = Function(V)
     f = Function(V)
     v = TestFunction(V)
     F = inner(grad(u), grad(v))*dx - inner(f, v)*dx
-    bcs = [DirichletBC(V, 0, "on_boundary"),
-           DirichletBC(V, 0, "top"),
-           DirichletBC(V, 0, "bottom")]
+    subs = ("on_boundary",) if periodic else ("on_boundary", "top", "bottom")
+    bcs = [DirichletBC(V, 0, sub) for sub in subs]
     # Choose a forcing function such that the exact solution is not an
     # eigenmode.  This stresses the preconditioner much more.  e.g. 10
     # iterations of ilu fails to converge this problem sufficiently.
@@ -77,22 +76,12 @@ def run_poisson(typ):
     return norm(assemble(exact - u))
 
 
-@pytest.mark.parametrize("typ",
-                         ["mg", "fas", "newtonfas"])
-def test_poisson_gmg(typ):
-    assert run_poisson(typ) < 4e-6
+@pytest.mark.parallel([1, 3])
+@pytest.mark.parametrize("solver_type", ["mg", "fas", "newtonfas"])
+def test_poisson_gmg(solver_type):
+    assert run_poisson(solver_type) < 4e-6
 
 
-@pytest.mark.parallel
-def test_poisson_gmg_parallel_mg():
-    assert run_poisson("mg") < 4e-6
-
-
-@pytest.mark.parallel
-def test_poisson_gmg_parallel_fas():
-    assert run_poisson("fas") < 4e-6
-
-
-@pytest.mark.parallel
-def test_poisson_gmg_parallel_newtonfas():
-    assert run_poisson("newtonfas") < 4e-6
+@pytest.mark.parallel([1, 3])
+def test_poisson_gmg_periodic():
+    assert run_poisson("mg", periodic=True) < 4e-6