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.

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

Fix AttachDirichletMap type stability #1050

Merged
merged 4 commits into from
Nov 14, 2024
Merged
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
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### Fixed

- Fixed #974, an error when weak form is real but unknown vector is complex. Since PR[#1050](https://github.com/gridap/Gridap.jl/pull/1050).

## [0.18.7] - 2024-10-8

### Added
Expand Down
1 change: 1 addition & 0 deletions src/Arrays/AlgebraMaps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ function evaluate!(cache,k::MulAddMap,a,b,c)
setsize!(cache,size(c))
d = cache.array
copyto!(d,c)
iszero(k.α) && isone(k.β) && return d
mul!(d,a,b,k.α,k.β)
d
end
Expand Down
7 changes: 4 additions & 3 deletions src/CellData/AttachDirichlet.jl
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ function Arrays.return_cache(k::AttachDirichletMap,matvec::Tuple,vals,mask)
end

function Arrays.evaluate!(cache,k::AttachDirichletMap,matvec::Tuple,vals,mask)
mat, vec = matvec
if mask
mat, vec = matvec
vec_with_bcs = evaluate!(cache,k.muladd,mat,vals,vec)
(mat, vec_with_bcs)
else
matvec
identity_muladd = MulAddMap(0,1)
vec_with_bcs = evaluate!(cache,identity_muladd ,mat,vals,vec)
end
(mat, vec_with_bcs)
end

function Arrays.return_value(k::AttachDirichletMap,mat,vals,mask)
Expand Down
3 changes: 2 additions & 1 deletion src/Fields/ArrayBlocks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,7 @@ function evaluate!(cache,k::MulAddMap,a::ArrayBlock,b::ArrayBlock,c::ArrayBlock)
_setsize_mul!(c1,a,b)
d = evaluate!(c2,unwrap_cached_array,c1)
copyto!(d,c)
iszero(k.α) && isone(k.β) && return d
mul!(d,a,b,k.α,k.β)
d
end
Expand Down Expand Up @@ -1517,4 +1518,4 @@ function Base.show(io::IO,o::ArrayBlockView)
end

LinearAlgebra.diag(a::MatrixBlockView) = view(a.array.array, diag(a.block_map))
LinearAlgebra.diag(a::MatrixBlock) = view(a.array,diag(CartesianIndices(a.array)))
LinearAlgebra.diag(a::MatrixBlock) = view(a.array,diag(CartesianIndices(a.array)))
31 changes: 31 additions & 0 deletions test/GridapTests/issue_974.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using Gridap

T = ComplexF64

# Operator creating a linear system where the matrix and RHS are Float64 but the unknown vector is ComplexF64.
domain = (0, 1, 0, 1)
partition = (4, 4)
model = CartesianDiscreteModel(domain, partition)

order = 1
reffe = ReferenceFE(lagrangian, Float64, order)

V1 = TestFESpace(model, reffe; conformity=:H1, vector_type=Vector{T})
V2 = TestFESpace(model, reffe; conformity=:H1, vector_type=Vector{T})

U1 = TrialFESpace(V1)
U2 = TrialFESpace(V2)

Y = MultiFieldFESpace([V1, V2])
X = MultiFieldFESpace([U1, U2])

degree = 2 * order
Ω = Triangulation(model)
dΩ = Measure(Ω, degree)

# Project constant 1 into both spaces.
a((u1, u2), (v1, v2)) = ∫(v1 * u1)dΩ + ∫(v2 * u2)dΩ
l((v1, v2)) = ∫(v1 + v2)dΩ

op = AffineFEOperator(a, l, X, Y)
uh1, uh2 = solve(op)