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

use OrderedDict #1004

Merged
merged 8 commits into from
May 2, 2024
Merged

use OrderedDict #1004

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
59cab08
use OrderedDict
mochen4 Apr 30, 2024
36e5d3f
Update src/CellData/DomainContributions.jl
mochen4 Apr 30, 2024
89caaaf
Update DomainContributions.jl
mochen4 Apr 30, 2024
349839c
Update src/CellData/DomainContributions.jl
mochen4 Apr 30, 2024
5861ce2
Update src/CellData/DomainContributions.jl
mochen4 May 1, 2024
e79a7db
Merge branch 'gridap:master' into OrderedDict
mochen4 May 2, 2024
58820ab
Update NEWS.md
mochen4 May 2, 2024
d3b9ee9
typo
mochen4 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/CellData/DomainContributions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@

"""
"""
using DataStructures
mochen4 marked this conversation as resolved.
Show resolved Hide resolved

mochen4 marked this conversation as resolved.
Show resolved Hide resolved
struct DomainContribution <: GridapType
dict::IdDict{Triangulation,AbstractArray}
dict::OrderedDict{Triangulation,AbstractArray}
mochen4 marked this conversation as resolved.
Show resolved Hide resolved
end

DomainContribution() = DomainContribution(IdDict{Triangulation,AbstractArray}())
Expand Down Expand Up @@ -186,4 +188,4 @@ function integrate(f,b::CompositeMeasure)
tc = move_contributions(ic,b.itrian,b.ttrian)
add_contribution!(cont,b.ttrian,tc)
return cont
end
end