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

Dolci/merge upstream 2 #46

Merged
merged 17 commits into from
Nov 15, 2023
Merged

Dolci/merge upstream 2 #46

merged 17 commits into from
Nov 15, 2023

Conversation

Ig-dolci
Copy link

@Ig-dolci Ig-dolci commented Nov 7, 2023

jhale and others added 17 commits October 9, 2023 11:27
@jhale
Bump version. (FEniCS#217)
4843c37
@garth-wells
Add Spack test to Actions CI (FEniCS#218)
5a5faf2 
* Add Spack CI test

* Update comment
@garth-wells
Add Spack test to CI (FEniCS#219)
66b78e1 
* Fix Spack CI

* Fix typo

* Add badge

* Simplify

* Remove verose output
@mscroggs
AbstractFiniteElement (FEniCS#197)
ff3f69f 
* Remove a lots of finiteelement stuff

* __all_classes__

* remove mixedelement

* remove use of deleted elements

* remove print

* working on element interface

* working on new elements

* Add broken demos

* make (almost) all tests pass

* Move demos out of broken folder, fix a few tests

* Hermite is H1

* flake8

* symmetric elements

* subelements in splitting test

* fix another test

* MixedElasticity demo

* fix final test

* rename FiniteElementBase -> AbstractFiniteElement

* doc

* Template structure for pullback

* working on pull back

* fixes

* skip flake8 on pull_back for now

* flake and pydocstyle

* update tests

* basix branch

* flake8

* start making ffc tests pass

* fix imports

* flake

* isort

* make test pass

* ffc branch

* as_domain in measure (if domain is not None)

* corrections

* dolfinx branch

* Add some types

* no product needed

* sub_rsh

* ()

* flattened... not property

* documentation

* remove component functions

* flake, remove unused function

* remove _is_linear

* put function back

* remove is_cellwise_constant

* remove is_globally_constant

* remove sorting of elements by hash

* improve doc

* working on new pull back classes

* update pull backs in demos and tests

* flake8

* add mixed pull back

* symmetric pull back

* flake

* flake8

* a -> A

* Get (physical) value shape from the pull back

* tidy up element classes

* flake

* add embedded super- and sub-degrees

* Add Legacy elements (for TSFC support)

* flake

* tsfc branch

* don't look up components for scalar-valued elements

* sub_elements() -> sub_elements

* sobolev_space() -> sobolev_space

* is_identity rather than checking type

* abstractproperty

* docs

* use is_identity

* doc

* simplify pullback code

* tweak docstrings

* clarify

* property and custom pullback

* ()

* Use IdentityPullBack if mixed elements sub elements all use it

* Docstring

* fixes in legacy

* l -> L

* physical pull back

* @Property in legacy

* fixing legacy elements

* fix symmetry ordering

* generalise symmetric pull back to sub-elements with a value size

* update AUTHORS

* fdlake

* fix when element may not be fully initialised

* set self._sub_elements before they're needed

* update index order in legacy

* Rename pull_back -> pullback and improve docs

* rename pullback in tests

* fix embedded degrees

* flake

* pullback rename in demos

* replace degree() with embedded_superdegree

* embedded degrees in hdivcurl

* fix more embedded degrees

* correct blockshape

* max not sum

* Revert "max not sum"

This reverts commit 145fbb4.

* only for testing

* set branches to main
@jorgensd @mscroggs
Remove deprecated functionality (attach_operators_from_hash_data). (F…
4b6142a 
…EniCS#220)

* Remove deprecated functionality (attach_operators_from_hash_data).

The deprecation was introduced 4 months ago (FEniCS#168).
Since all the core objects of UFL is using it (Mesh and FunctionSpace) it means that pytest is throwing tons of deprecation warnings at import:
```python
python3 -W error::DeprecationWarning -c "import ufl.Mesh"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/root/shared/ufl/__init__.py", line 265, in <module>
    from ufl.domain import as_domain, AbstractDomain, Mesh, MeshView, TensorProductMesh
  File "/root/shared/ufl/domain.py", line 190, in <module>
    class TensorProductMesh(AbstractDomain):
  File "/root/shared/ufl/core/ufl_type.py", line 56, in attach_operators_from_hash_data
    warnings.warn("attach_operators_from_hash_data deprecated, please use UFLObject instead.", DeprecationWarning)
DeprecationWarning: attach_operators_from_hash_data deprecated, please use UFLObject instead.
```

* Flake8

* implement __str__ for function spaces

---------

Co-authored-by: Matthew Scroggs <[email protected]>
@garth-wells
Remove setup.cfg (FEniCS#223)
f132188 
* Remove setup.cfg

* Fixes

* Update doc check

* CI fix

* Update
@mscroggs
Fix coefficients optional kwarg when calling a Form (FEniCS#226)
e1e8e56 
* None

* fix typo
@conpierce8
Replace ineffective continue with break (FEniCS#229)
1bb1622
@francesco-ballarin
Fix isort section in pyproject.toml (FEniCS#231)
a4c7280
@jorgensd @jhale
We do require pip>=22.3 for editable installs (PEP 660). (FEniCS#227)
6cf3e61 
This does not quite resolve issues with users trying to install with an outdated pip version, as the upgrade happens at runtime, and doesn't change the current version of pip that is executed.

Co-authored-by: Jack S. Hale <[email protected]>
@jhale
Update wheel builder action. (FEniCS#230)
1c1bfbe
@RemDelaporteMathurin
fixed typo (FEniCS#233)
41f30d0
@mscroggs
Remove ufl.legacy (FEniCS#224)
b210795 
* remove ufl.legacy

* finat branch

* remove test of legacy elements

* remove .legacy
@jhale
Change DOLFINx integration test image (FEniCS#235)
23c383e 
* Change DOLFINx integration test image

* Update PETSC_ARCH to new scheme

* Update pip install.

* Update fenicsx-tests.yml

* Update fenicsx-tests.yml
@nbouziani @rckirby
@Justincrum @dham @ksagiyam @connorjward @mscroggs
Update BaseForm's __call__ (FEniCS#232)
372a93b 
* 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

* Fix BaseForm's call

* Add test

* Update test with new FiniteElement interface

---------

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: Matthew Scroggs <[email protected]>
@Ig-dolci @connorjward
ufl2unicode fail (FEniCS#237)
0fe782c 
* In a recent change to UFL, subdomain_id was transformed from a single value to a tuple. This broke some assumptions in ufl2unicode that I have fixed here.

* Update ufl/formatting/ufl2unicode.py

Co-authored-by: Connor Ward <[email protected]>

* Update ufl/formatting/ufl2unicode.py

Co-authored-by: Connor Ward <[email protected]>

* Update ufl/formatting/ufl2unicode.py

Co-authored-by: Connor Ward <[email protected]>

* Update ufl/formatting/ufl2unicode.py

Co-authored-by: Connor Ward <[email protected]>

---------

Co-authored-by: Connor Ward <[email protected]>
@Ig-dolci
Merge remote-tracking branch 'upstream/main' into dolci/merge_upstream_2
ab66c9f
@Ig-dolci Ig-dolci marked this pull request as ready for review November 8, 2023 15:12
This was referenced Nov 9, 2023
Merged
Merged
@JDBetteridge JDBetteridge merged commit 3f337c8 into master Nov 15, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JDBetteridge JDBetteridge JDBetteridge 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.
10 participants
@Ig-dolci @JDBetteridge @jhale @garth-wells @mscroggs @jorgensd @conpierce8 @francesco-ballarin @RemDelaporteMathurin @nbouziani