Skip to content

Commit

Permalink
make module private by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@jalvesz
jalvesz committed May 18, 2024
1 parent 6c36f8f commit 91d6c48
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 16 deletions.
41 changes: 25 additions & 16 deletions src/conversion/fsparse_conversions.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ module fsparse_conversions
use fsparse_constants
use fsparse_matrix_gallery
implicit none
private
public :: dense2coo, dense2diagonal
public :: coo2dense, coo2diagonal
public :: coo2csr, csr2coo, csr2diagonal, csr2sellc
public :: csr_block_expansion

interface dense2coo
module procedure dense2coo_sp
Expand Down Expand Up @@ -961,8 +966,7 @@ subroutine csr_block_expansion_sp(CSR,num_dof)

select case(CSR%sym)
case(k_NOSYMMETRY)
block_nnz = num_dof ** 2
CSR%NNZ = CSR%NNZ * block_nnz
CSR%NNZ = CSR%NNZ * num_dof ** 2
case(k_SYMTRISUP,k_SYMTRIINF)
block_nnz = num_dof + num_dof * (num_dof-1) / 2
CSR%NNZ = CSR%nrows * block_nnz + (CSR%NNZ-CSR%nrows) * num_dof ** 2
Expand All @@ -976,7 +980,8 @@ subroutine csr_block_expansion_sp(CSR,num_dof)
case(k_NOSYMMETRY)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand All @@ -991,7 +996,8 @@ subroutine csr_block_expansion_sp(CSR,num_dof)
case(k_SYMTRISUP)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand Down Expand Up @@ -1052,8 +1058,7 @@ subroutine csr_block_expansion_dp(CSR,num_dof)

select case(CSR%sym)
case(k_NOSYMMETRY)
block_nnz = num_dof ** 2
CSR%NNZ = CSR%NNZ * block_nnz
CSR%NNZ = CSR%NNZ * num_dof ** 2
case(k_SYMTRISUP,k_SYMTRIINF)
block_nnz = num_dof + num_dof * (num_dof-1) / 2
CSR%NNZ = CSR%nrows * block_nnz + (CSR%NNZ-CSR%nrows) * num_dof ** 2
Expand All @@ -1067,7 +1072,8 @@ subroutine csr_block_expansion_dp(CSR,num_dof)
case(k_NOSYMMETRY)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand All @@ -1082,7 +1088,8 @@ subroutine csr_block_expansion_dp(CSR,num_dof)
case(k_SYMTRISUP)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand Down Expand Up @@ -1143,8 +1150,7 @@ subroutine csr_block_expansion_csp(CSR,num_dof)

select case(CSR%sym)
case(k_NOSYMMETRY)
block_nnz = num_dof ** 2
CSR%NNZ = CSR%NNZ * block_nnz
CSR%NNZ = CSR%NNZ * num_dof ** 2
case(k_SYMTRISUP,k_SYMTRIINF)
block_nnz = num_dof + num_dof * (num_dof-1) / 2
CSR%NNZ = CSR%nrows * block_nnz + (CSR%NNZ-CSR%nrows) * num_dof ** 2
Expand All @@ -1158,7 +1164,8 @@ subroutine csr_block_expansion_csp(CSR,num_dof)
case(k_NOSYMMETRY)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand All @@ -1173,7 +1180,8 @@ subroutine csr_block_expansion_csp(CSR,num_dof)
case(k_SYMTRISUP)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand Down Expand Up @@ -1234,8 +1242,7 @@ subroutine csr_block_expansion_cdp(CSR,num_dof)

select case(CSR%sym)
case(k_NOSYMMETRY)
block_nnz = num_dof ** 2
CSR%NNZ = CSR%NNZ * block_nnz
CSR%NNZ = CSR%NNZ * num_dof ** 2
case(k_SYMTRISUP,k_SYMTRIINF)
block_nnz = num_dof + num_dof * (num_dof-1) / 2
CSR%NNZ = CSR%nrows * block_nnz + (CSR%NNZ-CSR%nrows) * num_dof ** 2
Expand All @@ -1249,7 +1256,8 @@ subroutine csr_block_expansion_cdp(CSR,num_dof)
case(k_NOSYMMETRY)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i))
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand All @@ -1264,7 +1272,8 @@ subroutine csr_block_expansion_cdp(CSR,num_dof)
case(k_SYMTRISUP)
do i = 1, CSR%nrows
do p = 1, num_dof
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
rowptr_expn(num_dof*(i-1)+p+1) = rowptr_expn(num_dof*(i-1)+p) &
& + num_dof*(CSR%rowptr(i+1)-CSR%rowptr(i)) - p + 1
end do
do p = 1, num_dof
adr1 = rowptr_expn(num_dof*(i-1)+p)
Expand Down
5 changes: 5 additions & 0 deletions src/conversion/fsparse_conversions.fypp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ module fsparse_conversions
use fsparse_constants
use fsparse_matrix_gallery
implicit none
private
public :: dense2coo, dense2diagonal
public :: coo2dense, coo2diagonal
public :: coo2csr, csr2coo, csr2diagonal, csr2sellc
public :: csr_block_expansion

interface dense2coo
#:for k1, t1, s1 in (KINDS_TYPES)
Expand Down
1 change: 1 addition & 0 deletions test/test_matrices.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
module test_fsparse
use testdrive, only: new_unittest, unittest_type, error_type, check
use fsparse
use fsparse_constants
implicit none

contains
Expand Down
1 change: 1 addition & 0 deletions test/test_matrices.fypp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
module test_fsparse
use testdrive, only: new_unittest, unittest_type, error_type, check
use fsparse
use fsparse_constants
implicit none

contains
Expand Down

0 comments on commit 91d6c48

Please sign in to comment.