Merge branch 'development' into remap-coarse

This commit is contained in:
Salvatore Filippone
2020-07-23 12:21:14 +02:00
107 changed files with 3663 additions and 2311 deletions
+6 -6
View File
@@ -2192,7 +2192,7 @@ contains
integer(psb_ipk_) :: lb, ub, m
choice: if (n >5) then
binsrch: if (n > 8) then
lb = 1
ub = n
ipos = -1
@@ -2201,7 +2201,7 @@ contains
m = (lb+ub)/2
if (key==v(m)) then
ipos = m
exit choice
exit binsrch
else if (key < v(m)) then
ub = m-1
else
@@ -2215,7 +2215,7 @@ contains
else
! No binary search, do everything in the final cleanup
ipos = 0
end if choice
end if binsrch
! Final cleanup
! This is needed because V may contain repeated entries
@@ -2239,7 +2239,7 @@ contains
integer(psb_ipk_) :: lb, ub, m
choice: if (n >5) then
binsrch: if (n > 8) then
lb = 1
ub = n
ipos = -1
@@ -2248,7 +2248,7 @@ contains
m = (lb+ub)/2
if (key==v(m)) then
ipos = m
exit choice
exit binsrch
else if (key < v(m)) then
ub = m-1
else
@@ -2262,7 +2262,7 @@ contains
else
! No binary search, do everything in the final cleanup
ipos = 0
end if choice
end if binsrch
! Final cleanup
! This is needed because V may contain repeated entries
+1 -1
View File
@@ -1048,7 +1048,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_complex_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_c_spk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&
+1 -1
View File
@@ -1416,7 +1416,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_int8_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_epk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&
+1 -1
View File
@@ -1416,7 +1416,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_int2_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_i2pk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&
+1 -1
View File
@@ -1416,7 +1416,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_int4_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_mpk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&
+1 -1
View File
@@ -1539,7 +1539,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_real_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_r_spk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&
+1 -1
View File
@@ -1048,7 +1048,7 @@ contains
idx = bsdindx(ip+1)
p2ptag = psb_dcomplex_tag
call mpi_send(valsnd(idx+1:idx+sz),sz,&
& psb_mpi_r_dpk_,prcid(ip+1),&
& psb_mpi_c_dpk_,prcid(ip+1),&
& p2ptag, icomm,iret)
p2ptag = psb_int_swap_tag
call mpi_send(iasnd(idx+1:idx+sz),sz,&