From 21ea34cef2b66d1001d622baa230f3a316cda443 Mon Sep 17 00:00:00 2001 From: Thomas Gibson <gibsonthomas1120@hotmail.com> Date: Thu, 29 Apr 2021 15:02:15 -0500 Subject: [PATCH] Remove changes previously caused by QTAG_NONE catching --- grudge/op.py | 1 - grudge/symbolic/operators.py | 8 ++------ test/test_grudge.py | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/grudge/op.py b/grudge/op.py index 8272459b..b3c402ca 100644 --- a/grudge/op.py +++ b/grudge/op.py @@ -82,7 +82,6 @@ def project(dcoll, src, tgt, vec): """ src = dof_desc.as_dofdesc(src) tgt = dof_desc.as_dofdesc(tgt) - if src == tgt: return vec diff --git a/grudge/symbolic/operators.py b/grudge/symbolic/operators.py index 1ca25c8b..031ec60e 100644 --- a/grudge/symbolic/operators.py +++ b/grudge/symbolic/operators.py @@ -27,7 +27,6 @@ import pymbolic.primitives from typing import Tuple - __doc__ = """ Building blocks and mappers for operator expression trees. @@ -104,11 +103,8 @@ class Operator(pymbolic.primitives.Expression): def __init__(self, dd_in, dd_out): import grudge.dof_desc as dof_desc - dd_in = dof_desc.as_dofdesc(dd_in) - dd_out = dof_desc.as_dofdesc(dd_out) - - self.dd_in = dd_in - self.dd_out = dd_out + self.dd_in = dof_desc.as_dofdesc(dd_in) + self.dd_out = dof_desc.as_dofdesc(dd_out) def stringifier(self): from grudge.symbolic.mappers import StringifyMapper diff --git a/test/test_grudge.py b/test/test_grudge.py index 04c2528e..1b375bdf 100644 --- a/test/test_grudge.py +++ b/test/test_grudge.py @@ -936,8 +936,8 @@ def test_improvement_quadrature(actx_factory, order): eoc, errs = conv_test("no quadrature", False) q_eoc, q_errs = conv_test("with quadrature", True) - assert q_eoc >= eoc - assert (q_errs <= errs).all() + assert q_eoc > eoc + assert (q_errs < errs).all() assert q_eoc > order - 0.1 # }}} -- GitLab