mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-19 12:22:10 +00:00
Merge branch 'new-context' into remap-coarse & fix
# Conflicts: # base/modules/desc/psb_desc_mod.F90 # base/modules/penv/psi_penv_mod.F90
This commit is contained in:
Salvatore Filippone
@@ -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
|
||||
|
||||
@@ -190,13 +190,14 @@ module psb_cd_tools_mod
|
||||
|
||||
interface psb_cdall
|
||||
|
||||
subroutine psb_cdall(ictxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,&
|
||||
subroutine psb_cdall(ctxt, desc, info,mg,ng,parts,vg,vl,flag,nl,repl,&
|
||||
& globalcheck,lidx,usehash)
|
||||
import :: psb_ipk_, psb_lpk_, psb_desc_type, psb_parts
|
||||
import :: psb_ipk_, psb_lpk_, psb_desc_type, psb_parts, psb_ctxt_type
|
||||
implicit None
|
||||
procedure(psb_parts) :: parts
|
||||
integer(psb_lpk_), intent(in) :: mg,ng, vl(:)
|
||||
integer(psb_ipk_), intent(in) :: ictxt, vg(:), lidx(:),nl
|
||||
type(psb_ctxt_type) :: ctxt
|
||||
integer(psb_ipk_), intent(in) :: vg(:), lidx(:),nl
|
||||
integer(psb_ipk_), intent(in) :: flag
|
||||
logical, intent(in) :: repl, globalcheck, usehash
|
||||
integer(psb_ipk_), intent(out) :: info
|
||||
@@ -352,7 +353,12 @@ contains
|
||||
integer(psb_ipk_), intent(out) :: info
|
||||
class(psb_i_base_vect_type), optional, intent(in) :: mold
|
||||
|
||||
call psb_icdasb(desc,info,ext_hv=.false.,mold=mold)
|
||||
if (desc%indxmap%get_fmt() == 'NULL') then
|
||||
! Do nothing
|
||||
info = 0
|
||||
else
|
||||
call psb_icdasb(desc,info,ext_hv=.false.,mold=mold)
|
||||
end if
|
||||
end subroutine psb_cdasb
|
||||
|
||||
|
||||
|
||||
@@ -432,8 +432,8 @@ Module psb_d_tools_mod
|
||||
end interface
|
||||
|
||||
interface psb_remap
|
||||
subroutine psb_d_remap(np_remap, desc_in, a_in, desc_out, &
|
||||
& ipd, isrc, nrsrc, a_out, info)
|
||||
subroutine psb_d_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_d_tools_mod
|
||||
type(psb_dspmat_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_d_remap
|
||||
end interface psb_remap
|
||||
|
||||
|
||||
end module psb_d_tools_mod
|
||||
|
||||
@@ -170,5 +170,4 @@ Module psb_i_tools_mod
|
||||
end subroutine psb_iins_multivect
|
||||
end interface
|
||||
|
||||
|
||||
end module psb_i_tools_mod
|
||||
|
||||
@@ -170,5 +170,4 @@ Module psb_l_tools_mod
|
||||
end subroutine psb_lins_multivect
|
||||
end interface
|
||||
|
||||
|
||||
end module psb_l_tools_mod
|
||||
|
||||
@@ -432,8 +432,8 @@ Module psb_s_tools_mod
|
||||
end interface
|
||||
|
||||
interface psb_remap
|
||||
subroutine psb_s_remap(np_remap, desc_in, a_in, desc_out, &
|
||||
& ipd, isrc, nrsrc, a_out, info)
|
||||
subroutine psb_s_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_s_tools_mod
|
||||
type(psb_sspmat_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_s_remap
|
||||
end interface psb_remap
|
||||
|
||||
|
||||
end module psb_s_tools_mod
|
||||
|
||||
@@ -432,8 +432,8 @@ Module psb_z_tools_mod
|
||||
end interface
|
||||
|
||||
interface psb_remap
|
||||
subroutine psb_z_remap(np_remap, desc_in, a_in, desc_out, &
|
||||
& ipd, isrc, nrsrc, a_out, info)
|
||||
subroutine psb_z_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_z_tools_mod
|
||||
type(psb_zspmat_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_z_remap
|
||||
end interface psb_remap
|
||||
|
||||
|
||||
end module psb_z_tools_mod
|
||||
|
||||
Reference in New Issue
Block a user