Bug fixes, rename :umfpacklu -> :umfpack

Author: j-fu

Project.toml

@@ -1,7 +1,7 @@
 name = "ExtendableSparse"
 uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
 authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
-version = "0.5.0"
+version = "0.5.1"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

src/factorizations.jl

@@ -74,7 +74,7 @@ $(_myprint(default_options))
 
 """
 const default_options=Dict{Symbol,Any}(
-    :kind         => :umfpacklu,
+    :kind         => :umfpack,
     :droptol      => 1.0e-3,
     :ensurelu     => false,
 )
@@ -101,7 +101,7 @@ end
 """
 ```
 factorize(matrix)
-factorize(matrix; kind=:umfpacklu)
+factorize(matrix; kind=:umfpack)
 ```
 Default Julia LU factorization based on UMFPACK.
 
@@ -144,7 +144,7 @@ Create the  [`AMGPreconditioner`](@ref) wrapping the Ruge-Stüben AMG preconditi
 """
 function factorize(A::ExtendableSparseMatrix; kwargs...)
     opt=options(;kwargs...)
-    opt[:kind]==:umfpacklu && return  ExtendableSparseUmfpackLU(A)
+    opt[:kind]==:umfpack && return  ExtendableSparseUmfpackLU(A)
     opt[:kind]==:pardiso && return  PardisoLU(A,ps=Pardiso.PardisoSolver())
     opt[:kind]==:mklpardiso && return  PardisoLU(A,ps=Pardiso.MKLPardisoSolver())
     if opt[:ensurelu]

src/ilut.jl

@@ -19,7 +19,7 @@ function ILUTPreconditioner(A::ExtendableSparseMatrix; droptol=1.0e-3)
     ILUTPreconditioner(A,IncompleteLU.ilu(A.cscmatrix,τ=droptol),droptol)
 end
 
-function update!(precon::ILUTPreconditioner, A::ExtendableSparseMatrix)
+function update!(precon::ILUTPreconditioner)
     A=precon.A
     @inbounds flush!(A)
     precon.fact=IncompleteLU.ilu(A.cscmatrix,τ=precon.droptol)

src/jacobi.jl

@@ -3,13 +3,13 @@ $(TYPEDEF)
 
 Jacobi preconditoner
 """
-struct JacobiPreconditioner{Tv, Ti} <: AbstractExtendableSparsePreconditioner{Tv,Ti}
-    extmatrix::ExtendableSparseMatrix{Tv,Ti}
+mutable struct JacobiPreconditioner{Tv, Ti} <: AbstractExtendableSparsePreconditioner{Tv,Ti}
+    A::ExtendableSparseMatrix{Tv,Ti}
     invdiag::Array{Tv,1}
 end
 
 function update!(precon::JacobiPreconditioner)
-    cscmatrix=precon.extmatrix.cscmatrix
+    cscmatrix=precon.A.cscmatrix
     invdiag=precon.invdiag
     n=cscmatrix.n
     @inbounds for i=1:n
@@ -20,15 +20,15 @@ end
 
 """
 ```
-JacobiPreconditioner(extmatrix)
+JacobiPreconditioner(A)
 JacobiPreconditioner(cscmatrix)
 ```
 """
-function JacobiPreconditioner(extmatrix::ExtendableSparseMatrix{Tv,Ti}) where {Tv,Ti}
-    @assert size(extmatrix,1)==size(extmatrix,2)
-    flush!(extmatrix)
-    invdiag=Array{Tv,1}(undef,extmatrix.cscmatrix.n)
-    precon=JacobiPreconditioner{Tv, Ti}(extmatrix,invdiag)
+function JacobiPreconditioner(A::ExtendableSparseMatrix{Tv,Ti}) where {Tv,Ti}
+    @assert size(A,1)==size(A,2)
+    flush!(A)
+    invdiag=Array{Tv,1}(undef,A.cscmatrix.n)
+    precon=JacobiPreconditioner{Tv, Ti}(A,invdiag)
     update!(precon)
 end
 

src/parallel_jacobi.jl

@@ -3,13 +3,13 @@ $(TYPEDEF)
 
 Parallel Jacobi preconditioner
 """
-struct ParallelJacobiPreconditioner{Tv, Ti} <: AbstractExtendableSparsePreconditioner{Tv,Ti}
-    extmatrix::ExtendableSparseMatrix{Tv,Ti}
+mutable struct ParallelJacobiPreconditioner{Tv, Ti} <: AbstractExtendableSparsePreconditioner{Tv,Ti}
+    A::ExtendableSparseMatrix{Tv,Ti}
     invdiag::Array{Tv,1}
 end
 
 function update!(precon::ParallelJacobiPreconditioner)
-    cscmatrix=precon.extmatrix.cscmatrix
+    cscmatrix=precon.A.cscmatrix
     invdiag=precon.invdiag
     n=cscmatrix.n
     Threads.@threads for i=1:n
@@ -20,15 +20,15 @@ end
 
 """
 ```
-ParallelJacobiPreconditioner(extmatrix)
+ParallelJacobiPreconditioner(A)
 ParallelJacobiPreconditioner(cscmatrix)
 ```
 """
-function ParallelJacobiPreconditioner(extmatrix::ExtendableSparseMatrix{Tv,Ti}) where {Tv,Ti}
-    @assert size(extmatrix,1)==size(extmatrix,2)
-    flush!(extmatrix)
-    invdiag=Array{Tv,1}(undef,extmatrix.cscmatrix.n)
-    precon=JacobiPreconditioner{Tv, Ti}(extmatrix,invdiag)
+function ParallelJacobiPreconditioner(A::ExtendableSparseMatrix{Tv,Ti}) where {Tv,Ti}
+    @assert size(A,1)==size(A,2)
+    flush!(A)
+    invdiag=Array{Tv,1}(undef,A.cscmatrix.n)
+    precon=JacobiPreconditioner{Tv, Ti}(A,invdiag)
     update!(precon)
 end
 

test/runtests.jl

@@ -285,7 +285,7 @@ end
 
 
 
-function test_lu(k,l,m; kind=:umfpacklu)
+function test_lu(k,l,m; kind=:umfpack)
     Acsc=fdrand(k,l,m,rand=()->1,matrixtype=SparseMatrixCSC)
     b=rand(k*l*m)
     LUcsc=lu(Acsc)
@@ -307,7 +307,7 @@ function test_lu(k,l,m; kind=:umfpacklu)
     x1csc≈x1ext && x2csc ≈ x2ext
 end
 
-function test_lupattern1(k,l,m; kind=:umfpacklu)
+function test_lupattern1(k,l,m; kind=:umfpack)
     Aext=fdrand(k,l,m,rand=()->1,matrixtype=ExtendableSparseMatrix)
     b=rand(k*l*m)
     LUext=lu(Aext,kind=kind)