diff --git a/config/pac.m4 b/config/pac.m4 index ec20cd12..095a5a8f 100644 --- a/config/pac.m4 +++ b/config/pac.m4 @@ -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 diff --git a/configure b/configure index 0b9df7ce..78f8eacd 100755 --- a/configure +++ b/configure @@ -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 diff --git a/mlprec/impl/level/mld_c_base_onelev_csetc.f90 b/mlprec/impl/level/mld_c_base_onelev_csetc.f90 index 781ceef0..c293c3b8 100644 --- a/mlprec/impl/level/mld_c_base_onelev_csetc.f90 +++ b/mlprec/impl/level/mld_c_base_onelev_csetc.f90 @@ -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 diff --git a/mlprec/impl/level/mld_c_base_onelev_cseti.F90 b/mlprec/impl/level/mld_c_base_onelev_cseti.F90 index f412093e..dc11e2c6 100644 --- a/mlprec/impl/level/mld_c_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_c_base_onelev_cseti.F90 @@ -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 diff --git a/mlprec/impl/level/mld_c_base_onelev_csetr.f90 b/mlprec/impl/level/mld_c_base_onelev_csetr.f90 index 922496dd..2b773c27 100644 --- a/mlprec/impl/level/mld_c_base_onelev_csetr.f90 +++ b/mlprec/impl/level/mld_c_base_onelev_csetr.f90 @@ -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 diff --git a/mlprec/impl/level/mld_d_base_onelev_csetc.f90 b/mlprec/impl/level/mld_d_base_onelev_csetc.f90 index 1ac67d26..5a86527e 100644 --- a/mlprec/impl/level/mld_d_base_onelev_csetc.f90 +++ b/mlprec/impl/level/mld_d_base_onelev_csetc.f90 @@ -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 diff --git a/mlprec/impl/level/mld_d_base_onelev_cseti.F90 b/mlprec/impl/level/mld_d_base_onelev_cseti.F90 index d76c5b59..34826a7e 100644 --- a/mlprec/impl/level/mld_d_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_d_base_onelev_cseti.F90 @@ -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 diff --git a/mlprec/impl/level/mld_d_base_onelev_csetr.f90 b/mlprec/impl/level/mld_d_base_onelev_csetr.f90 index 33f5a5a5..40b6de33 100644 --- a/mlprec/impl/level/mld_d_base_onelev_csetr.f90 +++ b/mlprec/impl/level/mld_d_base_onelev_csetr.f90 @@ -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 diff --git a/mlprec/impl/level/mld_s_base_onelev_csetc.f90 b/mlprec/impl/level/mld_s_base_onelev_csetc.f90 index 2443b4e5..11644212 100644 --- a/mlprec/impl/level/mld_s_base_onelev_csetc.f90 +++ b/mlprec/impl/level/mld_s_base_onelev_csetc.f90 @@ -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 diff --git a/mlprec/impl/level/mld_s_base_onelev_cseti.F90 b/mlprec/impl/level/mld_s_base_onelev_cseti.F90 index 8ca26b54..e3dbca73 100644 --- a/mlprec/impl/level/mld_s_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_s_base_onelev_cseti.F90 @@ -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 diff --git a/mlprec/impl/level/mld_s_base_onelev_csetr.f90 b/mlprec/impl/level/mld_s_base_onelev_csetr.f90 index f75849cc..da4dc302 100644 --- a/mlprec/impl/level/mld_s_base_onelev_csetr.f90 +++ b/mlprec/impl/level/mld_s_base_onelev_csetr.f90 @@ -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 diff --git a/mlprec/impl/level/mld_z_base_onelev_csetc.f90 b/mlprec/impl/level/mld_z_base_onelev_csetc.f90 index a09be534..85bf48dc 100644 --- a/mlprec/impl/level/mld_z_base_onelev_csetc.f90 +++ b/mlprec/impl/level/mld_z_base_onelev_csetc.f90 @@ -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 diff --git a/mlprec/impl/level/mld_z_base_onelev_cseti.F90 b/mlprec/impl/level/mld_z_base_onelev_cseti.F90 index bee8ba2b..303d788c 100644 --- a/mlprec/impl/level/mld_z_base_onelev_cseti.F90 +++ b/mlprec/impl/level/mld_z_base_onelev_cseti.F90 @@ -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 diff --git a/mlprec/impl/level/mld_z_base_onelev_csetr.f90 b/mlprec/impl/level/mld_z_base_onelev_csetr.f90 index 28a7d61a..e5d55883 100644 --- a/mlprec/impl/level/mld_z_base_onelev_csetr.f90 +++ b/mlprec/impl/level/mld_z_base_onelev_csetr.f90 @@ -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 diff --git a/mlprec/mld_c_base_aggregator_mod.f90 b/mlprec/mld_c_base_aggregator_mod.f90 index 7e816283..a30b8723 100644 --- a/mlprec/mld_c_base_aggregator_mod.f90 +++ b/mlprec/mld_c_base_aggregator_mod.f90 @@ -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 diff --git a/mlprec/mld_d_base_aggregator_mod.f90 b/mlprec/mld_d_base_aggregator_mod.f90 index 71d73c60..cbd57fd3 100644 --- a/mlprec/mld_d_base_aggregator_mod.f90 +++ b/mlprec/mld_d_base_aggregator_mod.f90 @@ -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 diff --git a/mlprec/mld_s_base_aggregator_mod.f90 b/mlprec/mld_s_base_aggregator_mod.f90 index 468ecbbc..acfc456a 100644 --- a/mlprec/mld_s_base_aggregator_mod.f90 +++ b/mlprec/mld_s_base_aggregator_mod.f90 @@ -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 diff --git a/mlprec/mld_z_base_aggregator_mod.f90 b/mlprec/mld_z_base_aggregator_mod.f90 index 6c49ae2f..552a2ce0 100644 --- a/mlprec/mld_z_base_aggregator_mod.f90 +++ b/mlprec/mld_z_base_aggregator_mod.f90 @@ -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