Skip to content

Extend evaluate function for multiple distributed fields #91

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.

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 46 additions & 0 deletions src/CellData.jl
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,41 @@ function Arrays.evaluate!(
DistributedCellField(fields)
end

function Arrays.evaluate!(
cache,k::Operation,a::DistributedCellField,b::DistributedCellField,c::DistributedCellField)
fields = map_parts(a.fields,b.fields,c.fields) do f,g,h
evaluate!(nothing,k,f,g,h)
end
DistributedCellField(fields)
end

function Arrays.evaluate!(
cache,k::Operation,a::DistributedCellField,b::DistributedCellField,c::DistributedCellField,d::DistributedCellField)
fields = map_parts(a.fields,b.fields,c.fields,d.fields) do f,g,h,j
evaluate!(nothing,k,f,g,h,j)
end
DistributedCellField(fields)
end


function Arrays.evaluate!(
cache,k::Operation,n1::Number, n2::Number, a::DistributedCellField,b::DistributedCellField,c::DistributedCellField)
fields = map_parts(a.fields,b.fields,c.fields) do f,g,h
evaluate!(nothing,k,f,g,h,n1,n2)
end
DistributedCellField(fields)
end

function Arrays.evaluate!(
cache,k::Operation, n1::Number, n2::Number, a::DistributedCellField,b::DistributedCellField,c::DistributedCellField,d::DistributedCellField)
fields = map_parts(a.fields,b.fields,c.fields,d.fields) do f,g,h,j
evaluate!(nothing,k,f,g,h,j,n1,n2)
end
DistributedCellField(fields)
end



function Arrays.evaluate!(cache,k::Operation,a::DistributedCellField,b::Number)
fields = map_parts(a.fields) do f
evaluate!(nothing,k,f,b)
Expand Down Expand Up @@ -320,3 +355,14 @@ end
CellData.jump(a::DistributedCellField) = DistributedCellField(map_parts(jump,a.fields))
CellData.jump(a::SkeletonPair{<:DistributedCellField}) = a.⁺ + a.⁻
CellData.mean(a::DistributedCellField) = DistributedCellField(map_parts(mean,a.fields))


#Custom Operation
function get_node_model(a::GridapDistributed.DistributedDiscreteModel)
DistributedCellPoint(map_parts(get_node_model,a.models))
end

function get_node_model(model)
node_model = Gridap.ReferenceFEs.get_node_coordinates(model)
return node_model
end
2 changes: 1 addition & 1 deletion src/GridapDistributed.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export SubAssembledRows

export get_cell_gids
export get_face_gids

export DistributedTriangulation
include("Algebra.jl")

include("Geometry.jl")
Expand Down