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

Merge branch 'new-context' into remap-coarse & fix

Browse Source 
# Conflicts:
#	base/modules/desc/psb_desc_mod.F90
#	base/modules/penv/psi_penv_mod.F90
This commit is contained in:
Salvatore Filippone
2020-11-19 14:38:48 +01:00
parent 4bc326d06b 9178d63ebd
commit 7124e8abdf
511 changed files with 11228 additions and 12970 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/modules/tools/psb_c_tools_mod.F90
+3 -4
View File
@@ -432,8 +432,8 @@ Module psb_c_tools_mod
end interface
interface psb_remap
subroutine psb_c_remap(np_remap, desc_in, a_in, desc_out, &
& ipd, isrc, nrsrc, a_out, info)
subroutine psb_c_remap(np_remap, desc_in, a_in, &
& ipd, isrc, nrsrc, naggr, desc_out, a_out, info)
import
implicit none
!....parameters...
@@ -443,10 +443,9 @@ Module psb_c_tools_mod
type(psb_cspmat_type), intent(out) :: a_out
type(psb_desc_type), intent(out) :: desc_out
integer(psb_ipk_), intent(out) :: ipd
integer(psb_ipk_), allocatable, intent(out) :: isrc(:), nrsrc(:)
integer(psb_ipk_), allocatable, intent(out) :: isrc(:), nrsrc(:), naggr(:)
integer(psb_ipk_), intent(out) :: info
end subroutine psb_c_remap
end interface psb_remap
end module psb_c_tools_mod