Merge branch 'development' of github.com:sfilippone/psblas3 into development

This commit is contained in:
Salvatore Filippone
2026-03-26 17:24:27 +01:00
4 changed files with 24 additions and 4 deletions
+6 -1
View File
@@ -440,6 +440,7 @@ contains
#endif
type(psb_c_ell_sparse_mat), target :: aell
type(psb_c_csr_sparse_mat), target :: acsr
type(psb_c_csc_sparse_mat), target :: acsc
type(psb_c_coo_sparse_mat), target :: acoo
type(psb_c_hll_sparse_mat), target :: ahll
type(psb_c_hdia_sparse_mat), target :: ahdia
@@ -484,6 +485,8 @@ contains
amold => ahll
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -498,6 +501,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -514,7 +519,7 @@ contains
& upd=upd,mold=arsb)
#endif
#endif
case('ELL','HLL','CSR','DNS')
case('ELL','HLL','CSR','DNS','CSC')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
#if defined(PSB_HAVE_CUDA)
case('ELG','HLG','CSRG')
+6 -1
View File
@@ -440,6 +440,7 @@ contains
#endif
type(psb_d_ell_sparse_mat), target :: aell
type(psb_d_csr_sparse_mat), target :: acsr
type(psb_d_csc_sparse_mat), target :: acsc
type(psb_d_coo_sparse_mat), target :: acoo
type(psb_d_hll_sparse_mat), target :: ahll
type(psb_d_hdia_sparse_mat), target :: ahdia
@@ -489,6 +490,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -504,6 +507,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -520,7 +525,7 @@ contains
& upd=upd,mold=arsb)
#endif
#endif
case('ELL','HLL','CSR','DNS')
case('ELL','HLL','CSR','DNS','CSC')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
case('HDIA')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
+6 -1
View File
@@ -440,6 +440,7 @@ contains
#endif
type(psb_s_ell_sparse_mat), target :: aell
type(psb_s_csr_sparse_mat), target :: acsr
type(psb_s_csc_sparse_mat), target :: acsc
type(psb_s_coo_sparse_mat), target :: acoo
type(psb_s_hll_sparse_mat), target :: ahll
type(psb_s_hdia_sparse_mat), target :: ahdia
@@ -489,6 +490,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -504,6 +507,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -520,7 +525,7 @@ contains
& upd=upd,mold=arsb)
#endif
#endif
case('ELL','HLL','CSR','DNS')
case('ELL','HLL','CSR','DNS','CSC')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
case('HDIA')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
+6 -1
View File
@@ -440,6 +440,7 @@ contains
#endif
type(psb_z_ell_sparse_mat), target :: aell
type(psb_z_csr_sparse_mat), target :: acsr
type(psb_z_csc_sparse_mat), target :: acsc
type(psb_z_coo_sparse_mat), target :: acoo
type(psb_z_hll_sparse_mat), target :: ahll
type(psb_z_hdia_sparse_mat), target :: ahdia
@@ -484,6 +485,8 @@ contains
amold => ahll
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -498,6 +501,8 @@ contains
amold => ahdia
case('CSR')
amold => acsr
case('CSC')
amold => acsc
case('DNS')
amold => adns
case default
@@ -514,7 +519,7 @@ contains
& upd=upd,mold=arsb)
#endif
#endif
case('ELL','HLL','CSR','DNS')
case('ELL','HLL','CSR','DNS','CSC')
call psb_spasb(ap,descp,info,upd=upd,mold=amold)
#if defined(PSB_HAVE_CUDA)
case('ELG','HLG','CSRG')