From 4e5a0f6d9ac1d9a2d9693eb1d666e0b6e4bbddee Mon Sep 17 00:00:00 2001 From: Mike Campbell Date: Mon, 15 Jul 2024 17:24:17 -0500 Subject: [PATCH 1/6] Use pyvisfile@09c01f2 and pytools@444c4b6 --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f006b5dd5..b3b0d9e4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ git+https://github.com/pythological/kanren.git#egg=miniKanren git+https://github.com/mpi4py/mpi4py#egg=mpi4py # The following packages will be git cloned by emirge: +--editable git+https://github.com/inducer/pytools.git@444c4b6#egg=pytools --editable git+https://github.com/inducer/pymbolic.git#egg=pymbolic #--editable git+https://github.com/inducer/pyopencl.git#egg=pyopencl --editable git+https://github.com/illinois-ceesd/loopy.git@production#egg=loopy @@ -24,4 +25,4 @@ git+https://github.com/mpi4py/mpi4py#egg=mpi4py --editable git+https://github.com/pyrometheus/pyrometheus.git@tulio/entropy#egg=pyrometheus --editable git+https://github.com/illinois-ceesd/logpyle.git#egg=logpyle --editable git+https://github.com/kaushikcfd/feinsum.git#egg=feinsum ---editable git+https://github.com/inducer/pyvisfile.git#egg=pyvisfile +--editable git+https://github.com/inducer/pyvisfile.git@09c01f2#egg=pyvisfile From 578a2e61c9581651247e295720914136c21cb228 Mon Sep 17 00:00:00 2001 From: Mike Campbell Date: Mon, 15 Jul 2024 23:26:18 -0500 Subject: [PATCH 2/6] Call div_op with quad dd --- mirgecom/operators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirgecom/operators.py b/mirgecom/operators.py index 3984f1656..4f898ffb2 100644 --- a/mirgecom/operators.py +++ b/mirgecom/operators.py @@ -92,6 +92,6 @@ def div_operator(dcoll, dd_vol, dd_allfaces, v, flux): """ # pylint: disable=invalid-unary-operand-type return -op.inverse_mass( - dcoll, dd_vol.with_discr_tag(DISCR_TAG_BASE), + dcoll, dd_vol, op.weak_local_div(dcoll, dd_vol, v) - op.face_mass(dcoll, dd_allfaces, flux)) From 0498d0e1014d20ea5e4cb28b0fd14a8d32406bea Mon Sep 17 00:00:00 2001 From: Mike Campbell Date: Tue, 16 Jul 2024 13:01:23 -0500 Subject: [PATCH 3/6] Let grad use the updated inverse mass function too --- mirgecom/operators.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mirgecom/operators.py b/mirgecom/operators.py index 4f898ffb2..9e022fea6 100644 --- a/mirgecom/operators.py +++ b/mirgecom/operators.py @@ -30,8 +30,6 @@ import grudge.op as op -from grudge.dof_desc import DISCR_TAG_BASE - def grad_operator(dcoll, dd_vol, dd_allfaces, u, flux): r"""Compute a DG gradient for the input *u* with flux given by *flux*. @@ -60,7 +58,7 @@ def grad_operator(dcoll, dd_vol, dd_allfaces, u, flux): """ # pylint: disable=invalid-unary-operand-type return -op.inverse_mass( - dcoll, dd_vol.with_discr_tag(DISCR_TAG_BASE), + dcoll, dd_vol, op.weak_local_grad(dcoll, dd_vol, u) - op.face_mass(dcoll, dd_allfaces, flux)) From 52a28d65431b0981ed0f264b27861624d8986a96 Mon Sep 17 00:00:00 2001 From: Mike Campbell Date: Tue, 16 Jul 2024 13:21:37 -0500 Subject: [PATCH 4/6] Update inverse mass callsites to make sure to use oi-enabled adg when overintegration is used. --- mirgecom/diffusion.py | 6 +++--- mirgecom/euler.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mirgecom/diffusion.py b/mirgecom/diffusion.py index ab9759084..fd67ec016 100644 --- a/mirgecom/diffusion.py +++ b/mirgecom/diffusion.py @@ -725,8 +725,8 @@ def boundary_flux(bdtag, bdry): numerical_flux_func=numerical_flux_func)) return op.inverse_mass( - dcoll, dd_vol, - op.weak_local_grad(dcoll, dd_vol, -u) + dcoll, dd_vol_quad, + op.weak_local_grad(dcoll, dd_vol_quad, -u) - # noqa: W504 op.face_mass( dcoll, dd_allfaces_quad, @@ -888,7 +888,7 @@ def boundary_flux(bdtag, bdry): numerical_flux_func=diffusion_numerical_flux_func)) diff_u = op.inverse_mass( - dcoll, dd_vol, + dcoll, dd_vol_quad, op.weak_local_div(dcoll, dd_vol_quad, -kappa_quad*grad_u_quad) - # noqa: W504 op.face_mass( diff --git a/mirgecom/euler.py b/mirgecom/euler.py index c314a1260..3201e6239 100644 --- a/mirgecom/euler.py +++ b/mirgecom/euler.py @@ -300,7 +300,7 @@ def _interp_to_surf_modified_conservedvars(gamma, ev_pair): return op.inverse_mass( dcoll, - dd_vol, + dd_vol_quad, inviscid_vol_term - op.face_mass(dcoll, dd_allfaces_quad, inviscid_flux_bnd) ) From e3a21e92db00e57a975a93dd3b0393154d4dea0c Mon Sep 17 00:00:00 2001 From: Mike Anderson Date: Thu, 18 Jul 2024 10:58:57 -0500 Subject: [PATCH 5/6] bug fix in diffusion operator --- mirgecom/diffusion.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mirgecom/diffusion.py b/mirgecom/diffusion.py index fd67ec016..3b62a9c9a 100644 --- a/mirgecom/diffusion.py +++ b/mirgecom/diffusion.py @@ -724,9 +724,11 @@ def boundary_flux(bdtag, bdry): dcoll, dd_bdry_quad, kappa_minus_quad, u_minus_quad, numerical_flux_func=numerical_flux_func)) + u_quad = op.project(dcoll, dd_vol, dd_vol_quad, u) + return op.inverse_mass( dcoll, dd_vol_quad, - op.weak_local_grad(dcoll, dd_vol_quad, -u) + op.weak_local_grad(dcoll, dd_vol_quad, -u_quad) - # noqa: W504 op.face_mass( dcoll, dd_allfaces_quad, From 381af5d164675db545c46bc1539a382f906a4c0c Mon Sep 17 00:00:00 2001 From: Mike Campbell Date: Fri, 19 Jul 2024 21:29:14 -0500 Subject: [PATCH 6/6] Use requirements.txt@main --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b3b0d9e4a..f006b5dd5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ git+https://github.com/pythological/kanren.git#egg=miniKanren git+https://github.com/mpi4py/mpi4py#egg=mpi4py # The following packages will be git cloned by emirge: ---editable git+https://github.com/inducer/pytools.git@444c4b6#egg=pytools --editable git+https://github.com/inducer/pymbolic.git#egg=pymbolic #--editable git+https://github.com/inducer/pyopencl.git#egg=pyopencl --editable git+https://github.com/illinois-ceesd/loopy.git@production#egg=loopy @@ -25,4 +24,4 @@ git+https://github.com/mpi4py/mpi4py#egg=mpi4py --editable git+https://github.com/pyrometheus/pyrometheus.git@tulio/entropy#egg=pyrometheus --editable git+https://github.com/illinois-ceesd/logpyle.git#egg=logpyle --editable git+https://github.com/kaushikcfd/feinsum.git#egg=feinsum ---editable git+https://github.com/inducer/pyvisfile.git@09c01f2#egg=pyvisfile +--editable git+https://github.com/inducer/pyvisfile.git#egg=pyvisfile