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

psblas3:

Browse Source 
base/modules/psb_base_mat_mod.f03
 base/modules/psb_d_base_mat_mod.f03
 base/modules/psb_linmap_mod.f90
 base/modules/psb_linmap_type_mod.f90
 base/modules/psb_serial_mod.f90
 base/modules/psb_spmat_type.f03
 base/serial/f03/psbn_d_coo_impl.f03
 base/serial/f03/psbn_d_csr_impl.f03
 prec/psb_dbjac_bld.f90
 prec/psb_dilu_fct.f90
 prec/psb_dprecbld.f90
 prec/psb_prec_mod.f90
 prec/psb_prec_type.f90
 test/fileread/df_sample.f90
 util/psb_metispart_mod.F90

1. Taken out psb_dspmat_type from definition modules.
2. Commented out compilation of all old serial stuff; 
3. Fixed (for the time being, but needs more exploration) CP_FROM and
   MV_FROM. 
4. BEWARE: new serial stuff is still incomplete.
This commit is contained in:
Salvatore Filippone
2009-09-22 16:15:42 +00:00
parent adb51fddc5
commit 720fbd161a
15 changed files with 1269 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prec/psb_dbjac_bld.f90
+2 -2
View File
@@ -46,7 +46,7 @@ subroutine psb_dbjac_bld(a,desc_a,p,upd,info)
integer :: i, m
integer :: int_err(5)
character :: trans, unitd
type(psb_dspmat_type) :: atmp
!!$ type(psb_dspmat_type) :: atmp
type(psb_d_csr_sparse_mat), allocatable :: lf, uf
real(psb_dpk_) :: t1,t2,t3,t4,t5,t6, t7, t8
integer nztota, err_act, n_row, nrow_a,n_col, nhalo
@@ -72,7 +72,7 @@ subroutine psb_dbjac_bld(a,desc_a,p,upd,info)
endif
trans = 'N'
unitd = 'U'
call psb_nullify_sp(atmp)
!!$ call psb_nullify_sp(atmp)
call psb_cdcpy(desc_a,p%desc_data,info)
if(info /= 0) then
prec/psb_dilu_fct.f90
+7 -15
View File
@@ -43,11 +43,11 @@ subroutine psb_dilu_fct(a,l,u,d,info,blck)
! .. Array Arguments ..
type(psb_d_sparse_mat),intent(in) :: a
type(psb_d_csr_sparse_mat),intent(inout) :: l,u
type(psb_dspmat_type),intent(in), optional, target :: blck
type(psb_d_sparse_mat),intent(in), optional, target :: blck
real(psb_dpk_), intent(inout) :: d(:)
! .. Local Scalars ..
integer :: l1,l2,m,err_act
type(psb_dspmat_type), pointer :: blck_
type(psb_d_sparse_mat), pointer :: blck_
character(len=20) :: name, ch_err
name='psb_dcsrlu'
info = 0
@@ -64,19 +64,11 @@ subroutine psb_dilu_fct(a,l,u,d,info,blck)
goto 9999
end if
call psb_nullify_sp(blck_) ! Why do we need this? Who knows....
call psb_sp_all(0,0,blck_,1,info)
if(info /= 0) then
info=4010
ch_err='psb_sp_all'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end if
call blck_%csall(0,0,info,1)
blck_%m=0
endif
call psb_dilu_fctint(m,a%get_nrows(),a,blck_%m,blck_,&
call psb_dilu_fctint(m,a%get_nrows(),a,blck_%get_nrows(),blck_,&
& d,l%val,l%ja,l%irp,u%val,u%ja,u%irp,l1,l2,info)
if(info /= 0) then
info=4010
@@ -99,7 +91,7 @@ subroutine psb_dilu_fct(a,l,u,d,info,blck)
if (present(blck)) then
blck_ => null()
else
call psb_sp_free(blck_,info)
call blck_%free()
if(info /= 0) then
info=4010
ch_err='psb_sp_free'
@@ -127,8 +119,8 @@ contains
implicit none
type(psb_d_sparse_mat) :: a
type(psb_dspmat_type) :: b
type(psb_d_sparse_mat) :: a
type(psb_d_sparse_mat) :: b
integer :: m,ma,mb,l1,l2,info
integer, dimension(:) :: lia1,lia2,uia1,uia2
real(psb_dpk_), dimension(:) :: laspk,uaspk,d
prec/psb_dprecbld.f90
-1
View File
@@ -46,7 +46,6 @@ subroutine psb_dprecbld(aa,desc_a,p,info,upd)
& me,np,mglob, err_act
integer :: int_err(5)
character :: upd_
type(psb_dspmat_type), target :: a
integer,parameter :: iroot=psb_root_,iout=60,ilout=40
character(len=20) :: name, ch_err
prec/psb_prec_mod.f90
+8 -8
View File
@@ -86,7 +86,7 @@ module psb_prec_mod
integer, intent(out) :: info
end subroutine psb_sprecinit
subroutine psb_dprecinit(prec,ptype,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
implicit none
type(psb_dprec_type), intent(inout) :: prec
@@ -130,7 +130,7 @@ module psb_prec_mod
integer, intent(out) :: info
end subroutine psb_sprecsets
subroutine psb_dprecseti(prec,what,val,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
implicit none
type(psb_dprec_type), intent(inout) :: prec
@@ -138,7 +138,7 @@ module psb_prec_mod
integer, intent(out) :: info
end subroutine psb_dprecseti
subroutine psb_dprecsetd(prec,what,val,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
implicit none
type(psb_dprec_type), intent(inout) :: prec
@@ -205,7 +205,7 @@ module psb_prec_mod
character(len=1), optional :: trans
end subroutine psb_sprc_aply1
subroutine psb_dprc_aply(prec,x,y,desc_data,info,trans,work)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
type(psb_desc_type),intent(in) :: desc_data
type(psb_dprec_type), intent(in) :: prec
@@ -216,7 +216,7 @@ module psb_prec_mod
real(psb_dpk_),intent(inout), optional, target :: work(:)
end subroutine psb_dprc_aply
subroutine psb_dprc_aply1(prec,x,desc_data,info,trans)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
type(psb_desc_type),intent(in) :: desc_data
type(psb_dprec_type), intent(in) :: prec
@@ -281,7 +281,7 @@ module psb_prec_mod
integer, intent(out) :: info
end subroutine psb_sbjac_aply
subroutine psb_dbjac_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
type(psb_desc_type), intent(in) :: desc_data
type(psb_dprec_type), intent(in) :: prec
@@ -404,7 +404,7 @@ module psb_prec_mod
character, intent(in) :: upd
end subroutine psb_sdiagsc_bld
subroutine psb_ddiagsc_bld(a,desc_a,p,upd,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
use psb_d_mat_mod
integer, intent(out) :: info
@@ -447,7 +447,7 @@ module psb_prec_mod
integer, intent(out) :: info
end subroutine psb_sgprec_aply
subroutine psb_dgprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
use psb_base_mod, only : psb_desc_type, psb_dspmat_type, psb_dpk_
use psb_base_mod, only : psb_desc_type, psb_dpk_
use psb_prec_type, only : psb_dprec_type
type(psb_desc_type),intent(in) :: desc_data
type(psb_dprec_type), intent(in) :: prec
prec/psb_prec_type.f90
+1 -1
View File
@@ -38,7 +38,7 @@ module psb_prec_type
! Reduces size of .mod file.
use psb_base_mod, only : psb_sspmat_type, psb_cspmat_type,&
& psb_dspmat_type, psb_zspmat_type, psb_dpk_, psb_spk_, psb_long_int_k_,&
& psb_zspmat_type, psb_dpk_, psb_spk_, psb_long_int_k_,&
& psb_desc_type, psb_sizeof, psb_sp_free, psb_cdfree,&
& psb_erractionsave, psb_erractionrestore, psb_error, psb_get_errstatus
use psb_d_mat_mod, only : psb_d_sparse_mat