Skip to content
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

Jump to bottom

Merge upstream #48

Merged
merged 8 commits into from
Nov 30, 2023
Merged

Merge upstream #48

merged 8 commits into from
Nov 30, 2023

Conversation

JHopeCollins
Copy link

No description provided.

mscroggs and others added 8 commits November 13, 2023 15:19
@mscroggs
Convert rst to md (FEniCS#239)
27869b4 
* move README.rst to README.md

* move changelog to md

* update styling

* indentation?
@mscroggs
use tsfc master on CI (FEniCS#240)
d2b4fe6 
* use tsfc master on CI

* another branch name
@francesco-ballarin
Update OMPI environment variables in FEniCSx integration test for ope…
5c08401 
…nmpi v5 (FEniCS#241)
@jhale
Fix license file field. (FEniCS#244)
3eda4f9
@JHopeCollins
FormSum.coefficients should be ordered the same as Form.coefficients (F…
e8d3077 
…EniCS#243)
@pbrubeck
Expunge ufl_domain (FEniCS#246)
60a1cfc 
* Expunge Expr.ufl_domain()

* Remove failing assertion

* Action: get ufl_domains() from operands
@nbouziani @rckirby
@Justincrum @dham @ksagiyam @connorjward @Ig-dolci @JDBetteridge
Fix cofunction equality (FEniCS#247)
3fc1763 
* Add trimmed serendipity

* Fix value shape for trimmed serendipity

* ufl plumbing update for trimmed serendipity.

* Plumbing for SminusDiv.py

* Adding in element stuff for SminusCurl.

* Fix typo

* remove spurioius names

* Update equality inheritance for Cofunctions

---------

Co-authored-by: Rob Kirby <[email protected]>
Co-authored-by: Justincrum <[email protected]>
Co-authored-by: David A. Ham <[email protected]>
Co-authored-by: ksagiyam <[email protected]>
Co-authored-by: ksagiyam <[email protected]>
Co-authored-by: Connor Ward <[email protected]>
Co-authored-by: Iglesia Dolci <[email protected]>
Co-authored-by: Jack Betteridge <[email protected]>
@JHopeCollins
Merge remote-tracking branch 'upstream/main' into JHopeCollins/upstre…
fa06f13 
…am-update
@JHopeCollins JHopeCollins mentioned this pull request Nov 30, 2023
Closed
pbrubeck
pbrubeck reviewed Nov 30, 2023
View reviewed changes
Copy link

@pbrubeck pbrubeck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@pbrubeck pbrubeck self-requested a review November 30, 2023 14:58
pbrubeck
pbrubeck approved these changes Nov 30, 2023
View reviewed changes
Copy link

@pbrubeck pbrubeck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve

@JHopeCollins JHopeCollins merged commit 054b061 into master Nov 30, 2023
8 checks passed
@connorjward connorjward deleted the JHopeCollins/upstream-update branch December 6, 2023 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pbrubeck pbrubeck pbrubeck approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@JHopeCollins @pbrubeck @mscroggs @francesco-ballarin @jhale @nbouziani