diff --git a/mlprec/impl/level/Makefile b/mlprec/impl/level/Makefile index bd50f2a0..4c035857 100644 --- a/mlprec/impl/level/Makefile +++ b/mlprec/impl/level/Makefile @@ -30,6 +30,8 @@ mld_d_base_onelev_free.o \ mld_d_base_onelev_setc.o \ mld_d_base_onelev_seti.o \ mld_d_base_onelev_setr.o \ +mld_d_base_onelev_setsm.o \ +mld_d_base_onelev_setsv.o \ mld_s_base_onelev_check.o \ mld_s_base_onelev_cnv.o \ mld_s_base_onelev_csetc.o \ diff --git a/mlprec/impl/level/mld_d_base_onelev_setsm.F90 b/mlprec/impl/level/mld_d_base_onelev_setsm.F90 new file mode 100644 index 00000000..c0770327 --- /dev/null +++ b/mlprec/impl/level/mld_d_base_onelev_setsm.F90 @@ -0,0 +1,107 @@ +!!$ +!!$ +!!$ MLD2P4 version 2.0 +!!$ MultiLevel Domain Decomposition Parallel Preconditioners Package +!!$ based on PSBLAS (Parallel Sparse BLAS version 3.3) +!!$ +!!$ (C) Copyright 2008, 2010, 2012, 2015 +!!$ +!!$ Salvatore Filippone University of Rome Tor Vergata +!!$ Alfredo Buttari CNRS-IRIT, Toulouse +!!$ Pasqua D'Ambra ICAR-CNR, Naples +!!$ Daniela di Serafino Second University of Naples +!!$ +!!$ Redistribution and use in source and binary forms, with or without +!!$ modification, are permitted provided that the following conditions +!!$ are met: +!!$ 1. Redistributions of source code must retain the above copyright +!!$ notice, this list of conditions and the following disclaimer. +!!$ 2. Redistributions in binary form must reproduce the above copyright +!!$ notice, this list of conditions, and the following disclaimer in the +!!$ documentation and/or other materials provided with the distribution. +!!$ 3. The name of the MLD2P4 group or the names of its contributors may +!!$ not be used to endorse or promote products derived from this +!!$ software without specific written permission. +!!$ +!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +!!$ POSSIBILITY OF SUCH DAMAGE. +!!$ +!!$ +subroutine mld_d_base_onelev_setsm(lev,val,info,pos) + + use psb_base_mod + use mld_d_prec_mod, mld_protect_name => mld_d_base_onelev_setsm + + implicit none + + ! Arguments + class(mld_d_onelev_type), target, intent(inout) :: lev + class(mld_d_base_smoother_type), intent(in) :: val + integer(psb_ipk_), intent(out) :: info + character(len=*), optional, intent(in) :: pos + + ! Local variables + integer(psb_ipk_) :: ipos_ + character(len=*), parameter :: name='mld_base_onelev_setsm' + + info = psb_success_ + + if (present(pos)) then + select case(psb_toupper(trim(pos))) + case('PRE') + ipos_ = mld_pre_smooth_ + case('POST') + ipos_ = mld_post_smooth_ + case default + ipos_ = mld_pre_smooth_ + end select + else + ipos_ = mld_pre_smooth_ + end if + + select case(ipos_) + case(mld_pre_smooth_) + if (allocated(lev%sm)) then + if (.not.same_type_as(lev%sm,val)) then + call lev%sm%free(info) + deallocate(lev%sm, stat=info) + end if + endif + if (.not.allocated(lev%sm)) then +#ifdef HAVE_MOLD + allocate(lev%sm,mold=val) +#else + allocate(lev%sm,source=val) +#endif + end if + call lev%sm%default() + lev%sm2 => lev%sm + case(mld_post_smooth_) + if (allocated(lev%sm2a)) then + if (.not.same_type_as(lev%sm2a,val)) then + call lev%sm2a%free(info) + deallocate(lev%sm2a, stat=info) + endif + end if + if (.not.allocated(lev%sm2a)) then +#ifdef HAVE_MOLD + allocate(lev%sm2a,mold=val) +#else + allocate(lev%sm2a,source=val) +#endif + end if + call lev%sm2a%default() + lev%sm2 => lev%sm2a + end select + +end subroutine mld_d_base_onelev_setsm + diff --git a/mlprec/impl/level/mld_d_base_onelev_setsv.F90 b/mlprec/impl/level/mld_d_base_onelev_setsv.F90 new file mode 100644 index 00000000..aefdd015 --- /dev/null +++ b/mlprec/impl/level/mld_d_base_onelev_setsv.F90 @@ -0,0 +1,144 @@ +!!$ +!!$ +!!$ MLD2P4 version 2.0 +!!$ MultiLevel Domain Decomposition Parallel Preconditioners Package +!!$ based on PSBLAS (Parallel Sparse BLAS version 3.3) +!!$ +!!$ (C) Copyright 2008, 2010, 2012, 2015 +!!$ +!!$ Salvatore Filippone University of Rome Tor Vergata +!!$ Alfredo Buttari CNRS-IRIT, Toulouse +!!$ Pasqua D'Ambra ICAR-CNR, Naples +!!$ Daniela di Serafino Second University of Naples +!!$ +!!$ Redistribution and use in source and binary forms, with or without +!!$ modification, are permitted provided that the following conditions +!!$ are met: +!!$ 1. Redistributions of source code must retain the above copyright +!!$ notice, this list of conditions and the following disclaimer. +!!$ 2. Redistributions in binary form must reproduce the above copyright +!!$ notice, this list of conditions, and the following disclaimer in the +!!$ documentation and/or other materials provided with the distribution. +!!$ 3. The name of the MLD2P4 group or the names of its contributors may +!!$ not be used to endorse or promote products derived from this +!!$ software without specific written permission. +!!$ +!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +!!$ POSSIBILITY OF SUCH DAMAGE. +!!$ +!!$ +subroutine mld_d_base_onelev_setsv(lev,val,info,pos) + + use psb_base_mod + use mld_d_prec_mod, mld_protect_name => mld_d_base_onelev_setsv + + implicit none + + ! Arguments + class(mld_d_onelev_type), target, intent(inout) :: lev + class(mld_d_base_solver_type), intent(in) :: val + integer(psb_ipk_), intent(out) :: info + character(len=*), optional, intent(in) :: pos + + ! Local variables + integer(psb_ipk_) :: ipos_ + character(len=*), parameter :: name='mld_base_onelev_setsv' + + info = psb_success_ + + if (present(pos)) then + select case(psb_toupper(trim(pos))) + case('PRE') + ipos_ = mld_pre_smooth_ + case('POST') + ipos_ = mld_post_smooth_ + case default + ipos_ = mld_pre_smooth_ + end select + else + ipos_ = mld_pre_smooth_ + end if + + select case(ipos_) + case(mld_pre_smooth_) + if (allocated(lev%sm)) then + if (allocated(lev%sm%sv)) then + if (.not.same_type_as(lev%sm%sv,val)) then + call lev%sm%sv%free(info) + deallocate(lev%sm%sv,stat=info) + if (info /= 0) then + info = 3111 + return + end if + end if + end if + + if (.not.allocated(lev%sm%sv)) then +#ifdef HAVE_MOLD + allocate(lev%sm%sv,mold=val,stat=info) +#else + allocate(lev%sm%sv,source=val,stat=info) +#endif + if (info /= 0) then + info = 3111 + return + end if + end if + call lev%sm%sv%default() + else + info = 3111 + write(psb_err_unit,*) name,& + &': Error: uninitialized preconditioner component,',& + &' should call MLD_PRECINIT/MLD_PRECSET' + return + + end if + + case(mld_post_smooth_) + + if (allocated(lev%sm2a)) then + if (allocated(lev%sm2a%sv)) then + if (.not.same_type_as(lev%sm2a%sv,val)) then + call lev%sm2a%sv%free(info) + deallocate(lev%sm2a%sv,stat=info) + if (info /= 0) then + info = 3111 + return + end if + end if + end if + if (.not.allocated(lev%sm2a%sv)) then +#ifdef HAVE_MOLD + allocate(lev%sm2a%sv,mold=val,stat=info) +#else + allocate(lev%sm2a%sv,source=val,stat=info) +#endif + if (info /= 0) then + info = 3111 + return + end if + end if + call lev%sm2a%sv%default() + + else + info = 3111 + write(psb_err_unit,*) name,& + &': Error: uninitialized preconditioner component,',& + &' should call MLD_PRECINIT/MLD_PRECSET' + return + + end if + + end select + +end subroutine mld_d_base_onelev_setsv + diff --git a/mlprec/impl/mld_dprecset.F90 b/mlprec/impl/mld_dprecset.F90 index adb06da7..cc51826b 100644 --- a/mlprec/impl/mld_dprecset.F90 +++ b/mlprec/impl/mld_dprecset.F90 @@ -818,7 +818,8 @@ subroutine mld_dprecsetsm(p,val,info,ilev,pos) if (.not.same_type_as(p%precv(ilev_)%sm2a,val)) then call p%precv(ilev_)%sm2a%free(info) deallocate(p%precv(ilev_)%sm2a, stat=info) - endif + endif + end if if (.not.allocated(p%precv(ilev_)%sm2a)) then #ifdef HAVE_MOLD allocate(p%precv(ilev_)%sm2a,mold=val) diff --git a/mlprec/mld_d_onelev_mod.f90 b/mlprec/mld_d_onelev_mod.f90 index 82d8575a..32f4c119 100644 --- a/mlprec/mld_d_onelev_mod.f90 +++ b/mlprec/mld_d_onelev_mod.f90 @@ -145,7 +145,10 @@ module mld_d_onelev_mod procedure, pass(lv) :: cseti => mld_d_base_onelev_cseti procedure, pass(lv) :: csetr => mld_d_base_onelev_csetr procedure, pass(lv) :: csetc => mld_d_base_onelev_csetc - generic, public :: set => seti, setr, setc, cseti, csetr, csetc + procedure, pass(lv) :: setsm => mld_d_base_onelev_setsm + procedure, pass(lv) :: setsv => mld_d_base_onelev_setsv + generic, public :: set => seti, setr, setc,& + & cseti, csetr, csetc, setsm, setsv procedure, pass(lv) :: sizeof => d_base_onelev_sizeof procedure, pass(lv) :: get_nzeros => d_base_onelev_get_nzeros procedure, nopass :: stringval => mld_stringval @@ -229,6 +232,34 @@ module mld_d_onelev_mod end subroutine mld_d_base_onelev_seti end interface + interface + subroutine mld_d_base_onelev_setsm(lv,val,info,pos) + import :: psb_dpk_, mld_d_onelev_type, mld_d_base_smoother_type, & + & psb_ipk_, psb_long_int_k_, psb_desc_type + Implicit None + + ! Arguments + class(mld_d_onelev_type), target, intent(inout) :: lv + class(mld_d_base_smoother_type), intent(in) :: val + integer(psb_ipk_), intent(out) :: info + character(len=*), optional, intent(in) :: pos + end subroutine mld_d_base_onelev_setsm + end interface + + interface + subroutine mld_d_base_onelev_setsv(lv,val,info,pos) + import :: psb_dpk_, mld_d_onelev_type, mld_d_base_solver_type, & + & psb_ipk_, psb_long_int_k_, psb_desc_type + Implicit None + + ! Arguments + class(mld_d_onelev_type), target, intent(inout) :: lv + class(mld_d_base_solver_type), intent(in) :: val + integer(psb_ipk_), intent(out) :: info + character(len=*), optional, intent(in) :: pos + end subroutine mld_d_base_onelev_setsv + end interface + interface subroutine mld_d_base_onelev_setc(lv,what,val,info,pos) import :: psb_dspmat_type, psb_d_vect_type, psb_d_base_vect_type, &