configure.ac
 configure
 test/serial/d_matgen.f03

Changed to use mpi wrappers for all compilation in non-serial mode.
Changed to make the MOLD passed variable polymorphic.
psblas3-type-indexed
Salvatore Filippone 14 years ago
parent 87ed8861e9
commit 01c4bb031b

3
configure vendored

@ -4486,6 +4486,9 @@ $as_echo "#define HAVE_MPI 1" >>confdefs.h
: :
fi fi
FC="$MPIFC" ;
F77="$MPIF77";
CC="$MPICC";
fi fi
# We leave a default language for the next checks. # We leave a default language for the next checks.

@ -148,6 +148,9 @@ if test "X$MPIF77" = "X" ; then
AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77]) AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77])
fi fi
ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])]) ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])])
FC="$MPIFC" ;
F77="$MPIF77";
CC="$MPICC";
fi fi
# We leave a default language for the next checks. # We leave a default language for the next checks.

@ -156,9 +156,9 @@ contains
integer, allocatable :: irow(:),icol(:),myidx(:) integer, allocatable :: irow(:),icol(:),myidx(:)
real(psb_dpk_), allocatable :: val(:), diag(:) real(psb_dpk_), allocatable :: val(:), diag(:)
type(psb_d_sparse_mat) :: a_n type(psb_d_sparse_mat) :: a_n
type(psb_d_coo_sparse_mat) :: acoo class(psb_d_coo_sparse_mat), allocatable :: acoo
type(psb_d_csr_sparse_mat) :: acsr class(psb_d_csr_sparse_mat), allocatable :: acsr
type(psb_d_cxx_sparse_mat) :: acxx class(psb_d_cxx_sparse_mat), allocatable :: acxx
! deltah dimension of each grid cell ! deltah dimension of each grid cell
! deltat discretization time ! deltat discretization time
real(psb_dpk_) :: deltah, anorm real(psb_dpk_) :: deltah, anorm
@ -170,6 +170,8 @@ contains
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
allocate(psb_d_cxx_sparse_mat :: acxx)
allocate(psb_d_csr_sparse_mat :: acsr)
info = psb_success_ info = psb_success_
name = 'create_matrix' name = 'create_matrix'
!!$ call psb_erractionsave(err_act) !!$ call psb_erractionsave(err_act)
@ -411,6 +413,7 @@ contains
call a_n%get_diag(diag,info) call a_n%get_diag(diag,info)
end if end if
!!$ !!$
t1 = psb_wtime() t1 = psb_wtime()
call a_n%cscnv(info,mold=acsr) call a_n%cscnv(info,mold=acsr)

Loading…
Cancel
Save