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

Extend Ruge-Stuben solver to complex type #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
13 changes: 7 additions & 6 deletions src/classical.jl
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function extend_heirarchy!(levels, strength, CF, A::SparseMatrixCSC{Ti,Tv}, symm
end

function direct_interpolation(At, T, splitting)
T = typeof(At)(T)
fill!(T.nzval, eltype(At)(1))
T .= At .* T

Expand Down Expand Up @@ -99,7 +100,7 @@ function rs_direct_interpolation_pass2(At::SparseMatrixCSC{Tv,Ti},
row = T.rowval[j]
sval = T.nzval[j]
if splitting[row] == C_NODE
if sval < 0
if real(sval) < 0
sum_strong_neg += sval
else
sum_strong_pos += sval
Expand All @@ -115,7 +116,7 @@ function rs_direct_interpolation_pass2(At::SparseMatrixCSC{Tv,Ti},
if row == i
diag += aval
else
if aval < 0
if real(aval) < 0
sum_all_neg += aval
else
sum_all_pos += aval
Expand All @@ -125,7 +126,7 @@ function rs_direct_interpolation_pass2(At::SparseMatrixCSC{Tv,Ti},

if sum_strong_pos == 0
beta = zero(diag)
if diag >= 0
if real(diag) >= 0
diag += sum_all_pos
end
else
Expand All @@ -134,14 +135,14 @@ function rs_direct_interpolation_pass2(At::SparseMatrixCSC{Tv,Ti},

if sum_strong_neg == 0
alpha = zero(diag)
if diag < 0
if real(diag) < 0
diag += sum_all_neg
end
else
alpha = sum_all_neg / sum_strong_neg
end

if isapprox(diag, 0, atol=eps(Tv))
if isapprox(real(diag), 0, atol=eps(real(Tv)))
neg_coeff = Tv(0)
pos_coeff = Tv(0)
else
Expand All @@ -155,7 +156,7 @@ function rs_direct_interpolation_pass2(At::SparseMatrixCSC{Tv,Ti},
sval = T.nzval[j]
if splitting[row] == C_NODE
Bj[nnz] = row
if sval < 0
if real(sval) < 0
Bx[nnz] = abs(neg_coeff * sval)
else
Bx[nnz] = abs(pos_coeff * sval)
Expand Down
4 changes: 2 additions & 2 deletions src/strength.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function (c::Classical)(At::SparseMatrixCSC{Tv,Ti}) where {Ti,Tv}
θ = c.θ

m, n = size(At)
T = copy(At)
T = real(copy(At))

for i = 1:n
_m = find_max_off_diag(T, i)
Expand Down Expand Up @@ -37,7 +37,7 @@ function (c::Classical)(At::SparseMatrixCSC{Tv,Ti}) where {Ti,Tv}
end

function find_max_off_diag(A, i)
m = zero(eltype(A))
m = real(zero(eltype(A)))
for j in nzrange(A, i)
row = A.rowval[j]
val = A.nzval[j]
Expand Down