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

Fix configry. Fixed onelev%SET to call aggr method.

Browse Source
stopcriterion
Salvatore Filippone 6 years ago
parent 3951e449bb
commit 743dd38121
18 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
config/pac.m4
Unescape Escape View File

@ -635,7 +635,7 @@ if test "x$pac_slu_header_ok" == "xyes" ; then
LIBS="$SLU_LIBS -lm $save_LIBS";
AC_TRY_LINK_FUNC(superlu_malloc,
[mld2p4_cv_have_superlu=yes;pac_slu_lib_ok=yes;],
[mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; SLU_INCLUDES=""])
[mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; ])
fi
if test "x$pac_slu_lib_ok" == "xno" ; then
dnl Maybe lib64?
@ -643,7 +643,7 @@ if test "x$pac_slu_header_ok" == "xyes" ; then
LIBS="$SLU_LIBS -lm $save_LIBS";
AC_TRY_LINK_FUNC(superlu_malloc,
[mld2p4_cv_have_superlu=yes;pac_slu_lib_ok=yes;],
[mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; SLU_INCLUDES=""])
[mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; ])
fi
AC_MSG_RESULT($pac_slu_lib_ok)
fi

4
configure vendored
Unescape Escape View File

@ -11798,7 +11798,7 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; SLU_INCLUDES=""
mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS="";
fi
rm -rf conftest.dSYM
@ -11856,7 +11856,7 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS=""; SLU_INCLUDES=""
mld2p4_cv_have_superlu=no;pac_slu_lib_ok=no; SLU_LIBS="";
fi
rm -rf conftest.dSYM

1
mlprec/impl/level/mld_c_base_onelev_csetc.f90
Unescape Escape View File

@ -86,6 +86,7 @@ subroutine mld_c_base_onelev_csetc(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end if

1
mlprec/impl/level/mld_c_base_onelev_cseti.F90
Unescape Escape View File

@ -240,6 +240,7 @@ subroutine mld_c_base_onelev_cseti(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

2
mlprec/impl/level/mld_c_base_onelev_csetr.f90
Unescape Escape View File

@ -90,6 +90,8 @@ subroutine mld_c_base_onelev_csetr(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

1
mlprec/impl/level/mld_d_base_onelev_csetc.f90
Unescape Escape View File

@ -86,6 +86,7 @@ subroutine mld_d_base_onelev_csetc(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end if

1
mlprec/impl/level/mld_d_base_onelev_cseti.F90
Unescape Escape View File

@ -260,6 +260,7 @@ subroutine mld_d_base_onelev_cseti(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

2
mlprec/impl/level/mld_d_base_onelev_csetr.f90
Unescape Escape View File

@ -90,6 +90,8 @@ subroutine mld_d_base_onelev_csetr(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

1
mlprec/impl/level/mld_s_base_onelev_csetc.f90
Unescape Escape View File

@ -86,6 +86,7 @@ subroutine mld_s_base_onelev_csetc(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end if

1
mlprec/impl/level/mld_s_base_onelev_cseti.F90
Unescape Escape View File

@ -240,6 +240,7 @@ subroutine mld_s_base_onelev_cseti(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

2
mlprec/impl/level/mld_s_base_onelev_csetr.f90
Unescape Escape View File

@ -90,6 +90,8 @@ subroutine mld_s_base_onelev_csetr(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

1
mlprec/impl/level/mld_z_base_onelev_csetc.f90
Unescape Escape View File

@ -86,6 +86,7 @@ subroutine mld_z_base_onelev_csetc(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end if

1
mlprec/impl/level/mld_z_base_onelev_cseti.F90
Unescape Escape View File

@ -260,6 +260,7 @@ subroutine mld_z_base_onelev_cseti(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

2
mlprec/impl/level/mld_z_base_onelev_csetr.f90
Unescape Escape View File

@ -90,6 +90,8 @@ subroutine mld_z_base_onelev_csetr(lv,what,val,info,pos)
call lv%sm2a%set(what,val,info)
end if
end if
if (allocated(lv%aggr)) call lv%aggr%set(what,val,info)
end select
if (info /= psb_success_) goto 9999

16
mlprec/mld_c_base_aggregator_mod.f90
Unescape Escape View File

@ -107,7 +107,8 @@ module mld_c_base_aggregator_mod
procedure, nopass :: fmt => mld_c_base_aggregator_fmt
procedure, pass(ag) :: cseti => mld_c_base_aggregator_cseti
procedure, pass(ag) :: csetr => mld_c_base_aggregator_csetr
generic, public :: set => cseti, csetr
procedure, pass(ag) :: csetc => mld_c_base_aggregator_csetc
generic, public :: set => cseti, csetr, csetc
end type mld_c_base_aggregator_type
@ -139,6 +140,19 @@ contains
info = 0
end subroutine mld_c_base_aggregator_csetr
subroutine mld_c_base_aggregator_csetc(ag,what,val,info)
Implicit None
! Arguments
class(mld_c_base_aggregator_type), intent(inout) :: ag
character(len=*), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
! Do nothing
info = 0
end subroutine mld_c_base_aggregator_csetc
subroutine mld_c_base_aggregator_update_next(ag,agnext,info)
implicit none

16
mlprec/mld_d_base_aggregator_mod.f90
Unescape Escape View File

@ -107,7 +107,8 @@ module mld_d_base_aggregator_mod
procedure, nopass :: fmt => mld_d_base_aggregator_fmt
procedure, pass(ag) :: cseti => mld_d_base_aggregator_cseti
procedure, pass(ag) :: csetr => mld_d_base_aggregator_csetr
generic, public :: set => cseti, csetr
procedure, pass(ag) :: csetc => mld_d_base_aggregator_csetc
generic, public :: set => cseti, csetr, csetc
end type mld_d_base_aggregator_type
@ -139,6 +140,19 @@ contains
info = 0
end subroutine mld_d_base_aggregator_csetr
subroutine mld_d_base_aggregator_csetc(ag,what,val,info)
Implicit None
! Arguments
class(mld_d_base_aggregator_type), intent(inout) :: ag
character(len=*), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
! Do nothing
info = 0
end subroutine mld_d_base_aggregator_csetc
subroutine mld_d_base_aggregator_update_next(ag,agnext,info)
implicit none

16
mlprec/mld_s_base_aggregator_mod.f90
Unescape Escape View File

@ -107,7 +107,8 @@ module mld_s_base_aggregator_mod
procedure, nopass :: fmt => mld_s_base_aggregator_fmt
procedure, pass(ag) :: cseti => mld_s_base_aggregator_cseti
procedure, pass(ag) :: csetr => mld_s_base_aggregator_csetr
generic, public :: set => cseti, csetr
procedure, pass(ag) :: csetc => mld_s_base_aggregator_csetc
generic, public :: set => cseti, csetr, csetc
end type mld_s_base_aggregator_type
@ -139,6 +140,19 @@ contains
info = 0
end subroutine mld_s_base_aggregator_csetr
subroutine mld_s_base_aggregator_csetc(ag,what,val,info)
Implicit None
! Arguments
class(mld_s_base_aggregator_type), intent(inout) :: ag
character(len=*), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
! Do nothing
info = 0
end subroutine mld_s_base_aggregator_csetc
subroutine mld_s_base_aggregator_update_next(ag,agnext,info)
implicit none

16
mlprec/mld_z_base_aggregator_mod.f90
Unescape Escape View File

@ -107,7 +107,8 @@ module mld_z_base_aggregator_mod
procedure, nopass :: fmt => mld_z_base_aggregator_fmt
procedure, pass(ag) :: cseti => mld_z_base_aggregator_cseti
procedure, pass(ag) :: csetr => mld_z_base_aggregator_csetr
generic, public :: set => cseti, csetr
procedure, pass(ag) :: csetc => mld_z_base_aggregator_csetc
generic, public :: set => cseti, csetr, csetc
end type mld_z_base_aggregator_type
@ -139,6 +140,19 @@ contains
info = 0
end subroutine mld_z_base_aggregator_csetr
subroutine mld_z_base_aggregator_csetc(ag,what,val,info)
Implicit None
! Arguments
class(mld_z_base_aggregator_type), intent(inout) :: ag
character(len=*), intent(in) :: what
character(len=*), intent(in) :: val
integer(psb_ipk_), intent(out) :: info
! Do nothing
info = 0
end subroutine mld_z_base_aggregator_csetc
subroutine mld_z_base_aggregator_update_next(ag,agnext,info)
implicit none

Write Preview
Loading…
Cancel
Save