Skip to content
This repository has been archived by the owner on Feb 21, 2022. It is now read-only.

Commit

Permalink
Merged in miklos1/enable-high-degree-quadrature (pull request #40)
Browse files Browse the repository at this point in the history
Do not block creation of high degree quadrature rules

Approved-by: Andrew McRae <a.t.t.mcrae@bath.ac.uk>
Approved-by: Lawrence Mitchell <wence@gmx.li>
Approved-by: Jan Blechta <blechta@karlin.mff.cuni.cz>
  • Loading branch information
miklos1 committed Jul 17, 2017
2 parents 302df9c + 7d5fa10 commit 1e17484
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
6 changes: 0 additions & 6 deletions FIAT/quadrature_schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ def _fiat_scheme(ref_el, degree):
# Number of points per axis for exact integration
num_points_per_axis = (degree + 1 + 1) // 2

# Check for excess
if num_points_per_axis > 30:
dim = ref_el.get_spatial_dimension()
raise RuntimeError("Requested a quadrature rule with %d points per direction (%d points)" %
(num_points_per_axis, num_points_per_axis**dim))

# Create and return FIAT quadrature rule
return make_quadrature(ref_el, num_points_per_axis)

Expand Down
17 changes: 0 additions & 17 deletions test/unit/test_quadrature.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,23 +153,6 @@ def test_invalid_quadrature_degree_tensor_prod(cell):
FIAT.create_quadrature(cell, (-1, -1))


@pytest.mark.parametrize("cell", [interval(),
triangle(),
tetrahedron(),
quadrilateral()])
def test_high_degree_runtime_error(cell):
with pytest.raises(RuntimeError):
FIAT.create_quadrature(cell, 60)


@pytest.mark.parametrize("cell", [extr_interval(),
extr_triangle(),
extr_quadrilateral()])
def test_high_degree_runtime_error_tensor_prod(cell):
with pytest.raises(RuntimeError):
FIAT.create_quadrature(cell, (60, 60))


def test_tensor_product_composition(interval, triangle, extr_triangle, scheme):
degree = (4, 4)
qa = FIAT.create_quadrature(triangle, degree[0], scheme)
Expand Down

0 comments on commit 1e17484

Please sign in to comment.