fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-21 05:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-context' into remap-coarse

Browse Source 
# Conflicts:
#	base/modules/psi_i_mod.F90
#	base/serial/psb_dgelp.f90
#	base/serial/psb_sgelp.f90
This commit is contained in:
Salvatore Filippone
2020-12-03 09:02:13 +01:00
parent f0663512b2 d1c1222209
commit 0a0812938b
180 changed files with 33698 additions and 4515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/tools/Makefile
+2 -1
View File
@@ -27,7 +27,8 @@ FOBJS = psb_cdall.o psb_cdals.o psb_cdalv.o psb_cd_inloc.o psb_cdins.o psb_cdprt
psb_s_map.o psb_d_map.o psb_c_map.o psb_z_map.o \
psb_s_par_csr_spspmm.o psb_d_par_csr_spspmm.o psb_c_par_csr_spspmm.o psb_z_par_csr_spspmm.o \
psb_s_glob_transpose.o psb_d_glob_transpose.o psb_c_glob_transpose.o psb_z_glob_transpose.o \
psb_cgetelem.o psb_dgetelem.o psb_sgetelem.o psb_zgetelem.o
psb_cgetelem.o psb_dgetelem.o psb_sgetelem.o psb_zgetelem.o \
psb_c_remap.o psb_s_remap.o psb_d_remap.o psb_z_remap.o
# psb_lallc.o psb_lasb.o psb_lfree.o psb_lins.o \
MPFOBJS = psb_icdasb.o psb_ssphalo.o psb_dsphalo.o psb_csphalo.o psb_zsphalo.o \
base/tools/psb_cspalloc.f90
+1 -1
View File
@@ -102,7 +102,7 @@ subroutine psb_cspalloc(a, desc_a, info, nnz)
& ':allocating size:',loc_row,loc_col,nnz_
call a%free()
!....allocate aspk, ia1, ia2.....
call a%csall(loc_row,loc_col,info,nz=nnz_)
call a%allocate(loc_row,loc_col,info,nz=nnz_)
if(info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='sp_all')
base/tools/psb_dspalloc.f90
+1 -1
View File
@@ -102,7 +102,7 @@ subroutine psb_dspalloc(a, desc_a, info, nnz)
& ':allocating size:',loc_row,loc_col,nnz_
call a%free()
!....allocate aspk, ia1, ia2.....
call a%csall(loc_row,loc_col,info,nz=nnz_)
call a%allocate(loc_row,loc_col,info,nz=nnz_)
if(info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='sp_all')
base/tools/psb_sspalloc.f90
+1 -1
View File
@@ -102,7 +102,7 @@ subroutine psb_sspalloc(a, desc_a, info, nnz)
& ':allocating size:',loc_row,loc_col,nnz_
call a%free()
!....allocate aspk, ia1, ia2.....
call a%csall(loc_row,loc_col,info,nz=nnz_)
call a%allocate(loc_row,loc_col,info,nz=nnz_)
if(info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='sp_all')
base/tools/psb_zspalloc.f90
+1 -1
View File
@@ -102,7 +102,7 @@ subroutine psb_zspalloc(a, desc_a, info, nnz)
& ':allocating size:',loc_row,loc_col,nnz_
call a%free()
!....allocate aspk, ia1, ia2.....
call a%csall(loc_row,loc_col,info,nz=nnz_)
call a%allocate(loc_row,loc_col,info,nz=nnz_)
if(info /= psb_success_) then
info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='sp_all')