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

Add multiple dofmaps and elements to Geometry #3071

Merged
merged 124 commits into from
Mar 3, 2024
Merged

Add multiple dofmaps and elements to Geometry #3071

merged 124 commits into from
Mar 3, 2024

Conversation

chrisrichardson
Copy link
Contributor

Updates dofmapbuilder to build multiple dofmaps (on the same range) using multiple element dof layouts, when there is a mixed topology.

@chrisrichardson
Add b ack some mixed topology
6526435
@chrisrichardson
merge
c803c90
@chrisrichardson
Start working on mixed topology again
b487445
@chrisrichardson
Merge branch 'main' into chris/topology-nightmare
d81d7e0
@chrisrichardson
Create _entity_types instead of _cell_type
54fcc69
@chrisrichardson
Merge branch 'main' into chris/topology-nightmare
a4d5225
@chrisrichardson
Fixes in Python for testing
0828d81
@chrisrichardson
A bit of debug and a test
9accbe4
@chrisrichardson
Add access to IndexMaps
46d6049
@chrisrichardson
Add more accessors and tests
7202acc
@chrisrichardson
Use general version of create_topology
94312f4
@chrisrichardson
Clarify for mypy
9c7ee0d
@chrisrichardson
merge
8b7a0c9
@chrisrichardson
Add more accessors and test
34d3fd3
@chrisrichardson
Use nb::overload_cast
e08d614
@chrisrichardson
Remove commented code
4e249b0
@chrisrichardson
Add test file
d33c5b1
@chrisrichardson
more tests
4655a7a
@chrisrichardson
Merge branch 'main' into chris/topology-nightmare
eefaa42
@chrisrichardson
Merge branch 'chris/topology-nightmare' of ssh://github.com/fenics/do…
f2a8c27 
…lfinx into chris/topology-nightmare
@chrisrichardson
Improve docs
bc419c0
@chrisrichardson
Merge branch 'main' into chris/topology-nightmare
cc43a38
@chrisrichardson
Const fix
96f4c99
@chrisrichardson
const fix
6e1c53d
@chrisrichardson
Doc fix
589d2a6
@chrisrichardson
Rewrite topology computation slightly
ddc318e
@chrisrichardson
Use int8_t
300fc33
@chrisrichardson
more int8
464f500
@chrisrichardson
Merge branch 'chris/topology-nightmare' into chris/topology-computation
fc52ba8
@chrisrichardson
Adjustments to compute_entities
0c1bc84
@garth-wells garth-wells added the enhancement New feature or request label Feb 27, 2024
garth-wells
garth-wells requested changes Feb 27, 2024
View reviewed changes
cpp/dolfinx/fem/utils.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/utils.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/utils.cpp Show resolved Hide resolved
cpp/dolfinx/fem/utils.h Outdated Show resolved Hide resolved
cpp/dolfinx/fem/utils.h Outdated Show resolved Hide resolved
python/dolfinx/wrappers/mesh.cpp Outdated Show resolved Hide resolved
python/test/unit/fem/test_mixed_mesh_dofmap.py Outdated Show resolved Hide resolved
python/test/unit/fem/test_mixed_mesh_dofmap.py Outdated Show resolved Hide resolved
python/test/unit/fem/test_mixed_mesh_dofmap.py Outdated Show resolved Hide resolved
python/test/unit/mesh/test_mixed_topology.py Outdated Show resolved Hide resolved
@chrisrichardson chrisrichardson marked this pull request as ready for review February 27, 2024 17:11
garth-wells
garth-wells requested changes Feb 29, 2024
View reviewed changes
Copy link
Member

@garth-wells garth-wells left a comment

Choose a reason for hiding this comment

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

Part way through . . .

cpp/dolfinx/fem/dofmapbuilder.cpp Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
garth-wells
garth-wells reviewed Mar 2, 2024
View reviewed changes
Copy link
Member

@garth-wells garth-wells 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. Just some tiny comments.

cpp/dolfinx/fem/dofmapbuilder.cpp Outdated Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Show resolved Hide resolved
cpp/dolfinx/fem/dofmapbuilder.cpp Show resolved Hide resolved
@chrisrichardson chrisrichardson added this pull request to the merge queue Mar 3, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 3, 2024
@chrisrichardson chrisrichardson added this pull request to the merge queue Mar 3, 2024
Merged via the queue into main with commit 0f85bab Mar 3, 2024
19 checks passed
@chrisrichardson chrisrichardson deleted the chris/geometry-mix-more branch March 3, 2024 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garth-wells garth-wells garth-wells approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@chrisrichardson @garth-wells