From f4ad3d30178655af6c9e7e0f6bef45df3aa29cc8 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 4 Dec 2019 23:12:37 -0600 Subject: [PATCH 1/3] Track meshmode changes by renaming torus params --- requirements.txt | 2 +- test/test_global_qbx.py | 2 +- test/test_layer_pot.py | 2 +- test/test_symbolic.py | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 625deb28..727e1e35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ git+https://github.com/inducer/pyopencl git+https://github.com/inducer/islpy git+https://github.com/inducer/loopy git+https://gitlab.tiker.net/inducer/boxtree -git+https://github.com/inducer/meshmode +git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names git+https://gitlab.tiker.net/inducer/sumpy git+https://gitlab.tiker.net/inducer/pyfmmlib diff --git a/test/test_global_qbx.py b/test/test_global_qbx.py index ca276959..fd19c973 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 2e7aca67..74b91816 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 40e8382f..508ff296 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)]) -- GitLab From 3c31bc4ea7c3314f17feb1d6acc0aa18ffd3fa97 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 4 Dec 2019 23:36:30 -0600 Subject: [PATCH 2/3] Also point to meshmode branch in .test-conda-env-py3.yml and .test-conda-env-py3-macos.yml --- .test-conda-env-py3-macos.yml | 2 +- .test-conda-env-py3.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index b4057a83..554e4164 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -27,4 +27,4 @@ dependencies: - git+https://github.com/inducer/pymbolic - git+https://github.com/inducer/loopy - git+https://gitlab.tiker.net/inducer/sumpy - - git+https://github.com/inducer/meshmode + - git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 81849ec0..49af93a8 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -23,4 +23,4 @@ dependencies: - git+https://github.com/inducer/pymbolic - git+https://github.com/inducer/loopy - git+https://gitlab.tiker.net/inducer/sumpy - - git+https://github.com/inducer/meshmode + - git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names -- GitLab From e15021c025aee615f6d0d9dad9684a4b157da6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Thu, 5 Dec 2019 22:47:43 +0100 Subject: [PATCH 3/3] Point meshmode git URL back to master --- .test-conda-env-py3-macos.yml | 2 +- .test-conda-env-py3.yml | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 554e4164..b4057a83 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -27,4 +27,4 @@ dependencies: - git+https://github.com/inducer/pymbolic - git+https://github.com/inducer/loopy - git+https://gitlab.tiker.net/inducer/sumpy - - git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names + - git+https://github.com/inducer/meshmode diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 49af93a8..81849ec0 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -23,4 +23,4 @@ dependencies: - git+https://github.com/inducer/pymbolic - git+https://github.com/inducer/loopy - git+https://gitlab.tiker.net/inducer/sumpy - - git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names + - git+https://github.com/inducer/meshmode diff --git a/requirements.txt b/requirements.txt index 727e1e35..625deb28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ git+https://github.com/inducer/pyopencl git+https://github.com/inducer/islpy git+https://github.com/inducer/loopy git+https://gitlab.tiker.net/inducer/boxtree -git+https://gitlab.tiker.net/inducer/meshmode@fix-torus-param-names +git+https://github.com/inducer/meshmode git+https://gitlab.tiker.net/inducer/sumpy git+https://gitlab.tiker.net/inducer/pyfmmlib -- GitLab