Merge branch 'main' into berggren
This commit is contained in:
commit
59f74b0263
|
|
@ -17,7 +17,7 @@ E_max = 30
|
|||
println("No of threads = ", Threads.nthreads())
|
||||
|
||||
@time "Basis" begin
|
||||
Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max)
|
||||
Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max, Λ)
|
||||
l_max = max(maximum(l1s), maximum(l2s))
|
||||
n_max = max(maximum(n1s), maximum(n2s))
|
||||
mask1 = (n2s .== n2s') .&& (l2s .== l2s')
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ function get_sp_basis(E_max)
|
|||
return (Es, ns, ls)
|
||||
end
|
||||
|
||||
function get_2p_basis(E_max)
|
||||
function get_2p_basis(E_max, Λ=-1)
|
||||
Es = Int[]
|
||||
n1s = Int[]
|
||||
l1s = Int[]
|
||||
|
|
@ -42,6 +42,7 @@ function get_2p_basis(E_max)
|
|||
for n2 in 0 : (E - 2*n1) ÷ 2
|
||||
for l1 in 0 : (E - 2*n1 - 2*n2)
|
||||
l2 = E - 2*n1 - 2*n2 - l1
|
||||
if Λ≥0 && !triangle_ineq(l1, l2, Λ); continue; end
|
||||
push!(Es, E)
|
||||
push!(n1s, n1)
|
||||
push!(l1s, l1)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ E_max = 40
|
|||
println("No of threads = ", Threads.nthreads())
|
||||
|
||||
@time "Basis" begin
|
||||
Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max)
|
||||
Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max, Λ)
|
||||
mask1 = (n2s .== n2s') .&& (l2s .== l2s')
|
||||
mask2 = (n1s .== n1s') .&& (l1s .== l1s')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ E_max = 30
|
|||
|
||||
println("No of threads = ", Threads.nthreads())
|
||||
|
||||
@time "Basis" Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max)
|
||||
@time "Basis" Es, n1s, l1s, n2s, l2s = get_2p_basis(E_max, Λ)
|
||||
|
||||
println("Basis size = ", length(Es))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue