Skip to content

Dirichlet values #74

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

Merged
amartinhuertas merged 16 commits into from
Feb 14, 2022
Merged

Dirichlet values #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d25d2f1
Added HomogeneousTrialFESpace
oriolcg Jan 7, 2022
e225d8f
added TrialFESpace! function
oriolcg Jan 7, 2022
a4e1045
Specialization of setindex! for distributed PVTKFiles
oriolcg Jan 17, 2022
6df96db
Reverted changes in Visualization
oriolcg Jan 17, 2022
01fbe27
Added interpolate_everywhere and interpolate_dirichlet
oriolcg Jan 19, 2022
d074880
Adding tests
oriolcg Jan 19, 2022
002a868
interpolate_everywhere/dirichlet for multifields
oriolcg Jan 21, 2022
3e38336
Merge branch 'master' of https://github.com/gridap/GridapDistributed.…
oriolcg Jan 21, 2022
9a3a8b8
interpolate of DistributedCellFields
oriolcg Jan 21, 2022
e6ca9fa
interpolate_everywhere of MultiFields
oriolcg Jan 21, 2022
b91b01f
removed interpolate_dirichlet for MultiField
oriolcg Jan 21, 2022
9272860
Merge branch 'master' into dirichlet_values
oriolcg Feb 11, 2022
7030e01
Fixes for PR #74
oriolcg Feb 12, 2022
4737441
update NEWS.md and .gitignore
oriolcg Feb 13, 2022
fa9873e
Removed zero_dirichlet_values and associated functions
oriolcg Feb 14, 2022
b1fbd6b
Merge branch 'master' of https://github.com/gridap/GridapDistributed.…
oriolcg Feb 14, 2022
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
/docs/site/
/tmp/
*.vtu
*.pvtu
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Support for periodic boundary conditions for `CartesianDiscreteModel`. Since PR [#79](https://github.com/gridap/GridapDistributed.jl/pull/79)
- Skeleton documentation and some content. Since PR [#77](https://github.com/gridap/GridapDistributed.jl/pull/77)
- Added `interpolate_everywhere` and `interpolate_dirichlet` functions. Since PR [#74](https://github.com/gridap/GridapDistributed.jl/pull/74)

### Fixed
- Visualization of functions and numbers. Since PR [#78](https://github.com/gridap/GridapDistributed.jl/pull/78)
Expand Down
99 changes: 95 additions & 4 deletions src/FESpaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,18 +277,45 @@ function FESpaces.get_free_dof_ids(fs::DistributedSingleFieldFESpace)
fs.gids
end

function FESpaces.get_dirichlet_dof_values(U::DistributedSingleFieldFESpace)
map_parts(get_dirichlet_dof_values,U.spaces)
end

function FESpaces.FEFunction(
f::DistributedSingleFieldFESpace,free_values::AbstractVector,isconsistent=false)
_EvaluationFunction(FEFunction,f,free_values,isconsistent)
end

function FESpaces.FEFunction(
f::DistributedSingleFieldFESpace,free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},isconsistent=false)
_EvaluationFunction(FEFunction,f,free_values,dirichlet_values,isconsistent)
end

function FESpaces.EvaluationFunction(
f::DistributedSingleFieldFESpace,free_values::AbstractVector,isconsistent=false)
_EvaluationFunction(EvaluationFunction,f,free_values,isconsistent)
end

function FESpaces.EvaluationFunction(
f::DistributedSingleFieldFESpace,free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},isconsistent=false)
_EvaluationFunction(EvaluationFunction,f,free_values,dirichlet_values,isconsistent)
end

function _EvaluationFunction(func,
f::DistributedSingleFieldFESpace,free_values::AbstractVector,isconsistent=false)
local_vals = consistent_local_views(free_values,f.gids,isconsistent)
fields = map_parts(FEFunction,f.spaces,local_vals)
fields = map_parts(func,f.spaces,local_vals)
metadata = DistributedFEFunctionData(free_values)
DistributedCellField(fields,metadata)
end

function FESpaces.EvaluationFunction(
f::DistributedSingleFieldFESpace,free_values::AbstractVector,isconsistent=false)
function _EvaluationFunction(func,
f::DistributedSingleFieldFESpace,free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},isconsistent=false)
local_vals = consistent_local_views(free_values,f.gids,isconsistent)
fields = map_parts(EvaluationFunction,f.spaces,local_vals)
fields = map_parts(func,f.spaces,local_vals,dirichlet_values)
metadata = DistributedFEFunctionData(free_values)
DistributedCellField(fields,metadata)
end
Expand Down Expand Up @@ -322,6 +349,20 @@ function FESpaces.TrialFESpace(fun,f::DistributedSingleFieldFESpace)
DistributedSingleFieldFESpace(spaces,f.gids,f.vector_type)
end

function FESpaces.TrialFESpace!(f::DistributedSingleFieldFESpace,fun)
spaces = map_parts(f.spaces) do s
TrialFESpace!(s,fun)
end
DistributedSingleFieldFESpace(spaces,f.gids,f.vector_type)
end

function FESpaces.HomogeneousTrialFESpace(f::DistributedSingleFieldFESpace)
spaces = map_parts(f.spaces) do s
HomogeneousTrialFESpace(s)
end
DistributedSingleFieldFESpace(spaces,f.gids,f.vector_type)
end

function generate_gids(
model::DistributedDiscreteModel,
spaces::AbstractPData{<:SingleFieldFESpace})
Expand All @@ -343,6 +384,56 @@ function FESpaces.interpolate!(
FEFunction(f,free_values)
end

function FESpaces.interpolate!(
u::DistributedCellField,free_values::AbstractVector,f::DistributedSingleFieldFESpace)
map_parts(local_views(u),f.spaces,local_views(free_values)) do ui,V,vec
interpolate!(ui,vec,V)
end
FEFunction(f,free_values)
end

function FESpaces.interpolate_dirichlet(u, f::DistributedSingleFieldFESpace)
free_values = zero_free_values(f)
dirichlet_values = get_dirichlet_dof_values(f)
interpolate_dirichlet!(u,free_values,dirichlet_values,f)
end

function FESpaces.interpolate_dirichlet!(
u, free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},
f::DistributedSingleFieldFESpace)
map_parts(f.spaces,local_views(free_values),dirichlet_values) do V,fvec,dvec
interpolate_dirichlet!(u,fvec,dvec,V)
end
FEFunction(f,free_values,dirichlet_values)
end

function FESpaces.interpolate_everywhere(u, f::DistributedSingleFieldFESpace)
free_values = zero_free_values(f)
dirichlet_values = get_dirichlet_dof_values(f)
interpolate_everywhere!(u,free_values,dirichlet_values,f)
end

function FESpaces.interpolate_everywhere!(
u, free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},
f::DistributedSingleFieldFESpace)
map_parts(f.spaces,local_views(free_values),dirichlet_values) do V,fvec,dvec
interpolate_everywhere!(u,fvec,dvec,V)
end
FEFunction(f,free_values,dirichlet_values)
end

function FESpaces.interpolate_everywhere!(
u::DistributedCellField, free_values::AbstractVector,
dirichlet_values::AbstractPData{<:AbstractVector},
f::DistributedSingleFieldFESpace)
map_parts(local_views(u),f.spaces,local_views(free_values),dirichlet_values) do ui,V,fvec,dvec
interpolate_everywhere!(ui,fvec,dvec,V)
end
FEFunction(f,free_values,dirichlet_values)
end

# Factories

function FESpaces.FESpace(model::DistributedDiscreteModel,reffe;kwargs...)
Expand Down
60 changes: 60 additions & 0 deletions src/MultiField.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ MultiField.num_fields(m::DistributedMultiFieldFEFunction) = length(m.field_fe_fu
Base.iterate(m::DistributedMultiFieldFEFunction) = iterate(m.field_fe_fun)
Base.iterate(m::DistributedMultiFieldFEFunction,state) = iterate(m.field_fe_fun,state)
Base.getindex(m::DistributedMultiFieldFEFunction,field_id::Integer) = m.field_fe_fun[field_id]

local_views(a::Vector{<:DistributedCellField}) = [ai.fields for ai in a]

"""
"""
struct DistributedMultiFieldFESpace{A,B,C,D} <: DistributedFESpace
Expand Down Expand Up @@ -118,6 +121,63 @@ function FESpaces.interpolate!(objects,free_values::AbstractVector,fe::Distribut
end
DistributedMultiFieldFEFunction(field_fe_fun,part_fe_fun,free_values)
end

function FESpaces.interpolate_everywhere(objects,fe::DistributedMultiFieldFESpace)
free_values = zero_free_values(fe)
local_vals = consistent_local_views(free_values,fe.gids,true)
part_fe_fun = map_parts(local_vals,local_views(fe)) do x,f
interpolate!(objects,x,f)
end
field_fe_fun = DistributedSingleFieldFEFunction[]
for i in 1:num_fields(fe)
free_values_i = restrict_to_field(fe,free_values,i)
fe_space_i = fe.field_fe_space[i]
dirichlet_values_i = zero_dirichlet_values(fe_space_i)
fe_fun_i = interpolate_everywhere!(objects[i], free_values_i,dirichlet_values_i,fe_space_i)
push!(field_fe_fun,fe_fun_i)
end
DistributedMultiFieldFEFunction(field_fe_fun,part_fe_fun,free_values)
end

function FESpaces.interpolate_everywhere!(
objects,free_values::AbstractVector,
dirichlet_values::Vector{AbstractPData{<:AbstractVector}},
fe::DistributedMultiFieldFESpace)
local_vals = consistent_local_views(free_values,fe.gids,true)
part_fe_fun = map_parts(local_vals,local_views(fe)) do x,f
interpolate!(objects,x,f)
end
field_fe_fun = DistributedSingleFieldFEFunction[]
for i in 1:num_fields(fe)
free_values_i = restrict_to_field(fe,free_values,i)
dirichlet_values_i = dirichlet_values[i]
fe_space_i = fe.field_fe_space[i]
fe_fun_i = interpolate_everywhere!(objects[i], free_values_i,dirichlet_values_i,fe_space_i)
push!(field_fe_fun,fe_fun_i)
end
DistributedMultiFieldFEFunction(field_fe_fun,part_fe_fun,free_values)
end

function FESpaces.interpolate_everywhere(
objects::Vector{<:DistributedCellField},fe::DistributedMultiFieldFESpace)
local_objects = local_views(objects)
local_spaces = local_views(fe)
part_fe_fun = map_parts(local_spaces,local_objects...) do f,o...
interpolate_everywhere(o,f)
end
free_values = zero_free_values(fe)
field_fe_fun = DistributedSingleFieldFEFunction[]
for i in 1:num_fields(fe)
free_values_i = restrict_to_field(fe,free_values,i)
fe_space_i = fe.field_fe_space[i]
dirichlet_values_i = get_dirichlet_dof_values(fe_space_i)
fe_fun_i = interpolate_everywhere!(objects[i], free_values_i,dirichlet_values_i,fe_space_i)
push!(field_fe_fun,fe_fun_i)
end
DistributedMultiFieldFEFunction(field_fe_fun,part_fe_fun,free_values)
end


"""
"""
struct DistributedMultiFieldFEBasis{A,B} <: GridapType
Expand Down
17 changes: 17 additions & 0 deletions test/FESpacesTests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,26 @@ function main(parts,das)
uh = interpolate(u,U)
eh = u - uh

uh_dir = interpolate_dirichlet(u,U)
Comment thread
amartinhuertas marked this conversation as resolved.
free_values = zero_free_values(U)
dirichlet_values = get_dirichlet_dof_values(U)
uh_dir2 = interpolate_dirichlet!(u,free_values,dirichlet_values,U)

uh_everywhere = interpolate_everywhere(u,U)
uh_everywhere_ = interpolate_everywhere!(u,free_values,dirichlet_values,U)
eh2 = u - uh_everywhere

uh_everywhere2 = interpolate_everywhere(uh_everywhere,U)
uh_everywhere2_ = interpolate_everywhere!(uh_everywhere,free_values,dirichlet_values,U)
eh3 = u - uh_everywhere2

dΩ = Measure(Ω,3)
cont = ∫( abs2(eh) )dΩ
cont2 = ∫( abs2(eh2) )dΩ
cont3 = ∫( abs2(eh3) )dΩ
@test sqrt(sum(cont)) < 1.0e-9
@test sqrt(sum(cont2)) < 1.0e-9
@test sqrt(sum(cont3)) < 1.0e-9

# Assembly
Ωass = Triangulation(das,model)
Expand Down