Skip to content

Commit b239028

Browse files
jalveszjalvesz
committed
rename to pcg
1 parent ea7d35e commit b239028

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

‎example/linalg/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ADD_EXAMPLE(solve1)
4242
ADD_EXAMPLE(solve2)
4343
ADD_EXAMPLE(solve3)
4444
ADD_EXAMPLE(solve_cg)
45-
ADD_EXAMPLE(solve_pccg)
45+
ADD_EXAMPLE(solve_pcg)
4646
ADD_EXAMPLE(solve_custom)
4747
ADD_EXAMPLE(sparse_from_ijv)
4848
ADD_EXAMPLE(sparse_data_accessors)

‎example/linalg/example_solve_cg.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
program example_solve_pccg
1+
program example_solve_pcg
22
use stdlib_kinds, only: dp
33
use stdlib_linalg_iterative_solvers, only: solve_cg
44

‎example/linalg/example_solve_custom.f90‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module custom_solver
33
use stdlib_sparse
44
use stdlib_linalg_iterative_solvers, only: linop_dp, &
55
solver_workspace_dp, &
6-
solve_pccg_kernel, &
7-
size_wksp_pccg
6+
solve_pcg_kernel, &
7+
size_wksp_pcg
88
implicit none
99
contains
10-
subroutine solve_pccg_custom(A,b,x,di,tol,maxiter,restart,workspace)
10+
subroutine solve_pcg_custom(A,b,x,di,tol,maxiter,restart,workspace)
1111
type(CSR_dp_type), intent(in) :: A
1212
real(dp), intent(in) :: b(:)
1313
real(dp), intent(inout) :: x(:)
@@ -48,15 +48,15 @@ subroutine solve_pccg_custom(A,b,x,di,tol,maxiter,restart,workspace)
4848
else
4949
allocate( workspace_ )
5050
end if
51-
if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,size_wksp_pccg) , source = 0.d0 )
51+
if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,size_wksp_pcg) , source = 0.d0 )
5252
workspace_%callback => my_logger
5353
!-------------------------
5454
! Jacobi preconditionner factorization
5555
call diag(A,diagonal)
5656
where(abs(diagonal)>epsilon(0.d0)) diagonal = 1._dp/diagonal
5757
!-------------------------
5858
! main call to the solver
59-
call solve_pccg_kernel(op,M,b,x,tol_,maxiter_,workspace_)
59+
call solve_pcg_kernel(op,M,b,x,tol_,maxiter_,workspace_)
6060

6161
!-------------------------
6262
! internal memory cleanup
@@ -126,7 +126,7 @@ program example_solve_custom
126126
dirichlet = .false._1
127127
dirichlet([1,5]) = .true._1
128128

129-
call solve_pccg_custom(laplacian_csr, load, x, tol=1.d-6, di=dirichlet)
129+
call solve_pcg_custom(laplacian_csr, load, x, tol=1.d-6, di=dirichlet)
130130
print *, x !> solution: [0.0, 2.5, 5.0, 2.5, 0.0]
131131

132132
end program example_solve_custom

example/linalg/example_solve_pccg.f90 renamed to example/linalg/example_solve_pcg.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
program example_solve_pccg
1+
program example_solve_pcg
22
use stdlib_kinds, only: dp
33
use stdlib_sparse
4-
use stdlib_linalg_iterative_solvers, only: solve_pccg
4+
use stdlib_linalg_iterative_solvers, only: solve_pcg
55

66
type(CSR_dp_type) :: laplacian_csr
77
type(COO_dp_type) :: COO
@@ -23,10 +23,10 @@ program example_solve_pccg
2323
dirichlet = .false._1
2424
dirichlet([1,5]) = .true._1
2525

26-
call solve_pccg(laplacian, load, x, tol=1.d-6, di=dirichlet)
26+
call solve_pcg(laplacian, load, x, tol=1.d-6, di=dirichlet)
2727
print *, x !> solution: [0.0, 2.5, 5.0, 2.5, 0.0]
2828
x = 0._dp
2929

30-
call solve_pccg(laplacian_csr, load, x, tol=1.d-6, di=dirichlet)
30+
call solve_pcg(laplacian_csr, load, x, tol=1.d-6, di=dirichlet)
3131
print *, x !> solution: [0.0, 2.5, 5.0, 2.5, 0.0]
3232
end program

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ set(cppFiles
9595
stdlib_linalg_iterative_aux.fypp
9696
stdlib_linalg_iterative_solvers.fypp
9797
stdlib_linalg_iterative_solvers_cg.fypp
98-
stdlib_linalg_iterative_solvers_pccg.fypp
98+
stdlib_linalg_iterative_solvers_pcg.fypp
9999
)
100100

101101
add_subdirectory(blas)

‎src/stdlib_linalg_iterative_solvers.fypp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ module stdlib_linalg_iterative_solvers
1414
!> details The size of the workspace is defined by the number of vectors used in the iterative solver.
1515
enum, bind(c)
1616
enumerator :: size_wksp_cg = 3
17-
enumerator :: size_wksp_pccg = 4
17+
enumerator :: size_wksp_pcg = 4
1818
end enum
19-
public :: size_wksp_cg, size_wksp_pccg
19+
public :: size_wksp_cg, size_wksp_pcg
2020

2121
!> linear operator class for the iterative solvers
2222
#:for k, t, s in R_KINDS_TYPES
@@ -93,9 +93,9 @@ module stdlib_linalg_iterative_solvers
9393
end interface
9494
public :: solve_cg
9595

96-
interface solve_pccg_kernel
96+
interface solve_pcg_kernel
9797
#:for k, t, s in R_KINDS_TYPES
98-
module subroutine solve_pccg_kernel_${s}$(A,M,b,x,tol,maxiter,workspace)
98+
module subroutine solve_pcg_kernel_${s}$(A,M,b,x,tol,maxiter,workspace)
9999
class(linop_${s}$), intent(in) :: A
100100
class(linop_${s}$), intent(in) :: M !> preconditionner
101101
${t}$, intent(in) :: b(:)
@@ -106,12 +106,12 @@ module stdlib_linalg_iterative_solvers
106106
end subroutine
107107
#:endfor
108108
end interface
109-
public :: solve_pccg_kernel
109+
public :: solve_pcg_kernel
110110

111-
interface solve_pccg
111+
interface solve_pcg
112112
#:for matrix in MATRIX_TYPES
113113
#:for k, t, s in R_KINDS_TYPES
114-
module subroutine solve_pccg_${matrix}$_${s}$(A,b,x,di,tol,maxiter,restart,precond,M,workspace)
114+
module subroutine solve_pcg_${matrix}$_${s}$(A,b,x,di,tol,maxiter,restart,precond,M,workspace)
115115
#:if matrix == "dense"
116116
${t}$, intent(in) :: A(:,:)
117117
#:else
@@ -130,7 +130,7 @@ module stdlib_linalg_iterative_solvers
130130
#:endfor
131131
#:endfor
132132
end interface
133-
public :: solve_pccg
133+
public :: solve_pcg
134134

135135
interface solve_forward_triangular
136136
!> Solve the system L x = b, where L is a strictly lower triangular matrix (diagonal assumed = 1).

src/stdlib_linalg_iterative_solvers_pccg.fypp renamed to src/stdlib_linalg_iterative_solvers_pcg.fypp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#:set MATRIX_TYPES = ["dense", "CSR"]
55
#:set RANKS = range(1, 2+1)
66

7-
submodule(stdlib_linalg_iterative_solvers) stdlib_linalg_iterative_pccg
7+
submodule(stdlib_linalg_iterative_solvers) stdlib_linalg_iterative_pcg
88
use stdlib_kinds
99
use stdlib_sparse
1010
use stdlib_constants
@@ -21,7 +21,7 @@ submodule(stdlib_linalg_iterative_solvers) stdlib_linalg_iterative_pccg
2121
contains
2222

2323
#:for k, t, s in R_KINDS_TYPES
24-
module subroutine solve_pccg_kernel_${s}$(A,M,b,x,tol,maxiter,workspace)
24+
module subroutine solve_pcg_kernel_${s}$(A,M,b,x,tol,maxiter,workspace)
2525
class(linop_${s}$), intent(in) :: A
2626
class(linop_${s}$), intent(in) :: M !> preconditionner
2727
${t}$, intent(in) :: b(:), tol
@@ -85,7 +85,7 @@ contains
8585

8686
#:for matrix in MATRIX_TYPES
8787
#:for k, t, s in R_KINDS_TYPES
88-
module subroutine solve_pccg_${matrix}$_${s}$(A,b,x,di,tol,maxiter,restart,precond,M,workspace)
88+
module subroutine solve_pcg_${matrix}$_${s}$(A,b,x,di,tol,maxiter,restart,precond,M,workspace)
8989
#:if matrix == "dense"
9090
use stdlib_linalg, only: diag
9191
${t}$, intent(in) :: A(:,:)
@@ -175,12 +175,12 @@ contains
175175
else
176176
allocate( workspace_ )
177177
end if
178-
if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,size_wksp_pccg) , source = zero_${s}$ )
178+
if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,size_wksp_pcg) , source = zero_${s}$ )
179179
!-------------------------
180180
! main call to the solver
181181
if(restart_) x = zero_${s}$
182182
x = merge( b, x, di_ ) !> copy dirichlet load conditions encoded in B and indicated by di
183-
call solve_pccg_kernel(op,M_,b,x,tol_,maxiter_,workspace_)
183+
call solve_pcg_kernel(op,M_,b,x,tol_,maxiter_,workspace_)
184184

185185
!-------------------------
186186
! internal memory cleanup
@@ -236,4 +236,4 @@ contains
236236
#:endfor
237237
#:endfor
238238

239-
end submodule stdlib_linalg_iterative_pccg
239+
end submodule stdlib_linalg_iterative_pcg

‎test/linalg/test_linalg_solve_iterative.fypp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module test_linalg_solve_iterative
9797
#:endfor
9898
end subroutine test_solve_ldlt
9999

100-
! TODO: add tests for solve_cg, solve_pccg, etc.
100+
! TODO: add tests for solve_cg, solve_pcg, etc.
101101

102102
end module test_linalg_solve_iterative
103103

0 commit comments

Comments
 (0)