Skip to content

Correct return type of contracted_product #1270

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
JordiManyer merged 2 commits into from
Apr 6, 2026
+14 −14
Merged

Correct return type of contracted_product #1270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b48186
Modify return type of contracted_product
ovanvincq Apr 4, 2026
7e7a2bd
Update Operations.jl
ovanvincq Apr 6, 2026
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
28 changes: 14 additions & 14 deletions src/TensorValues/Operations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ end
inner(a::MultiValue{S,Ta,N}, b::MultiValue{S,Tb,N}) where {S,Ta,Tb,N} = contracted_product(Val(N),a,b)

@generated function inner(a::AbstractSymTensorValue{D,Ta}, b::AbstractSymTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(zero($(promote_type(Ta, Tb))))
iszero(D) && return :(zero($(Base.promote_op(*,Ta,Tb))))
str = ""
for i in 1:D
str *= "+ a[$i,$i]*b[$i,$i]"
Expand All @@ -252,7 +252,7 @@ inner(a::MultiValue{S,Ta,N}, b::MultiValue{S,Tb,N}) where {S,Ta,Tb,N} = contract
end

@generated function inner(a::SymFourthOrderTensorValue{D,Ta}, b::SymFourthOrderTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(zero($(promote_type(Ta, Tb))))
iszero(D) && return :(zero($(Base.promote_op(*,Ta,Tb))))

S = Tuple{D,D,D,D}
VInt = change_eltype(a, Int)
Expand All @@ -271,15 +271,15 @@ end
end

function inner(a::SkewSymTensorValue{D,Ta}, b::SkewSymTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return zero(promote_type(Ta, Tb))
iszero(D) && return zero(Base.promote_op(*,Ta,Tb))
2 * inner(VectorValue(a.data), VectorValue(b.data))
end

function inner(a::SkewSymTensorValue{D,Ta}, b::AbstractSymTensorValue{D,Tb}) where {D,Ta,Tb}
zero(promote_type(Ta,Tb))
zero(Base.promote_op(*,Ta,Tb))
end
function inner(a::AbstractSymTensorValue{D,Tb}, b::SkewSymTensorValue{D,Ta}) where {D,Ta,Tb}
zero(promote_type(Ta,Tb))
zero(Base.promote_op(*,Ta,Tb))
end

# TODO These two methods make no sense and shold be removed
Expand Down Expand Up @@ -342,7 +342,7 @@ end

# c_ijkl = a_ijmn*b_mnkl (general case)
@generated function double_contraction(a::SymFourthOrderTensorValue{D,Ta}, b::SymFourthOrderTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(SymFourthOrderTensorValue{0,$(promote_type(Ta, Tb))}())
iszero(D) && return :(SymFourthOrderTensorValue{0,$(Base.promote_op(*,Ta,Tb))}())

str = ""
for j in 1:D
Expand Down Expand Up @@ -394,7 +394,7 @@ end

# c_ij = a_ijkl*b_kl
@generated function double_contraction(a::SymFourthOrderTensorValue{D,Ta}, b::AbstractSymTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(zero(SymTensorValue{D,$(promote_type(Ta, Tb))}))
iszero(D) && return :(zero(SymTensorValue{D,$(Base.promote_op(*,Ta,Tb))}))
str = ""
for i in 1:D
for j in i:D
Expand All @@ -415,7 +415,7 @@ end

# c_ij = a_kl*b_klij
@generated function double_contraction(a::AbstractSymTensorValue{D,Ta}, b::SymFourthOrderTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(zero(SymTensorValue{D,$(promote_type(Ta, Tb))}))
iszero(D) && return :(zero(SymTensorValue{D,$(Base.promote_op(*,Ta,Tb))}))
str = ""
for i in 1:D
for j in i:D
Expand Down Expand Up @@ -457,7 +457,7 @@ Given a square second order tensors `a` and `b`, return `b`ᵀ⋅`a`⋅`b`.
The type of the resulting value is (skew) symmetric stable w.r.t. `typeof(a)`.
"""
function congruent_prod(a::MultiValue{Tuple{D,D},Ta}, b::MultiValue{Tuple{D,D1},Tb}) where {D,D1,Ta,Tb}
T = promote_type(Ta, Tb)
T = Base.promote_op(*,Ta,Tb)
V = _congruent_ret_type(a, D1)
(iszero(D) || iszero(D1)) && return zero(V{T})
V{T}(get_array(transpose(b) ⋅ a ⋅ b))
Expand Down Expand Up @@ -505,7 +505,7 @@ outer(a::MultiValue, b::MultiValue) = contracted_product(Val(0), a, b)

# c_ijkl = a_ij*b_kl
@generated function outer(a::AbstractSymTensorValue{D,Ta}, b::AbstractSymTensorValue{D,Tb}) where {D,Ta,Tb}
iszero(D) && return :(zero(SymFourthOrderTensorValue{D,$(promote_type(Ta, Tb))}))
iszero(D) && return :(zero(SymFourthOrderTensorValue{D,$(Base.promote_op(*,Ta,Tb))}))
str = ""
for i in 1:D
for j in i:D
Expand Down Expand Up @@ -574,13 +574,13 @@ the specific functions above if possible), but is used as default generic implem
Sr = tuple(Sa_keep..., Sb_keep...)
Nr = length(Sr)
Vstr = if Nr == 0
"promote_type(Ta,Tb)"
"Base.promote_op(*,Ta,Tb)"
elseif Nr == 1
"VectorValue{$(Sr[1]),promote_type(Ta,Tb)}"
"VectorValue{$(Sr[1]),Base.promote_op(*,Ta,Tb)}"
elseif Nr == 2
"TensorValue{$(Sr[1]),$(Sr[2]),promote_type(Ta,Tb)}"
"TensorValue{$(Sr[1]),$(Sr[2]),Base.promote_op(*,Ta,Tb)}"
else
"HighOrderTensorValue{$(Tuple{Sr...}),promote_type(Ta,Tb)}"
"HighOrderTensorValue{$(Tuple{Sr...}),Base.promote_op(*,Ta,Tb)}"
end

if (iszero(length(a)) || iszero(length(b)))
Expand Down
Loading