Skip to content

Commit

Permalink
Merge pull request #150 from MatthiasSachs/ms/fix-redefinition
Browse files Browse the repository at this point in the history
fixed redefinition of dstate_type and removed unused declarations
  • Loading branch information
cortner authored Nov 29, 2024
2 parents 147b005 + 6fa0fe2 commit 3db4768
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/properties.jl
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ using ACE.Wigner: wigner_D_indices
# ∫_{SO3} D^{ll}_{μμmm} D^*(Q) e^t dQ -> 2L+1 column vector
function vec_cou_coe(rotc::Rot3DCoeffs{T},
l::Integer, m::Integer, μ::Integer,
L::Integer, t::Integer) where {T,N}
L::Integer, t::Integer) where {T}
@assert 0 < t <= 2L+1
D = wigner_D_indices(L)' # Dt = D[:,t] --> # D^* ⋅ e^t
LL = SA[l, L]
Expand Down Expand Up @@ -585,7 +585,7 @@ end
SphericalMatrix{L1, L2, LEN1, LEN2, T, LL}() where {L1, L2, LEN1, LEN2, T, LL} =
SphericalMatrix( zero(SMatrix{LEN1, LEN2, T}), Val{L1}(), Val{L2}() )

SphericalMatrix{L1, L2, LEN1, LEN2, T}() where {L1, L2, LEN1, LEN2, T, LL} =
SphericalMatrix{L1, L2, LEN1, LEN2, T}() where {L1, L2, LEN1, LEN2, T} =
SphericalMatrix( zero(SMatrix{LEN1, LEN2, T}), Val{L1}(), Val{L2}() )

function filter::SphericalMatrix, grp::O3, b::Array)
Expand Down
7 changes: 0 additions & 7 deletions src/states.jl
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,6 @@ end
end


@generated function dstate_type(X::TX) where {TX <: State}
CSYMS = _ctssyms(TX)
quote
typeof( DState( select(_x(X), $CSYMS) ) )
end
end

# -------------------

# the next variant of dstate_type is used to potentially extend
Expand Down
2 changes: 1 addition & 1 deletion src/utils/pools.jl
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Base.size(pA::GenCachedArray, args...) = size(pA.A, args...)
Base.parent(pA::GenCachedArray) = pA.A


function GenArrayCache() where {T}
function GenArrayCache()
nt = nthreads()
vecs = [ Stack{Vector{UInt8}}() for _=1:nt ]
return GenArrayCache(vecs)
Expand Down

0 comments on commit 3db4768

Please sign in to comment.