Skip to content

Merge in changes from upstream master (for better or worse).#1

Merged
MTCam merged 110 commits into
artificial_viscosityfrom
av-mrg-master
Feb 4, 2021
Merged

Merge in changes from upstream master (for better or worse).#1
MTCam merged 110 commits into
artificial_viscosityfrom
av-mrg-master

Conversation

@MTCam
Copy link
Copy Markdown
Collaborator

@MTCam MTCam commented Feb 3, 2021

No description provided.

MTCam and others added 30 commits September 2, 2020 10:39
Co-authored-by: Andreas Klöckner <inform@tiker.net>
matthiasdiener and others added 18 commits December 7, 2020 18:04
* switch doc to furo theme

* fixes

* Add Github/releases links to TOC

Co-authored-by: Andreas Klöckner <inform@tiker.net>
- Allows hierarchical content menu
- Reduces 'wall of text'
)

* add example git hook to run flake8/pydocstyle

* cleanup flake8

* clarify location
* add boundary conditions to diffusion operator

* attempt to simplify diffusion_operator BC specification

* apply suggestions from review

* add more documentation for diffusion BCs

* add comment

* Update mirgecom/diffusion.py

Co-authored-by: Andreas Klöckner <inform@tiker.net>

* make vectorized 'boundaries' a list instead of an object array

* update comment

Co-authored-by: Andreas Klöckner <inform@tiker.net>
Also adds totals for num_calls and time.

Mostly extracted from illinois-ceesd#96.
Co-authored-by: Andreas Klöckner <inform@tiker.net>
* add variable diffusivity

* remove calls to deprecated flat_norm

* use quadrature discretization normal

* mention numerical flux formulation in docstring

* allow scalar values of alpha in diffusion_operator

* tweak docstring

* add comment about product rule decomposition

* cosmetic change

* add missing quad tag argument in obj array vectorize

* Apply suggestions from code review

Co-authored-by: Andreas Klöckner <inform@tiker.net>

* make quad tag argument mandatory

* avoid promoting constant alpha to a DOFArray

* temporarilty change grudge branch

* Point grudge in requirements.txt back to master after majosm:project-constants

Co-authored-by: Andreas Klöckner <inform@tiker.net>
…ceesd#209)

* simplify alpha in heat-source-mpi example

* remove branch no longer needed after constant projection support added to grudge
@MTCam MTCam requested a review from w-hagen February 3, 2021 20:06
@MTCam
Copy link
Copy Markdown
Collaborator Author

MTCam commented Feb 3, 2021

BTW, I think we need to ignore the CI failures atm, because they'll fail even on w-hagen/master.

@w-hagen
Copy link
Copy Markdown
Owner

w-hagen commented Feb 3, 2021

Looks like parts of the boundary conditions needed for my artificial viscosity routine got wiped out here. You beat me to this comment. While the usage exterior_sol and boundary_pair need to be reworked, if the goal is just to get this upstream master changes merged in here they probably could be left as is for the moment. They are on my list to fix in the mainline pull request

@MTCam
Copy link
Copy Markdown
Collaborator Author

MTCam commented Feb 3, 2021

Looks like parts of the boundary conditions needed for my artificial viscosity routine got wiped out here. You beat me to this comment. While the usage exterior_sol and boundary_pair need to be reworked, if the goal is just to get this upstream master changes merged in here they probably could be left as is for the moment. They are on my list to fix in the mainline pull request

Yeah, per our convo on Slack. I inadvertently removed these in the hand-merge. Any chance you could make sure your own tests work on this branch before we push something that breaks the hell out of it?

@w-hagen
Copy link
Copy Markdown
Owner

w-hagen commented Feb 3, 2021

I will pull this branch and make sure everything is running.

@w-hagen
Copy link
Copy Markdown
Owner

w-hagen commented Feb 4, 2021

Yeah, per our convo on Slack. I inadvertently removed these in the hand-merge. Any chance you could make sure your own tests work on this branch before we push something that breaks the hell out of it?

I will pull this branch and make sure everything is running.

Everything looks good after a few fixes to my boundary condition routines needed when updating to the latest packages.

@MTCam
Copy link
Copy Markdown
Collaborator Author

MTCam commented Feb 4, 2021

Everything looks good after a few fixes to my boundary condition routines needed when updating to the latest packages.

Terrific, ok to merge?

@w-hagen
Copy link
Copy Markdown
Owner

w-hagen commented Feb 4, 2021

Yeah, should be good.

@MTCam MTCam merged commit 37abb66 into artificial_viscosity Feb 4, 2021
@MTCam MTCam deleted the av-mrg-master branch February 4, 2021 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants