fdurastante
/
amg4psblas
mirror of https://github.com/sfilippone/amg4psblas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unify_aggr_bld' into development

Browse Source
pizdaint-runs
Salvatore Filippone 5 years ago
parent a3f8d802ff f496d4856b
commit 4ba1232533
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File

13
mlprec/impl/mld_c_hierarchy_bld.f90
Unescape Escape View File

@ -273,10 +273,12 @@ subroutine mld_c_hierarchy_bld(a,desc_a,prec,info)
end if end if
! !
! Finest level first; remember to fix base_a and base_desc ! Finest level first; create a GEN_BLOCK
! copy of the descriptor.
! !
prec%precv(1)%base_a => a prec%precv(1)%base_a => a
prec%precv(1)%base_desc => desc_a call psb_cd_renum_block(desc_a,prec%precv(1)%desc_ac,info)
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
newsz = 0 newsz = 0
array_build_loop: do i=2, iszv array_build_loop: do i=2, iszv
! !
@ -317,7 +319,7 @@ subroutine mld_c_hierarchy_bld(a,desc_a,prec,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Return from ',i,' call to mlprcbld ',info & 'Return from ',i,' call to bld_tprol', info
! !
! Save op_prol just in case ! Save op_prol just in case
! !
@ -440,7 +442,10 @@ subroutine mld_c_hierarchy_bld(a,desc_a,prec,info)
! Restart ! Restart
iszv = newsz iszv = newsz
! Fix the pointers, but the level 1 should ! Fix the pointers, but the level 1 should
! be already OK ! be treated differently
if (.not.associated(prec%precv(i)%base_desc,desc_a)) then
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
end if
do i=2, iszv do i=2, iszv
prec%precv(i)%base_a => prec%precv(i)%ac prec%precv(i)%base_a => prec%precv(i)%ac
prec%precv(i)%base_desc => prec%precv(i)%desc_ac prec%precv(i)%base_desc => prec%precv(i)%desc_ac

13
mlprec/impl/mld_d_hierarchy_bld.f90
Unescape Escape View File

@ -273,10 +273,12 @@ subroutine mld_d_hierarchy_bld(a,desc_a,prec,info)
end if end if
! !
! Finest level first; remember to fix base_a and base_desc ! Finest level first; create a GEN_BLOCK
! copy of the descriptor.
! !
prec%precv(1)%base_a => a prec%precv(1)%base_a => a
prec%precv(1)%base_desc => desc_a call psb_cd_renum_block(desc_a,prec%precv(1)%desc_ac,info)
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
newsz = 0 newsz = 0
array_build_loop: do i=2, iszv array_build_loop: do i=2, iszv
! !
@ -317,7 +319,7 @@ subroutine mld_d_hierarchy_bld(a,desc_a,prec,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Return from ',i,' call to mlprcbld ',info & 'Return from ',i,' call to bld_tprol', info
! !
! Save op_prol just in case ! Save op_prol just in case
! !
@ -440,7 +442,10 @@ subroutine mld_d_hierarchy_bld(a,desc_a,prec,info)
! Restart ! Restart
iszv = newsz iszv = newsz
! Fix the pointers, but the level 1 should ! Fix the pointers, but the level 1 should
! be already OK ! be treated differently
if (.not.associated(prec%precv(i)%base_desc,desc_a)) then
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
end if
do i=2, iszv do i=2, iszv
prec%precv(i)%base_a => prec%precv(i)%ac prec%precv(i)%base_a => prec%precv(i)%ac
prec%precv(i)%base_desc => prec%precv(i)%desc_ac prec%precv(i)%base_desc => prec%precv(i)%desc_ac

13
mlprec/impl/mld_s_hierarchy_bld.f90
Unescape Escape View File

@ -273,10 +273,12 @@ subroutine mld_s_hierarchy_bld(a,desc_a,prec,info)
end if end if
! !
! Finest level first; remember to fix base_a and base_desc ! Finest level first; create a GEN_BLOCK
! copy of the descriptor.
! !
prec%precv(1)%base_a => a prec%precv(1)%base_a => a
prec%precv(1)%base_desc => desc_a call psb_cd_renum_block(desc_a,prec%precv(1)%desc_ac,info)
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
newsz = 0 newsz = 0
array_build_loop: do i=2, iszv array_build_loop: do i=2, iszv
! !
@ -317,7 +319,7 @@ subroutine mld_s_hierarchy_bld(a,desc_a,prec,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Return from ',i,' call to mlprcbld ',info & 'Return from ',i,' call to bld_tprol', info
! !
! Save op_prol just in case ! Save op_prol just in case
! !
@ -440,7 +442,10 @@ subroutine mld_s_hierarchy_bld(a,desc_a,prec,info)
! Restart ! Restart
iszv = newsz iszv = newsz
! Fix the pointers, but the level 1 should ! Fix the pointers, but the level 1 should
! be already OK ! be treated differently
if (.not.associated(prec%precv(i)%base_desc,desc_a)) then
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
end if
do i=2, iszv do i=2, iszv
prec%precv(i)%base_a => prec%precv(i)%ac prec%precv(i)%base_a => prec%precv(i)%ac
prec%precv(i)%base_desc => prec%precv(i)%desc_ac prec%precv(i)%base_desc => prec%precv(i)%desc_ac

13
mlprec/impl/mld_z_hierarchy_bld.f90
Unescape Escape View File

@ -273,10 +273,12 @@ subroutine mld_z_hierarchy_bld(a,desc_a,prec,info)
end if end if
! !
! Finest level first; remember to fix base_a and base_desc ! Finest level first; create a GEN_BLOCK
! copy of the descriptor.
! !
prec%precv(1)%base_a => a prec%precv(1)%base_a => a
prec%precv(1)%base_desc => desc_a call psb_cd_renum_block(desc_a,prec%precv(1)%desc_ac,info)
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
newsz = 0 newsz = 0
array_build_loop: do i=2, iszv array_build_loop: do i=2, iszv
! !
@ -317,7 +319,7 @@ subroutine mld_z_hierarchy_bld(a,desc_a,prec,info)
if (debug_level >= psb_debug_outer_) & if (debug_level >= psb_debug_outer_) &
& write(debug_unit,*) me,' ',trim(name),& & write(debug_unit,*) me,' ',trim(name),&
& 'Return from ',i,' call to mlprcbld ',info & 'Return from ',i,' call to bld_tprol', info
! !
! Save op_prol just in case ! Save op_prol just in case
! !
@ -440,7 +442,10 @@ subroutine mld_z_hierarchy_bld(a,desc_a,prec,info)
! Restart ! Restart
iszv = newsz iszv = newsz
! Fix the pointers, but the level 1 should ! Fix the pointers, but the level 1 should
! be already OK ! be treated differently
if (.not.associated(prec%precv(i)%base_desc,desc_a)) then
prec%precv(1)%base_desc => prec%precv(1)%desc_ac
end if
do i=2, iszv do i=2, iszv
prec%precv(i)%base_a => prec%precv(i)%ac prec%precv(i)%base_a => prec%precv(i)%ac
prec%precv(i)%base_desc => prec%precv(i)%desc_ac prec%precv(i)%base_desc => prec%precv(i)%desc_ac

Write Preview
Loading…
Cancel
Save