Skip to content

Track warp-and-blend el group split in meshmode #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inducer merged 1 commit into from
Jun 17, 2021
Merged

Track warp-and-blend el group split in meshmode #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/advection/surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False):
qtag = None

from meshmode.discretization.poly_element import \
PolynomialWarpAndBlendGroupFactory, \
default_simplex_group_factory, \
QuadratureSimplexGroupFactory

discr_tag_to_group_factory[dof_desc.DISCR_TAG_BASE] = \
PolynomialWarpAndBlendGroupFactory(order)
default_simplex_group_factory(base_dim=dim-1, order=order)

if use_quad:
discr_tag_to_group_factory[qtag] = \
Expand Down
4 changes: 2 additions & 2 deletions examples/wave/wave-op-var-velocity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ def main(ctx_factory, dim=2, order=3, visualize=False):

from meshmode.discretization.poly_element import \
QuadratureSimplexGroupFactory, \
PolynomialWarpAndBlendGroupFactory
default_simplex_group_factory
dcoll = DiscretizationCollection(
actx, mesh,
discr_tag_to_group_factory={
DISCR_TAG_BASE: PolynomialWarpAndBlendGroupFactory(order),
DISCR_TAG_BASE: default_simplex_group_factory(base_dim=dim, order=order),
DISCR_TAG_QUAD: QuadratureSimplexGroupFactory(3*order),
}
)
Expand Down
7 changes: 4 additions & 3 deletions grudge/discretization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __init__(self, array_context: ArrayContext, mesh: Mesh,
self._setup_actx = array_context.clone()

from meshmode.discretization.poly_element import \
PolynomialWarpAndBlendGroupFactory
default_simplex_group_factory

if discr_tag_to_group_factory is None:
if order is None:
Expand All @@ -123,7 +123,8 @@ def __init__(self, array_context: ArrayContext, mesh: Mesh,
)

discr_tag_to_group_factory = {
DISCR_TAG_BASE: PolynomialWarpAndBlendGroupFactory(order=order)}
DISCR_TAG_BASE: default_simplex_group_factory(
base_dim=mesh.dim, order=order)}
else:
if order is not None:
discr_tag_to_group_factory = discr_tag_to_group_factory.copy()
Expand All @@ -134,7 +135,7 @@ def __init__(self, array_context: ArrayContext, mesh: Mesh,
)

discr_tag_to_group_factory[DISCR_TAG_BASE] = \
PolynomialWarpAndBlendGroupFactory(order=order)
default_simplex_group_factory(base_dim=mesh.dim, order=order)

# Modal discr should always comes from the base discretization
discr_tag_to_group_factory[DISCR_TAG_MODAL] = \
Expand Down
7 changes: 4 additions & 3 deletions test/test_modal_connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from meshmode.discretization.poly_element import (
# Simplex group factories
InterpolatoryQuadratureSimplexGroupFactory,
PolynomialWarpAndBlendGroupFactory,
PolynomialWarpAndBlend2DRestrictingGroupFactory,
PolynomialEquidistantSimplexGroupFactory,
# Tensor product group factories
LegendreGaussLobattoTensorProductGroupFactory,
Expand All @@ -48,7 +48,7 @@

@pytest.mark.parametrize("nodal_group_factory", [
InterpolatoryQuadratureSimplexGroupFactory,
PolynomialWarpAndBlendGroupFactory,
PolynomialWarpAndBlend2DRestrictingGroupFactory,
PolynomialEquidistantSimplexGroupFactory,
LegendreGaussLobattoTensorProductGroupFactory,
]
Expand Down Expand Up @@ -109,7 +109,8 @@ def f(x):
dcoll = DiscretizationCollection(
actx, mesh,
discr_tag_to_group_factory={
dof_desc.DISCR_TAG_BASE: PolynomialWarpAndBlendGroupFactory(order),
dof_desc.DISCR_TAG_BASE:
PolynomialWarpAndBlend2DRestrictingGroupFactory(order),
dof_desc.DISCR_TAG_QUAD: QuadratureSimplexGroupFactory(2*order)
}
)
Expand Down