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

Switch from KRYLOV to LINSOLVE

Browse Source
repack-newsolve
sfilippone 2 months ago
parent 60324084d8
commit 08a0c744b1
51 changed files with 60 additions and 68 deletions
Show Stats Download Patch File Download Diff File

2
Make_n.inc.in
Unescape Escape View File

@ -49,7 +49,7 @@ PSBLAS_INCLUDES=@PSBLAS_INCLUDES@
PSBLAS_LIBS=@PSBLAS_LIBS@ PSBLAS_LIBS=@PSBLAS_LIBS@
PSBBASEMODNAME=psb_base_mod PSBBASEMODNAME=psb_base_mod
PSBPRECMODNAME=psb_prec_mod PSBPRECMODNAME=psb_prec_mod
PSBMETHDMODNAME=psb_krylov_mod PSBMETHDMODNAME=psb_linsolve_mod
PSBUTILMODNAME=psb_util_mod PSBUTILMODNAME=psb_util_mod

6
amgprec/impl/level/amg_c_base_onelev_dump.f90
Unescape Escape View File

@ -127,8 +127,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head,ivr=ivr)
!call lv%tprol%print(fname,head=head,ivr=ivr)
end if end if
end if end if
else else
@ -151,8 +150,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
if (tprol_) then if (tprol_) then
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head)
!call lv%tprol%print(fname,head=head)
end if end if
end if end if
end if end if

6
amgprec/impl/level/amg_d_base_onelev_dump.f90
Unescape Escape View File

@ -127,8 +127,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head,ivr=ivr)
!call lv%tprol%print(fname,head=head,ivr=ivr)
end if end if
end if end if
else else
@ -151,8 +150,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
if (tprol_) then if (tprol_) then
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head)
!call lv%tprol%print(fname,head=head)
end if end if
end if end if
end if end if

6
amgprec/impl/level/amg_s_base_onelev_dump.f90
Unescape Escape View File

@ -127,8 +127,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head,ivr=ivr)
!call lv%tprol%print(fname,head=head,ivr=ivr)
end if end if
end if end if
else else
@ -151,8 +150,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
if (tprol_) then if (tprol_) then
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head)
!call lv%tprol%print(fname,head=head)
end if end if
end if end if
end if end if

6
amgprec/impl/level/amg_z_base_onelev_dump.f90
Unescape Escape View File

@ -127,8 +127,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.) ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head,ivr=ivr)
!call lv%tprol%print(fname,head=head,ivr=ivr)
end if end if
end if end if
else else
@ -151,8 +150,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
if (tprol_) then if (tprol_) then
write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx' write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
! !
! This is not implemented yet. call lv%tprol%print(fname,head=head)
!call lv%tprol%print(fname,head=head)
end if end if
end if end if
end if end if

2
amgprec/impl/smoother/amg_c_jac_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_c_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_c_diag_solver use amg_c_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_c_jac_smoother, amg_protect_name => amg_c_jac_smoother_apply_vect use amg_c_jac_smoother, amg_protect_name => amg_c_jac_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/smoother/amg_d_jac_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_d_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_d_diag_solver use amg_d_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_d_jac_smoother, amg_protect_name => amg_d_jac_smoother_apply_vect use amg_d_jac_smoother, amg_protect_name => amg_d_jac_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_d_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_d_diag_solver use amg_d_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_d_poly_smoother, amg_protect_name => amg_d_poly_smoother_apply_vect use amg_d_poly_smoother, amg_protect_name => amg_d_poly_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/smoother/amg_s_jac_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_s_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_s_diag_solver use amg_s_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_s_jac_smoother, amg_protect_name => amg_s_jac_smoother_apply_vect use amg_s_jac_smoother, amg_protect_name => amg_s_jac_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_s_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_s_diag_solver use amg_s_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_s_poly_smoother, amg_protect_name => amg_s_poly_smoother_apply_vect use amg_s_poly_smoother, amg_protect_name => amg_s_poly_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/smoother/amg_z_jac_smoother_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_z_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_z_diag_solver use amg_z_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_z_jac_smoother, amg_protect_name => amg_z_jac_smoother_apply_vect use amg_z_jac_smoother, amg_protect_name => amg_z_jac_smoother_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_c_jac_solver_apply.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_c_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_c_diag_solver use amg_c_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_c_jac_solver_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_c_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_c_diag_solver use amg_c_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply_vect use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_c_krm_solver_impl.f90
Unescape Escape View File

@ -169,7 +169,7 @@ subroutine amg_c_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
& trans,work,wv,info,init,initu) & trans,work,wv,info,init,initu)
use psb_base_mod use psb_base_mod
use psb_krylov_mod use psb_linsolve_mod
use amg_c_krm_solver, amg_protect_name => amg_c_krm_solver_apply_vect use amg_c_krm_solver, amg_protect_name => amg_c_krm_solver_apply_vect
Implicit None Implicit None

2
amgprec/impl/solver/amg_d_jac_solver_apply.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_d_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_d_diag_solver use amg_d_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_d_jac_solver_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_d_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_d_diag_solver use amg_d_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply_vect use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_d_krm_solver_impl.f90
Unescape Escape View File

@ -169,7 +169,7 @@ subroutine amg_d_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
& trans,work,wv,info,init,initu) & trans,work,wv,info,init,initu)
use psb_base_mod use psb_base_mod
use psb_krylov_mod use psb_linsolve_mod
use amg_d_krm_solver, amg_protect_name => amg_d_krm_solver_apply_vect use amg_d_krm_solver, amg_protect_name => amg_d_krm_solver_apply_vect
Implicit None Implicit None

2
amgprec/impl/solver/amg_s_jac_solver_apply.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_s_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_s_diag_solver use amg_s_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_s_jac_solver_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_s_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_s_diag_solver use amg_s_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply_vect use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_s_krm_solver_impl.f90
Unescape Escape View File

@ -169,7 +169,7 @@ subroutine amg_s_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
& trans,work,wv,info,init,initu) & trans,work,wv,info,init,initu)
use psb_base_mod use psb_base_mod
use psb_krylov_mod use psb_linsolve_mod
use amg_s_krm_solver, amg_protect_name => amg_s_krm_solver_apply_vect use amg_s_krm_solver, amg_protect_name => amg_s_krm_solver_apply_vect
Implicit None Implicit None

2
amgprec/impl/solver/amg_z_jac_solver_apply.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_z_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_z_diag_solver use amg_z_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_z_jac_solver_apply_vect.f90
Unescape Escape View File

@ -40,7 +40,7 @@ subroutine amg_z_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
use psb_base_mod use psb_base_mod
use amg_z_diag_solver use amg_z_diag_solver
use psb_base_krylov_conv_mod, only : log_conv use psb_base_linsolve_conv_mod, only : log_conv
use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply_vect use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply_vect
implicit none implicit none
type(psb_desc_type), intent(in) :: desc_data type(psb_desc_type), intent(in) :: desc_data

2
amgprec/impl/solver/amg_z_krm_solver_impl.f90
Unescape Escape View File

@ -169,7 +169,7 @@ subroutine amg_z_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
& trans,work,wv,info,init,initu) & trans,work,wv,info,init,initu)
use psb_base_mod use psb_base_mod
use psb_krylov_mod use psb_linsolve_mod
use amg_z_krm_solver, amg_protect_name => amg_z_krm_solver_apply_vect use amg_z_krm_solver, amg_protect_name => amg_z_krm_solver_apply_vect
Implicit None Implicit None

4
config/pac.m4
Unescape Escape View File

@ -409,7 +409,7 @@ save_LDFLAGS=$LDFLAGS;
## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir]) ## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
## PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib" ## PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib"
## fi ## fi
PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR" PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext 1>&5' dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext 1>&5'
@ -484,7 +484,7 @@ dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES" PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES"
fi fi
FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS"
PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS" PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext 1>&5' dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext 1>&5'

8
configure vendored
Unescape Escape View File

@ -7417,7 +7417,7 @@ then
FIFLAG="-I" FIFLAG="-I"
BASEMODNAME=PSB_BASE_MOD BASEMODNAME=PSB_BASE_MOD
PRECMODNAME=PSB_PREC_MOD PRECMODNAME=PSB_PREC_MOD
METHDMODNAME=PSB_KRYLOV_MOD METHDMODNAME=PSB_LINSOLVE_MOD
UTILMODNAME=PSB_UTIL_MOD UTILMODNAME=PSB_UTIL_MOD
else else
@ -7550,7 +7550,7 @@ printf "%s\n" "$ax_cv_f90_modflag" >&6; }
FIFLAG=-I FIFLAG=-I
BASEMODNAME=psb_base_mod BASEMODNAME=psb_base_mod
PRECMODNAME=psb_prec_mod PRECMODNAME=psb_prec_mod
METHDMODNAME=psb_krylov_mod METHDMODNAME=psb_linsolve_mod
UTILMODNAME=psb_util_mod UTILMODNAME=psb_util_mod
fi fi
@ -7683,7 +7683,7 @@ save_LDFLAGS=$LDFLAGS;
## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir]) ## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
## PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib" ## PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib"
## fi ## fi
PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR" PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5'
@ -7787,7 +7787,7 @@ elif test "x$pac_cv_psblas_dir" != "x"; then
PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES" PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES"
fi fi
FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS" FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS"
PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS" PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS" LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"

4
configure.ac
Unescape Escape View File

@ -525,7 +525,7 @@ then
FIFLAG="-I" FIFLAG="-I"
BASEMODNAME=PSB_BASE_MOD BASEMODNAME=PSB_BASE_MOD
PRECMODNAME=PSB_PREC_MOD PRECMODNAME=PSB_PREC_MOD
METHDMODNAME=PSB_KRYLOV_MOD METHDMODNAME=PSB_LINSOLVE_MOD
UTILMODNAME=PSB_UTIL_MOD UTILMODNAME=PSB_UTIL_MOD
else else
@ -536,7 +536,7 @@ else
FIFLAG=-I FIFLAG=-I
BASEMODNAME=psb_base_mod BASEMODNAME=psb_base_mod
PRECMODNAME=psb_prec_mod PRECMODNAME=psb_prec_mod
METHDMODNAME=psb_krylov_mod METHDMODNAME=psb_linsolve_mod
UTILMODNAME=psb_util_mod UTILMODNAME=psb_util_mod
fi fi

2
samples/advanced/fileread/Makefile
Unescape Escape View File

@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
include $(AMGINCDIR)/Make.inc.amg4psblas include $(AMGINCDIR)/Make.inc.amg4psblas
AMGMODDIR=$(AMGDIR)/modules AMGMODDIR=$(AMGDIR)/modules
AMGLIBDIR=$(AMGDIR)/lib AMGLIBDIR=$(AMGDIR)/lib
AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
DFSOBJS=amg_df_sample.o data_input.o DFSOBJS=amg_df_sample.o data_input.o

2
samples/advanced/fileread/amg_cf_sample.f90
Unescape Escape View File

@ -38,7 +38,7 @@
program amg_cf_sample program amg_cf_sample
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/advanced/fileread/amg_df_sample.f90
Unescape Escape View File

@ -38,7 +38,7 @@
program amg_df_sample program amg_df_sample
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/advanced/fileread/amg_sf_sample.f90
Unescape Escape View File

@ -38,7 +38,7 @@
program amg_sf_sample program amg_sf_sample
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/advanced/fileread/amg_zf_sample.f90
Unescape Escape View File

@ -38,7 +38,7 @@
program amg_zf_sample program amg_zf_sample
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/advanced/pdegen/Makefile
Unescape Escape View File

@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
include $(AMGINCDIR)/Make.inc.amg4psblas include $(AMGINCDIR)/Make.inc.amg4psblas
AMGMODDIR=$(AMGDIR)/modules AMGMODDIR=$(AMGDIR)/modules
AMGLIBDIR=$(AMGDIR)/lib AMGLIBDIR=$(AMGDIR)/lib
AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=

2
samples/advanced/pdegen/amg_d_pde2d.F90
Unescape Escape View File

@ -66,7 +66,7 @@
program amg_d_pde2d program amg_d_pde2d
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_d_pde2d_poisson_mod use amg_d_pde2d_poisson_mod

2
samples/advanced/pdegen/amg_d_pde3d.F90
Unescape Escape View File

@ -67,7 +67,7 @@
program amg_d_pde3d program amg_d_pde3d
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_d_pde3d_poisson_mod use amg_d_pde3d_poisson_mod

2
samples/advanced/pdegen/amg_s_pde2d.F90
Unescape Escape View File

@ -66,7 +66,7 @@
program amg_s_pde2d program amg_s_pde2d
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_s_pde2d_poisson_mod use amg_s_pde2d_poisson_mod

2
samples/advanced/pdegen/amg_s_pde3d.F90
Unescape Escape View File

@ -67,7 +67,7 @@
program amg_s_pde3d program amg_s_pde3d
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_s_pde3d_poisson_mod use amg_s_pde3d_poisson_mod

2
samples/simple/fileread/Makefile
Unescape Escape View File

@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
include $(AMGINCDIR)/Make.inc.amg4psblas include $(AMGINCDIR)/Make.inc.amg4psblas
AMGMODDIR=$(AMGDIR)/modules AMGMODDIR=$(AMGDIR)/modules
AMGLIBDIR=$(AMGDIR)/lib AMGLIBDIR=$(AMGDIR)/lib
AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=

2
samples/simple/fileread/amg_cexample_1lev.f90
Unescape Escape View File

@ -47,7 +47,7 @@
program amg_cexample_1lev program amg_cexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/simple/fileread/amg_cexample_ml.f90
Unescape Escape View File

@ -62,7 +62,7 @@
program amg_cexample_ml program amg_cexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input

2
samples/simple/fileread/amg_dexample_1lev.f90
Unescape Escape View File

@ -47,7 +47,7 @@
program amg_dexample_1lev program amg_dexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/simple/fileread/amg_dexample_ml.f90
Unescape Escape View File

@ -62,7 +62,7 @@
program amg_dexample_ml program amg_dexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input

2
samples/simple/fileread/amg_sexample_1lev.f90
Unescape Escape View File

@ -47,7 +47,7 @@
program amg_sexample_1lev program amg_sexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/simple/fileread/amg_sexample_ml.f90
Unescape Escape View File

@ -62,7 +62,7 @@
program amg_sexample_ml program amg_sexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input

2
samples/simple/fileread/amg_zexample_1lev.f90
Unescape Escape View File

@ -47,7 +47,7 @@
program amg_zexample_1lev program amg_zexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
implicit none implicit none

2
samples/simple/fileread/amg_zexample_ml.f90
Unescape Escape View File

@ -62,7 +62,7 @@
program amg_zexample_ml program amg_zexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input

2
samples/simple/pdegen/Makefile
Unescape Escape View File

@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
include $(AMGINCDIR)/Make.inc.amg4psblas include $(AMGINCDIR)/Make.inc.amg4psblas
AMGMODDIR=$(AMGDIR)/modules AMGMODDIR=$(AMGDIR)/modules
AMGLIBDIR=$(AMGDIR)/lib AMGLIBDIR=$(AMGDIR)/lib
AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
LINKOPT= LINKOPT=

2
samples/simple/pdegen/amg_dexample_1lev.f90
Unescape Escape View File

@ -60,7 +60,7 @@
program amg_dexample_1lev program amg_dexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_d_pde_mod use amg_d_pde_mod

2
samples/simple/pdegen/amg_dexample_ml.f90
Unescape Escape View File

@ -83,7 +83,7 @@
program amg_dexample_ml program amg_dexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_d_pde_mod use amg_d_pde_mod

2
samples/simple/pdegen/amg_sexample_1lev.f90
Unescape Escape View File

@ -60,7 +60,7 @@
program amg_sexample_1lev program amg_sexample_1lev
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_s_pde_mod use amg_s_pde_mod

2
samples/simple/pdegen/amg_sexample_ml.f90
Unescape Escape View File

@ -83,7 +83,7 @@
program amg_sexample_ml program amg_sexample_ml
use psb_base_mod use psb_base_mod
use amg_prec_mod use amg_prec_mod
use psb_krylov_mod use psb_linsolve_mod
use psb_util_mod use psb_util_mod
use data_input use data_input
use amg_s_pde_mod use amg_s_pde_mod

2
tests/newslv/Makefile
Unescape Escape View File

@ -3,7 +3,7 @@ MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.amg4psblas include $(MLDINCDIR)/Make.inc.amg4psblas
MLDMODDIR=$(MLDDIR)/modules MLDMODDIR=$(MLDDIR)/modules
MLDLIBDIR=$(MLDDIR)/lib MLDLIBDIR=$(MLDDIR)/lib
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec MLD_LIBS=-L$(MLDLIBDIR) -lpsb_linsolve -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG). FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
PD3DOBJS=mld_pde3d_newslv.o data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o PD3DOBJS=mld_pde3d_newslv.o data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o

Write Preview
Loading…
Cancel
Save