Skip to content

Commit c785222

Browse files
Qualify import of Base.Matrix and Base.Array to avoid warnings from Julia 1.12 onwards (#1186)
1 parent 3d79dcc commit c785222

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/terms/Hamiltonian.jl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ function random_orbitals(hamk::HamiltonianBlock, howmany::Integer)
7171
random_orbitals(hamk.basis, hamk.kpoint, howmany)
7272
end
7373

74-
import Base: Matrix, Array
75-
Array(block::HamiltonianBlock) = Matrix(block)
76-
Matrix(block::HamiltonianBlock) = sum(Matrix, block.operators)
77-
Matrix(block::GenericHamiltonianBlock) = sum(Matrix, block.optimized_operators)
74+
Base.Array(block::HamiltonianBlock) = Matrix(block)
75+
Base.Matrix(block::HamiltonianBlock) = sum(Matrix, block.operators)
76+
Base.Matrix(block::GenericHamiltonianBlock) = sum(Matrix, block.optimized_operators)
7877

7978
struct Hamiltonian
8079
basis::PlaneWaveBasis

src/terms/operators.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ end
9393
function apply!(Hψ, op::FourierMultiplication, ψ)
9494
.fourier .+= op.multiplier .* ψ.fourier
9595
end
96-
Matrix(op::FourierMultiplication) = Array(Diagonal(op.multiplier))
96+
Base.Matrix(op::FourierMultiplication) = Array(Diagonal(op.multiplier))
9797

9898
"""
9999
Nonlocal operator in Fourier space in Kleinman-Bylander format,
@@ -110,7 +110,7 @@ end
110110
function apply!(Hψ, op::NonlocalOperator, ψ)
111111
mul!(Hψ.fourier, op.P, (op.D * (op.P' * ψ.fourier)), 1, 1)
112112
end
113-
Matrix(op::NonlocalOperator) = op.P * op.D * op.P'
113+
Base.Matrix(op::NonlocalOperator) = op.P * op.D * op.P'
114114

115115
"""
116116
Magnetic field operator A⋅(-i∇).
@@ -130,7 +130,7 @@ function apply!(Hψ, op::MagneticFieldOperator, ψ)
130130
.real .+= op.Apot[α] .* ∂αψ_real
131131
end
132132
end
133-
# TODO Implement Matrix(op::MagneticFieldOperator)
133+
# TODO Implement Base.Matrix(op::MagneticFieldOperator)
134134

135135
@doc raw"""
136136
Nonlocal "divAgrad" operator ``-½ ∇ ⋅ (A ∇)`` where ``A`` is a scalar field on the
@@ -153,7 +153,7 @@ function apply!(Hψ, op::DivAgradOperator, ψ;
153153
.fourier .-= im .* G_plus_k[α] .* A∇ψ ./ 2
154154
end
155155
end
156-
# TODO Implement Matrix(op::DivAgradOperator)
156+
# TODO Implement Base.Matrix(op::DivAgradOperator)
157157

158158

159159
# Optimize RFOs by combining terms that can be combined

0 commit comments

Comments
 (0)