diff --git a/test/test_global_qbx.py b/test/test_global_qbx.py index ca276959ab3ab51b6bec494059a97b0952894283..fd19c9733b5c822613b7ec264e162ab1b6e08726 100644 --- a/test/test_global_qbx.py +++ b/test/test_global_qbx.py @@ -219,7 +219,7 @@ def test_source_refinement_2d(ctx_factory, curve_name, curve_f, nelements): @pytest.mark.parametrize(("surface_name", "surface_f", "order"), [ ("sphere", partial(generate_icosphere, 1), 4), - ("torus", partial(generate_torus, 3, 1, n_inner=10, n_outer=7), 6), + ("torus", partial(generate_torus, 3, 1, n_minor=10, n_major=7), 6), ]) def test_source_refinement_3d(ctx_factory, surface_name, surface_f, order): mesh = surface_f(order=order) diff --git a/test/test_layer_pot.py b/test/test_layer_pot.py index 2e7aca67dbf1635a1b5169dc5c8dcec31db407e9..74b918164c0110ee9b10f4929e9e8b77bd32e77c 100644 --- a/test/test_layer_pot.py +++ b/test/test_layer_pot.py @@ -338,7 +338,7 @@ def test_3d_jump_relations(ctx_factory, relation, visualize=False): from meshmode.mesh.generation import generate_torus mesh = generate_torus( 5, 2, order=target_order, - n_outer=2*nel_factor, n_inner=nel_factor) + n_major=2*nel_factor, n_minor=nel_factor) from meshmode.discretization import Discretization from meshmode.discretization.poly_element import \ diff --git a/test/test_symbolic.py b/test/test_symbolic.py index 40e8382fc8ff5b08013e1ed21726d4f7684f4df5..508ff2961b7b46a3a9b2eaa71530c1c8f4d58076 100644 --- a/test/test_symbolic.py +++ b/test/test_symbolic.py @@ -73,12 +73,12 @@ def get_ellipse_with_ref_mean_curvature(cl_ctx, nelements, aspect=1): def get_torus_with_ref_mean_curvature(cl_ctx, h): order = 4 - r_inner = 1.0 - r_outer = 3.0 + r_minor = 1.0 + r_major = 3.0 from meshmode.mesh.generation import generate_torus - mesh = generate_torus(r_outer, r_inner, - n_outer=h, n_inner=h, order=order) + mesh = generate_torus(r_major, r_minor, + n_major=h, n_minor=h, order=order) discr = Discretization(cl_ctx, mesh, InterpolatoryQuadratureSimplexGroupFactory(order)) @@ -86,8 +86,8 @@ def get_torus_with_ref_mean_curvature(cl_ctx, h): nodes = discr.nodes().get(queue=queue) # copied from meshmode.mesh.generation.generate_torus - a = r_outer - b = r_inner + a = r_major + b = r_minor u = np.arctan2(nodes[1], nodes[0]) rvec = np.array([np.cos(u), np.sin(u), np.zeros_like(u)])