mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-20 12:52:14 +00:00
psblas3:
Fixed docs and README.
This commit is contained in:
@@ -3,7 +3,8 @@ include ../../Make.inc
|
||||
# Libraries used
|
||||
#
|
||||
LIBDIR=../../lib/
|
||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
|
||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_base
|
||||
#-lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
|
||||
LDLIBS=$(PSBLDLIBS)
|
||||
#
|
||||
# Compilers and such
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
!
|
||||
program d_coo_matgen
|
||||
use psb_sparse_mod
|
||||
use psb_prec_mod
|
||||
use psb_krylov_mod
|
||||
!!$ use psb_prec_mod
|
||||
!!$ use psb_krylov_mod
|
||||
use psb_d_base_mat_mod
|
||||
use psb_d_csr_mat_mod
|
||||
implicit none
|
||||
@@ -18,7 +18,7 @@ program d_coo_matgen
|
||||
|
||||
! sparse matrix and preconditioner
|
||||
type(psb_d_sparse_mat) :: a
|
||||
type(psb_dprec_type) :: prec
|
||||
!!$ type(psb_dprec_type) :: prec
|
||||
! descriptor
|
||||
type(psb_desc_type) :: desc_a
|
||||
! dense matrices
|
||||
@@ -138,6 +138,8 @@ contains
|
||||
! Note that if a1=a2=a3=a4=0., the PDE is the well-known Laplace equation.
|
||||
!
|
||||
use psb_sparse_mod
|
||||
use psb_d_base_mat_mod
|
||||
use psb_d_csr_mat_mod
|
||||
implicit none
|
||||
integer :: idim
|
||||
integer, parameter :: nb=20
|
||||
@@ -195,6 +197,7 @@ contains
|
||||
nlr = nt
|
||||
call psb_barrier(ictxt)
|
||||
|
||||
call acoo%set_null()
|
||||
t0 = psb_wtime()
|
||||
|
||||
call acoo%allocate(nr,nr)
|
||||
|
||||
+11
-11
@@ -1,8 +1,8 @@
|
||||
!
|
||||
program d_matgen
|
||||
use psb_sparse_mod
|
||||
use psb_prec_mod
|
||||
use psb_krylov_mod
|
||||
!!$ use psb_prec_mod
|
||||
!!$ use psb_krylov_mod
|
||||
use psb_d_base_mat_mod
|
||||
use psb_d_csr_mat_mod
|
||||
use psb_d_mat_mod
|
||||
@@ -19,7 +19,7 @@ program d_matgen
|
||||
|
||||
! sparse matrix and preconditioner
|
||||
type(psb_d_sparse_mat) :: a
|
||||
type(psb_dprec_type) :: prec
|
||||
!!$ type(psb_dprec_type) :: prec
|
||||
! descriptor
|
||||
type(psb_desc_type) :: desc_a
|
||||
! dense matrices
|
||||
@@ -382,13 +382,13 @@ contains
|
||||
call a_n%print(20)
|
||||
anorm = a_n%csnmi()
|
||||
write(0,*) 'Nrm infinity ',anorm
|
||||
call a_n%csget(2,3,element,irow,icol,val,info)
|
||||
write(0,*) 'From csget ',element,info
|
||||
if (info == psb_success_) then
|
||||
do i=1,element
|
||||
write(0,*) irow(i),icol(i),val(i)
|
||||
end do
|
||||
end if
|
||||
!!$ call a_n%csget(2,3,element,irow,icol,val,info)
|
||||
!!$ write(0,*) 'From csget ',element,info
|
||||
!!$ if (info == psb_success_) then
|
||||
!!$ do i=1,element
|
||||
!!$ write(0,*) irow(i),icol(i),val(i)
|
||||
!!$ end do
|
||||
!!$ end if
|
||||
|
||||
isz = a_n%get_size()
|
||||
write(0,*) 'Size 1: ',isz
|
||||
@@ -404,7 +404,7 @@ contains
|
||||
end if
|
||||
!!$
|
||||
t1 = psb_wtime()
|
||||
call a_n%cscnv(info,mold=acxx)
|
||||
call a_n%cscnv(info,mold=acsr)
|
||||
|
||||
if(info /= psb_success_) then
|
||||
info=psb_err_from_subroutine_
|
||||
|
||||
+14
-2
@@ -3,7 +3,7 @@ include ../../Make.inc
|
||||
# Libraries used
|
||||
#
|
||||
LIBDIR=../../lib/
|
||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
|
||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_base
|
||||
LDLIBS=$(PSBLDLIBS)
|
||||
#
|
||||
# Compilers and such
|
||||
@@ -11,17 +11,29 @@ LDLIBS=$(PSBLDLIBS)
|
||||
CCOPT= -g
|
||||
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
|
||||
|
||||
PSBTOBJS=psb_mvsv_tester.o psbtf.o
|
||||
PSBTOBJS=psbtf.o psb_mvsv_tester.o \
|
||||
psb_s_mvsv_tester.o psb_d_mvsv_tester.o psb_c_mvsv_tester.o \
|
||||
psb_z_mvsv_tester.o
|
||||
EXEDIR=./runs
|
||||
|
||||
|
||||
all: psbtf
|
||||
psbtf.o: psb_mvsv_tester.o
|
||||
psb_mvsv_tester.o: psb_s_mvsv_tester.o psb_d_mvsv_tester.o psb_c_mvsv_tester.o \
|
||||
psb_z_mvsv_tester.o
|
||||
|
||||
psbtf: $(PSBTOBJS)
|
||||
$(F90LINK) $(PSBTOBJS) -o psbtf $(PSBLAS_LIB) $(LDLIBS)
|
||||
/bin/mv psbtf $(EXEDIR)
|
||||
|
||||
psbtf.o: psb_mvsv_tester.o
|
||||
|
||||
|
||||
psbt1: psbt1.o
|
||||
$(F90LINK) psbt1.o -o psbt1 $(PSBLAS_LIB) $(LDLIBS)
|
||||
/bin/mv psbt1 $(EXEDIR)
|
||||
|
||||
|
||||
.f90.o:
|
||||
$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
|
||||
|
||||
|
||||
+4
-11087
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user