diff --git a/mlprec/impl/Makefile b/mlprec/impl/Makefile index 4105d252..9123bd18 100644 --- a/mlprec/impl/Makefile +++ b/mlprec/impl/Makefile @@ -23,21 +23,25 @@ MPCOBJS=mld_sslud_interface.o mld_dslud_interface.o mld_cslud_interface.o mld_zs DINNEROBJS= mld_dcoarse_bld.o mld_dmlprec_bld.o mld_d_bld_mlhier_aggsize.o mld_d_bld_mlhier_array.o \ + mld_d_ml_prec_bld.o mld_d_hierarchy_bld.o \ mld_dilu0_fact.o mld_diluk_fact.o mld_dilut_fact.o mld_daggrmap_bld.o \ mld_d_dec_map_bld.o mld_dmlprec_aply.o mld_daggrmat_asb.o \ $(DMPFOBJS) SINNEROBJS= mld_scoarse_bld.o mld_smlprec_bld.o mld_s_bld_mlhier_aggsize.o mld_s_bld_mlhier_array.o \ + mld_s_ml_prec_bld.o mld_s_hierarchy_bld.o \ mld_silu0_fact.o mld_siluk_fact.o mld_silut_fact.o mld_saggrmap_bld.o \ mld_s_dec_map_bld.o mld_smlprec_aply.o mld_saggrmat_asb.o \ $(SMPFOBJS) ZINNEROBJS= mld_zcoarse_bld.o mld_zmlprec_bld.o mld_z_bld_mlhier_aggsize.o mld_z_bld_mlhier_array.o \ + mld_z_ml_prec_bld.o mld_z_hierarchy_bld.o \ mld_zilu0_fact.o mld_ziluk_fact.o mld_zilut_fact.o mld_zaggrmap_bld.o \ mld_z_dec_map_bld.o mld_zmlprec_aply.o mld_zaggrmat_asb.o \ $(ZMPFOBJS) CINNEROBJS= mld_ccoarse_bld.o mld_cmlprec_bld.o mld_c_bld_mlhier_aggsize.o mld_c_bld_mlhier_array.o \ + mld_c_ml_prec_bld.o mld_c_hierarchy_bld.o \ mld_cilu0_fact.o mld_ciluk_fact.o mld_cilut_fact.o mld_caggrmap_bld.o \ mld_c_dec_map_bld.o mld_cmlprec_aply.o mld_caggrmat_asb.o \ $(CMPFOBJS) diff --git a/mlprec/impl/mld_c_hierarchy_bld.f90 b/mlprec/impl/mld_c_hierarchy_bld.f90 new file mode 100644 index 00000000..7b4d970f --- /dev/null +++ b/mlprec/impl/mld_c_hierarchy_bld.f90 @@ -0,0 +1,234 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_c_hierarchy_bld.f90 +! +! Subroutine: mld_c_hierarchy_bld +! Version: complex +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_cspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_cprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_c_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_c_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_c_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_c_inner_mod + use mld_c_prec_mod, mld_protect_name => mld_c_hierarchy_bld + + Implicit None + + ! Arguments + type(psb_cspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_cprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_sparse_mat), intent(in), optional :: amold + class(psb_c_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_spk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_c_hierarchy_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + p%ictxt = ictxt + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_cprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + newsz = -1 + casize = p%coarse_aggr_size + nplevs = p%n_prec_levs + mxplevs = p%max_prec_levs + mnaggratio = p%min_aggr_ratio + casize = p%coarse_aggr_size + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + call psb_bcast(ictxt,casize) + call psb_bcast(ictxt,nplevs) + call psb_bcast(ictxt,mxplevs) + call psb_bcast(ictxt,mnaggratio) + if (casize /= p%coarse_aggr_size) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') + goto 9999 + end if + if (nplevs /= p%n_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') + goto 9999 + end if + if (mxplevs /= p%max_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + goto 9999 + end if + if (mnaggratio /= p%min_aggr_ratio) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') + goto 9999 + end if + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + if (nplevs <= 0) then + ! + ! This should become the default strategy, we specify a target aggregation size. + ! + if (casize <=0) then + ! + ! Default to the cubic root of the size at base level. + ! + casize = desc_a%get_global_rows() + casize = int((sone*casize)**(sone/(sone*3)),psb_ipk_) + casize = max(casize,ione) + end if + call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) + else + ! + ! Oldstyle with fixed number of levels. + ! + nplevs = max(itwo,min(nplevs,mxplevs)) + call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) + end if + + if (info /= psb_success_) then + call psb_errpush(psb_err_internal_error_,name,& + & a_err='Internal hierarchy build' ) + goto 9999 + endif + + iszv = size(p%precv) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_c_hierarchy_bld diff --git a/mlprec/impl/mld_c_ml_prec_bld.f90 b/mlprec/impl/mld_c_ml_prec_bld.f90 new file mode 100644 index 00000000..bb875722 --- /dev/null +++ b/mlprec/impl/mld_c_ml_prec_bld.f90 @@ -0,0 +1,194 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_c_ml_prec_bld.f90 +! +! Subroutine: mld_c_ml_prec_bld +! Version: complex +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_cspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_cprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_c_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_c_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_c_inner_mod + use mld_c_prec_mod, mld_protect_name => mld_c_ml_prec_bld + + Implicit None + + ! Arguments + type(psb_cspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_cprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_sparse_mat), intent(in), optional :: amold + class(psb_c_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_spk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_c_ml_prec_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_cprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + ! + ! Now do the real build. + ! + + do i=1, iszv + ! + ! build the base preconditioner at level i + ! + call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) + + if (info /= psb_success_) then + write(ch_err,'(a,i7)') 'Error @ level',i + call psb_errpush(psb_err_internal_error_,name,& + & a_err=ch_err) + goto 9999 + endif + + end do + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_c_ml_prec_bld diff --git a/mlprec/impl/mld_cmlprec_bld.f90 b/mlprec/impl/mld_cmlprec_bld.f90 index b7cdc637..d9e4b826 100644 --- a/mlprec/impl/mld_cmlprec_bld.f90 +++ b/mlprec/impl/mld_cmlprec_bld.f90 @@ -118,120 +118,25 @@ subroutine mld_cmlprec_bld(a,desc_a,p,info,amold,vmold,imold) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'Entering ' - ! - ! For the time being we are commenting out the UPDATE argument - ! we plan to resurrect it later. - ! !$ if (present(upd)) then - ! !$ if (debug_level >= psb_debug_outer_) & - ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd - ! !$ - ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then - ! !$ upd_=psb_toupper(upd) - ! !$ else - ! !$ upd_='F' - ! !$ endif - ! !$ else - ! !$ upd_='F' - ! !$ endif - upd_ = 'F' - - if (.not.allocated(p%precv)) then - !! Error: should have called mld_cprecinit - info=3111 - call psb_errpush(info,name) - goto 9999 - end if - ! - ! Check to ensure all procs have the same - ! - newsz = -1 - casize = p%coarse_aggr_size - nplevs = p%n_prec_levs - mxplevs = p%max_prec_levs - mnaggratio = p%min_aggr_ratio - casize = p%coarse_aggr_size - iszv = size(p%precv) - call psb_bcast(ictxt,iszv) - call psb_bcast(ictxt,casize) - call psb_bcast(ictxt,nplevs) - call psb_bcast(ictxt,mxplevs) - call psb_bcast(ictxt,mnaggratio) - if (casize /= p%coarse_aggr_size) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') - goto 9999 - end if - if (nplevs /= p%n_prec_levs) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') - goto 9999 - end if - if (mxplevs /= p%max_prec_levs) then + call mld_c_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + call psb_errpush(info,name,a_err='Error from hierarchy build') goto 9999 end if - if (mnaggratio /= p%min_aggr_ratio) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') - goto 9999 - end if - if (iszv /= size(p%precv)) then + + iszv = p%get_nlevs() + + call mld_c_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent size of precv') + call psb_errpush(info,name,a_err='Error from smoothers build') goto 9999 end if - if (iszv <= 1) then - ! We should only ever get here for multilevel. - info=psb_err_from_subroutine_ - ch_err='size bpv' - call psb_errpush(info,name,a_err=ch_err) - goto 9999 - endif - - if (nplevs <= 0) then - ! - ! This should become the default strategy, we specify a target aggregation size. - ! - if (casize <=0) then - ! - ! Default to the cubic root of the size at base level. - ! - casize = desc_a%get_global_rows() - casize = int((sone*casize)**(sone/(sone*3)),psb_ipk_) - casize = max(casize,ione) - end if - call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) - else - ! - ! Oldstyle with fixed number of levels. - ! - nplevs = max(itwo,min(nplevs,mxplevs)) - call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) - end if - iszv = size(p%precv) - - - ! - ! Now do the preconditioner build. - ! - - do i=1, iszv - ! - ! build the base preconditioner at level i - ! - call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) - - if (info /= psb_success_) then - write(ch_err,'(a,i7)') 'Error @ level',i - call psb_errpush(psb_err_internal_error_,name,& - & a_err=ch_err) - goto 9999 - endif - - end do if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/impl/mld_d_hierarchy_bld.f90 b/mlprec/impl/mld_d_hierarchy_bld.f90 new file mode 100644 index 00000000..7eb24489 --- /dev/null +++ b/mlprec/impl/mld_d_hierarchy_bld.f90 @@ -0,0 +1,234 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_d_hierarchy_bld.f90 +! +! Subroutine: mld_d_hierarchy_bld +! Version: real +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_dspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_dprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_d_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_d_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_d_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_d_inner_mod + use mld_d_prec_mod, mld_protect_name => mld_d_hierarchy_bld + + Implicit None + + ! Arguments + type(psb_dspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_dprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_sparse_mat), intent(in), optional :: amold + class(psb_d_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_dpk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_d_hierarchy_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + p%ictxt = ictxt + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_dprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + newsz = -1 + casize = p%coarse_aggr_size + nplevs = p%n_prec_levs + mxplevs = p%max_prec_levs + mnaggratio = p%min_aggr_ratio + casize = p%coarse_aggr_size + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + call psb_bcast(ictxt,casize) + call psb_bcast(ictxt,nplevs) + call psb_bcast(ictxt,mxplevs) + call psb_bcast(ictxt,mnaggratio) + if (casize /= p%coarse_aggr_size) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') + goto 9999 + end if + if (nplevs /= p%n_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') + goto 9999 + end if + if (mxplevs /= p%max_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + goto 9999 + end if + if (mnaggratio /= p%min_aggr_ratio) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') + goto 9999 + end if + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + if (nplevs <= 0) then + ! + ! This should become the default strategy, we specify a target aggregation size. + ! + if (casize <=0) then + ! + ! Default to the cubic root of the size at base level. + ! + casize = desc_a%get_global_rows() + casize = int((done*casize)**(done/(done*3)),psb_ipk_) + casize = max(casize,ione) + end if + call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) + else + ! + ! Oldstyle with fixed number of levels. + ! + nplevs = max(itwo,min(nplevs,mxplevs)) + call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) + end if + + if (info /= psb_success_) then + call psb_errpush(psb_err_internal_error_,name,& + & a_err='Internal hierarchy build' ) + goto 9999 + endif + + iszv = size(p%precv) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_d_hierarchy_bld diff --git a/mlprec/impl/mld_d_ml_prec_bld.f90 b/mlprec/impl/mld_d_ml_prec_bld.f90 new file mode 100644 index 00000000..f2507278 --- /dev/null +++ b/mlprec/impl/mld_d_ml_prec_bld.f90 @@ -0,0 +1,194 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_d_ml_prec_bld.f90 +! +! Subroutine: mld_d_ml_prec_bld +! Version: real +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_dspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_dprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_d_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_d_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_d_inner_mod + use mld_d_prec_mod, mld_protect_name => mld_d_ml_prec_bld + + Implicit None + + ! Arguments + type(psb_dspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_dprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_sparse_mat), intent(in), optional :: amold + class(psb_d_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_dpk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_d_ml_prec_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_dprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + ! + ! Now do the real build. + ! + + do i=1, iszv + ! + ! build the base preconditioner at level i + ! + call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) + + if (info /= psb_success_) then + write(ch_err,'(a,i7)') 'Error @ level',i + call psb_errpush(psb_err_internal_error_,name,& + & a_err=ch_err) + goto 9999 + endif + + end do + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_d_ml_prec_bld diff --git a/mlprec/impl/mld_dmlprec_bld.f90 b/mlprec/impl/mld_dmlprec_bld.f90 index 81e257bc..ac2f3923 100644 --- a/mlprec/impl/mld_dmlprec_bld.f90 +++ b/mlprec/impl/mld_dmlprec_bld.f90 @@ -118,120 +118,25 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info,amold,vmold,imold) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'Entering ' - ! - ! For the time being we are commenting out the UPDATE argument - ! we plan to resurrect it later. - ! !$ if (present(upd)) then - ! !$ if (debug_level >= psb_debug_outer_) & - ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd - ! !$ - ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then - ! !$ upd_=psb_toupper(upd) - ! !$ else - ! !$ upd_='F' - ! !$ endif - ! !$ else - ! !$ upd_='F' - ! !$ endif - upd_ = 'F' - - if (.not.allocated(p%precv)) then - !! Error: should have called mld_dprecinit - info=3111 - call psb_errpush(info,name) - goto 9999 - end if - ! - ! Check to ensure all procs have the same - ! - newsz = -1 - casize = p%coarse_aggr_size - nplevs = p%n_prec_levs - mxplevs = p%max_prec_levs - mnaggratio = p%min_aggr_ratio - casize = p%coarse_aggr_size - iszv = size(p%precv) - call psb_bcast(ictxt,iszv) - call psb_bcast(ictxt,casize) - call psb_bcast(ictxt,nplevs) - call psb_bcast(ictxt,mxplevs) - call psb_bcast(ictxt,mnaggratio) - if (casize /= p%coarse_aggr_size) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') - goto 9999 - end if - if (nplevs /= p%n_prec_levs) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') - goto 9999 - end if - if (mxplevs /= p%max_prec_levs) then + call mld_d_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + call psb_errpush(info,name,a_err='Error from hierarchy build') goto 9999 end if - if (mnaggratio /= p%min_aggr_ratio) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') - goto 9999 - end if - if (iszv /= size(p%precv)) then + + iszv = p%get_nlevs() + + call mld_d_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent size of precv') + call psb_errpush(info,name,a_err='Error from smoothers build') goto 9999 end if - if (iszv <= 1) then - ! We should only ever get here for multilevel. - info=psb_err_from_subroutine_ - ch_err='size bpv' - call psb_errpush(info,name,a_err=ch_err) - goto 9999 - endif - - if (nplevs <= 0) then - ! - ! This should become the default strategy, we specify a target aggregation size. - ! - if (casize <=0) then - ! - ! Default to the cubic root of the size at base level. - ! - casize = desc_a%get_global_rows() - casize = int((done*casize)**(done/(done*3)),psb_ipk_) - casize = max(casize,ione) - end if - call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) - else - ! - ! Oldstyle with fixed number of levels. - ! - nplevs = max(itwo,min(nplevs,mxplevs)) - call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) - end if - iszv = size(p%precv) - - - ! - ! Now do the preconditioner build. - ! - - do i=1, iszv - ! - ! build the base preconditioner at level i - ! - call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) - - if (info /= psb_success_) then - write(ch_err,'(a,i7)') 'Error @ level',i - call psb_errpush(psb_err_internal_error_,name,& - & a_err=ch_err) - goto 9999 - endif - - end do if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/impl/mld_s_hierarchy_bld.f90 b/mlprec/impl/mld_s_hierarchy_bld.f90 new file mode 100644 index 00000000..89b7bd5d --- /dev/null +++ b/mlprec/impl/mld_s_hierarchy_bld.f90 @@ -0,0 +1,234 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_s_hierarchy_bld.f90 +! +! Subroutine: mld_s_hierarchy_bld +! Version: real +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_sspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_sprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_s_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_s_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_s_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_s_inner_mod + use mld_s_prec_mod, mld_protect_name => mld_s_hierarchy_bld + + Implicit None + + ! Arguments + type(psb_sspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_sprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_sparse_mat), intent(in), optional :: amold + class(psb_s_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_spk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_s_hierarchy_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + p%ictxt = ictxt + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_sprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + newsz = -1 + casize = p%coarse_aggr_size + nplevs = p%n_prec_levs + mxplevs = p%max_prec_levs + mnaggratio = p%min_aggr_ratio + casize = p%coarse_aggr_size + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + call psb_bcast(ictxt,casize) + call psb_bcast(ictxt,nplevs) + call psb_bcast(ictxt,mxplevs) + call psb_bcast(ictxt,mnaggratio) + if (casize /= p%coarse_aggr_size) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') + goto 9999 + end if + if (nplevs /= p%n_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') + goto 9999 + end if + if (mxplevs /= p%max_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + goto 9999 + end if + if (mnaggratio /= p%min_aggr_ratio) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') + goto 9999 + end if + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + if (nplevs <= 0) then + ! + ! This should become the default strategy, we specify a target aggregation size. + ! + if (casize <=0) then + ! + ! Default to the cubic root of the size at base level. + ! + casize = desc_a%get_global_rows() + casize = int((sone*casize)**(sone/(sone*3)),psb_ipk_) + casize = max(casize,ione) + end if + call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) + else + ! + ! Oldstyle with fixed number of levels. + ! + nplevs = max(itwo,min(nplevs,mxplevs)) + call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) + end if + + if (info /= psb_success_) then + call psb_errpush(psb_err_internal_error_,name,& + & a_err='Internal hierarchy build' ) + goto 9999 + endif + + iszv = size(p%precv) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_s_hierarchy_bld diff --git a/mlprec/impl/mld_s_ml_prec_bld.f90 b/mlprec/impl/mld_s_ml_prec_bld.f90 new file mode 100644 index 00000000..3614504d --- /dev/null +++ b/mlprec/impl/mld_s_ml_prec_bld.f90 @@ -0,0 +1,194 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_s_ml_prec_bld.f90 +! +! Subroutine: mld_s_ml_prec_bld +! Version: real +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_sspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_sprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_s_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_s_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_s_inner_mod + use mld_s_prec_mod, mld_protect_name => mld_s_ml_prec_bld + + Implicit None + + ! Arguments + type(psb_sspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_sprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_sparse_mat), intent(in), optional :: amold + class(psb_s_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_spk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_s_ml_prec_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_sprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + ! + ! Now do the real build. + ! + + do i=1, iszv + ! + ! build the base preconditioner at level i + ! + call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) + + if (info /= psb_success_) then + write(ch_err,'(a,i7)') 'Error @ level',i + call psb_errpush(psb_err_internal_error_,name,& + & a_err=ch_err) + goto 9999 + endif + + end do + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_s_ml_prec_bld diff --git a/mlprec/impl/mld_smlprec_bld.f90 b/mlprec/impl/mld_smlprec_bld.f90 index 9025bb12..8f9d4502 100644 --- a/mlprec/impl/mld_smlprec_bld.f90 +++ b/mlprec/impl/mld_smlprec_bld.f90 @@ -118,120 +118,25 @@ subroutine mld_smlprec_bld(a,desc_a,p,info,amold,vmold,imold) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'Entering ' - ! - ! For the time being we are commenting out the UPDATE argument - ! we plan to resurrect it later. - ! !$ if (present(upd)) then - ! !$ if (debug_level >= psb_debug_outer_) & - ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd - ! !$ - ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then - ! !$ upd_=psb_toupper(upd) - ! !$ else - ! !$ upd_='F' - ! !$ endif - ! !$ else - ! !$ upd_='F' - ! !$ endif - upd_ = 'F' - - if (.not.allocated(p%precv)) then - !! Error: should have called mld_sprecinit - info=3111 - call psb_errpush(info,name) - goto 9999 - end if - ! - ! Check to ensure all procs have the same - ! - newsz = -1 - casize = p%coarse_aggr_size - nplevs = p%n_prec_levs - mxplevs = p%max_prec_levs - mnaggratio = p%min_aggr_ratio - casize = p%coarse_aggr_size - iszv = size(p%precv) - call psb_bcast(ictxt,iszv) - call psb_bcast(ictxt,casize) - call psb_bcast(ictxt,nplevs) - call psb_bcast(ictxt,mxplevs) - call psb_bcast(ictxt,mnaggratio) - if (casize /= p%coarse_aggr_size) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') - goto 9999 - end if - if (nplevs /= p%n_prec_levs) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') - goto 9999 - end if - if (mxplevs /= p%max_prec_levs) then + call mld_s_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + call psb_errpush(info,name,a_err='Error from hierarchy build') goto 9999 end if - if (mnaggratio /= p%min_aggr_ratio) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') - goto 9999 - end if - if (iszv /= size(p%precv)) then + + iszv = p%get_nlevs() + + call mld_s_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent size of precv') + call psb_errpush(info,name,a_err='Error from smoothers build') goto 9999 end if - if (iszv <= 1) then - ! We should only ever get here for multilevel. - info=psb_err_from_subroutine_ - ch_err='size bpv' - call psb_errpush(info,name,a_err=ch_err) - goto 9999 - endif - - if (nplevs <= 0) then - ! - ! This should become the default strategy, we specify a target aggregation size. - ! - if (casize <=0) then - ! - ! Default to the cubic root of the size at base level. - ! - casize = desc_a%get_global_rows() - casize = int((sone*casize)**(sone/(sone*3)),psb_ipk_) - casize = max(casize,ione) - end if - call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) - else - ! - ! Oldstyle with fixed number of levels. - ! - nplevs = max(itwo,min(nplevs,mxplevs)) - call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) - end if - iszv = size(p%precv) - - - ! - ! Now do the preconditioner build. - ! - - do i=1, iszv - ! - ! build the base preconditioner at level i - ! - call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) - - if (info /= psb_success_) then - write(ch_err,'(a,i7)') 'Error @ level',i - call psb_errpush(psb_err_internal_error_,name,& - & a_err=ch_err) - goto 9999 - endif - - end do if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/impl/mld_z_hierarchy_bld.f90 b/mlprec/impl/mld_z_hierarchy_bld.f90 new file mode 100644 index 00000000..b43fc88e --- /dev/null +++ b/mlprec/impl/mld_z_hierarchy_bld.f90 @@ -0,0 +1,234 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_z_hierarchy_bld.f90 +! +! Subroutine: mld_z_hierarchy_bld +! Version: complex +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_zspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_zprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_z_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_z_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_z_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_z_inner_mod + use mld_z_prec_mod, mld_protect_name => mld_z_hierarchy_bld + + Implicit None + + ! Arguments + type(psb_zspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_zprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_sparse_mat), intent(in), optional :: amold + class(psb_z_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_dpk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_z_hierarchy_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + p%ictxt = ictxt + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_zprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + newsz = -1 + casize = p%coarse_aggr_size + nplevs = p%n_prec_levs + mxplevs = p%max_prec_levs + mnaggratio = p%min_aggr_ratio + casize = p%coarse_aggr_size + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + call psb_bcast(ictxt,casize) + call psb_bcast(ictxt,nplevs) + call psb_bcast(ictxt,mxplevs) + call psb_bcast(ictxt,mnaggratio) + if (casize /= p%coarse_aggr_size) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') + goto 9999 + end if + if (nplevs /= p%n_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') + goto 9999 + end if + if (mxplevs /= p%max_prec_levs) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + goto 9999 + end if + if (mnaggratio /= p%min_aggr_ratio) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') + goto 9999 + end if + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + if (nplevs <= 0) then + ! + ! This should become the default strategy, we specify a target aggregation size. + ! + if (casize <=0) then + ! + ! Default to the cubic root of the size at base level. + ! + casize = desc_a%get_global_rows() + casize = int((done*casize)**(done/(done*3)),psb_ipk_) + casize = max(casize,ione) + end if + call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) + else + ! + ! Oldstyle with fixed number of levels. + ! + nplevs = max(itwo,min(nplevs,mxplevs)) + call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) + end if + + if (info /= psb_success_) then + call psb_errpush(psb_err_internal_error_,name,& + & a_err='Internal hierarchy build' ) + goto 9999 + endif + + iszv = size(p%precv) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_z_hierarchy_bld diff --git a/mlprec/impl/mld_z_ml_prec_bld.f90 b/mlprec/impl/mld_z_ml_prec_bld.f90 new file mode 100644 index 00000000..6a87f734 --- /dev/null +++ b/mlprec/impl/mld_z_ml_prec_bld.f90 @@ -0,0 +1,194 @@ +!!$ +!!$ +!!$ 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. +!!$ +!!$ +! File: mld_z_ml_prec_bld.f90 +! +! Subroutine: mld_z_ml_prec_bld +! Version: complex +! +! This routine builds the preconditioner according to the requirements made by +! the user trough the subroutines mld_precinit and mld_precset. +! +! A multilevel preconditioner is regarded as an array of 'one-level' data structures, +! each containing the part of the preconditioner associated to a certain level, +! (for more details see the description of mld_Tonelev_type in mld_prec_type.f90). +! The levels are numbered in increasing order starting from the finest one, i.e. +! level 1 is the finest level. No transfer operators are associated to level 1. +! +! +! Arguments: +! a - type(psb_zspmat_type). +! The sparse matrix structure containing the local part of the +! matrix to be preconditioned. +! desc_a - type(psb_desc_type), input. +! The communication descriptor of a. +! p - type(mld_zprec_type), input/output. +! The preconditioner data structure containing the local part +! of the preconditioner to be built. +! info - integer, output. +! Error code. +! +! amold - class(psb_z_base_sparse_mat), input, optional +! Mold for the inner format of matrices contained in the +! preconditioner +! +! +! vmold - class(psb_z_base_vect_type), input, optional +! Mold for the inner format of vectors contained in the +! preconditioner +! +! +! +subroutine mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + use psb_base_mod + use mld_z_inner_mod + use mld_z_prec_mod, mld_protect_name => mld_z_ml_prec_bld + + Implicit None + + ! Arguments + type(psb_zspmat_type),intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_zprec_type),intent(inout),target :: p + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_sparse_mat), intent(in), optional :: amold + class(psb_z_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold +!!$ character, intent(in), optional :: upd + + ! Local Variables + integer(psb_ipk_) :: ictxt, me,np + integer(psb_ipk_) :: err,i,k, err_act, iszv, newsz, casize, nplevs, mxplevs + real(psb_dpk_) :: mnaggratio + integer(psb_ipk_) :: ipv(mld_ifpsz_), val + integer(psb_ipk_) :: int_err(5) + character :: upd_ + integer(psb_ipk_) :: debug_level, debug_unit + character(len=20) :: name, ch_err + + if (psb_get_errstatus().ne.0) return + info=psb_success_ + err=0 + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + + name = 'mld_z_ml_prec_bld' + info = psb_success_ + int_err(1) = 0 + ictxt = desc_a%get_context() + call psb_info(ictxt, me, np) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Entering ' + ! + ! For the time being we are commenting out the UPDATE argument + ! we plan to resurrect it later. + ! !$ if (present(upd)) then + ! !$ if (debug_level >= psb_debug_outer_) & + ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd + ! !$ + ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then + ! !$ upd_=psb_toupper(upd) + ! !$ else + ! !$ upd_='F' + ! !$ endif + ! !$ else + ! !$ upd_='F' + ! !$ endif + upd_ = 'F' + + if (.not.allocated(p%precv)) then + !! Error: should have called mld_zprecinit + info=3111 + call psb_errpush(info,name) + goto 9999 + end if + + ! + ! Check to ensure all procs have the same + ! + iszv = size(p%precv) + call psb_bcast(ictxt,iszv) + if (iszv /= size(p%precv)) then + info=psb_err_internal_error_ + call psb_errpush(info,name,a_err='Inconsistent size of precv') + goto 9999 + end if + + if (iszv <= 1) then + ! We should only ever get here for multilevel. + info=psb_err_from_subroutine_ + ch_err='size bpv' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + endif + + ! + ! Now do the real build. + ! + + do i=1, iszv + ! + ! build the base preconditioner at level i + ! + call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) + + if (info /= psb_success_) then + write(ch_err,'(a,i7)') 'Error @ level',i + call psb_errpush(psb_err_internal_error_,name,& + & a_err=ch_err) + goto 9999 + endif + + end do + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Exiting with',iszv,' levels' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +end subroutine mld_z_ml_prec_bld diff --git a/mlprec/impl/mld_zmlprec_bld.f90 b/mlprec/impl/mld_zmlprec_bld.f90 index 8aab68c2..b1532029 100644 --- a/mlprec/impl/mld_zmlprec_bld.f90 +++ b/mlprec/impl/mld_zmlprec_bld.f90 @@ -118,120 +118,25 @@ subroutine mld_zmlprec_bld(a,desc_a,p,info,amold,vmold,imold) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'Entering ' - ! - ! For the time being we are commenting out the UPDATE argument - ! we plan to resurrect it later. - ! !$ if (present(upd)) then - ! !$ if (debug_level >= psb_debug_outer_) & - ! !$ & write(debug_unit,*) me,' ',trim(name),'UPD ', upd - ! !$ - ! !$ if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then - ! !$ upd_=psb_toupper(upd) - ! !$ else - ! !$ upd_='F' - ! !$ endif - ! !$ else - ! !$ upd_='F' - ! !$ endif - upd_ = 'F' - - if (.not.allocated(p%precv)) then - !! Error: should have called mld_zprecinit - info=3111 - call psb_errpush(info,name) - goto 9999 - end if - ! - ! Check to ensure all procs have the same - ! - newsz = -1 - casize = p%coarse_aggr_size - nplevs = p%n_prec_levs - mxplevs = p%max_prec_levs - mnaggratio = p%min_aggr_ratio - casize = p%coarse_aggr_size - iszv = size(p%precv) - call psb_bcast(ictxt,iszv) - call psb_bcast(ictxt,casize) - call psb_bcast(ictxt,nplevs) - call psb_bcast(ictxt,mxplevs) - call psb_bcast(ictxt,mnaggratio) - if (casize /= p%coarse_aggr_size) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent coarse_aggr_size') - goto 9999 - end if - if (nplevs /= p%n_prec_levs) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent n_prec_levs') - goto 9999 - end if - if (mxplevs /= p%max_prec_levs) then + call mld_z_hierarchy_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent max_prec_levs') + call psb_errpush(info,name,a_err='Error from hierarchy build') goto 9999 end if - if (mnaggratio /= p%min_aggr_ratio) then - info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent min_aggr_ratio') - goto 9999 - end if - if (iszv /= size(p%precv)) then + + iszv = p%get_nlevs() + + call mld_z_ml_prec_bld(a,desc_a,p,info,amold,vmold,imold) + + if (info /= psb_success_) then info=psb_err_internal_error_ - call psb_errpush(info,name,a_err='Inconsistent size of precv') + call psb_errpush(info,name,a_err='Error from smoothers build') goto 9999 end if - if (iszv <= 1) then - ! We should only ever get here for multilevel. - info=psb_err_from_subroutine_ - ch_err='size bpv' - call psb_errpush(info,name,a_err=ch_err) - goto 9999 - endif - - if (nplevs <= 0) then - ! - ! This should become the default strategy, we specify a target aggregation size. - ! - if (casize <=0) then - ! - ! Default to the cubic root of the size at base level. - ! - casize = desc_a%get_global_rows() - casize = int((done*casize)**(done/(done*3)),psb_ipk_) - casize = max(casize,ione) - end if - call mld_bld_mlhier_aggsize(casize,mxplevs,mnaggratio,a,desc_a,p%precv,info) - else - ! - ! Oldstyle with fixed number of levels. - ! - nplevs = max(itwo,min(nplevs,mxplevs)) - call mld_bld_mlhier_array(nplevs,a,desc_a,p%precv,info) - end if - iszv = size(p%precv) - - - ! - ! Now do the preconditioner build. - ! - - do i=1, iszv - ! - ! build the base preconditioner at level i - ! - call p%precv(i)%bld(info,amold=amold,vmold=vmold,imold=imold) - - if (info /= psb_success_) then - write(ch_err,'(a,i7)') 'Error @ level',i - call psb_errpush(psb_err_internal_error_,name,& - & a_err=ch_err) - goto 9999 - endif - - end do if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90 index 929f0b5c..9da1ce64 100644 --- a/mlprec/mld_c_inner_mod.f90 +++ b/mlprec/mld_c_inner_mod.f90 @@ -60,7 +60,7 @@ module mld_c_inner_mod class(psb_c_base_sparse_mat), intent(in), optional :: amold class(psb_c_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd +! !$ character, intent(in),optional :: upd end subroutine mld_cmlprec_bld end interface mld_mlprec_bld diff --git a/mlprec/mld_c_prec_mod.f90 b/mlprec/mld_c_prec_mod.f90 index 331dd65a..259e8167 100644 --- a/mlprec/mld_c_prec_mod.f90 +++ b/mlprec/mld_c_prec_mod.f90 @@ -70,8 +70,6 @@ module mld_c_prec_mod & mld_c_cprecseti, mld_c_cprecsetc, mld_c_cprecsetr end interface -!!$ interface mld_inner_precset - interface mld_precbld subroutine mld_cprecbld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_cspmat_type, psb_desc_type, psb_spk_, & @@ -85,10 +83,44 @@ module mld_c_prec_mod class(psb_c_base_sparse_mat), intent(in), optional :: amold class(psb_c_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd + ! character, intent(in),optional :: upd end subroutine mld_cprecbld end interface + interface mld_hierarchy_bld + subroutine mld_c_hierarchy_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & psb_c_base_sparse_mat, psb_c_base_vect_type, & + & psb_i_base_vect_type, mld_cprec_type, psb_ipk_ + implicit none + type(psb_cspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_cprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_sparse_mat), intent(in), optional :: amold + class(psb_c_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_c_hierarchy_bld + end interface + + interface mld_ml_prec_bld + subroutine mld_c_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_cspmat_type, psb_desc_type, psb_spk_, & + & psb_c_base_sparse_mat, psb_c_base_vect_type, & + & psb_i_base_vect_type, mld_cprec_type, psb_ipk_ + implicit none + type(psb_cspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_cprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_c_base_sparse_mat), intent(in), optional :: amold + class(psb_c_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_c_ml_prec_bld + end interface + contains subroutine mld_c_iprecsetsm(p,val,info,pos) diff --git a/mlprec/mld_c_prec_type.f90 b/mlprec/mld_c_prec_type.f90 index 0c453250..ca296236 100644 --- a/mlprec/mld_c_prec_type.f90 +++ b/mlprec/mld_c_prec_type.f90 @@ -104,6 +104,7 @@ module mld_c_prec_type procedure, pass(prec) :: free => mld_c_prec_free procedure, pass(prec) :: get_complexity => mld_c_get_compl procedure, pass(prec) :: cmp_complexity => mld_c_cmp_compl + procedure, pass(prec) :: get_nlevs => mld_c_get_nlevs procedure, pass(prec) :: get_nzeros => mld_c_get_nzeros procedure, pass(prec) :: sizeof => mld_cprec_sizeof procedure, pass(prec) :: setsm => mld_cprecsetsm @@ -122,7 +123,7 @@ module mld_c_prec_type end type mld_cprec_type private :: mld_c_dump, mld_c_get_compl, mld_c_cmp_compl,& - & mld_c_get_nzeros, c_prec_move_alloc + & mld_c_get_nzeros, mld_c_get_nlevs, c_prec_move_alloc ! @@ -320,6 +321,18 @@ contains end if end function mld_c_get_solverp ! + ! Function returning the size of the precv(:) array + ! + function mld_c_get_nlevs(prec) result(val) + implicit none + class(mld_cprec_type), intent(in) :: prec + integer(psb_ipk_) :: val + val = 0 + if (allocated(prec%precv)) then + val = size(prec%precv) + end if + end function mld_c_get_nlevs + ! ! Function returning the size of the mld_prec_type data structure ! in bytes or in number of nonzeros of the operator(s) involved. ! diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90 index db1ae267..bf891db2 100644 --- a/mlprec/mld_d_inner_mod.f90 +++ b/mlprec/mld_d_inner_mod.f90 @@ -60,7 +60,7 @@ module mld_d_inner_mod class(psb_d_base_sparse_mat), intent(in), optional :: amold class(psb_d_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd +! !$ character, intent(in),optional :: upd end subroutine mld_dmlprec_bld end interface mld_mlprec_bld diff --git a/mlprec/mld_d_prec_mod.f90 b/mlprec/mld_d_prec_mod.f90 index f10a1d95..b97a9934 100644 --- a/mlprec/mld_d_prec_mod.f90 +++ b/mlprec/mld_d_prec_mod.f90 @@ -70,8 +70,6 @@ module mld_d_prec_mod & mld_d_cprecseti, mld_d_cprecsetc, mld_d_cprecsetr end interface -!!$ interface mld_inner_precset - interface mld_precbld subroutine mld_dprecbld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & @@ -85,10 +83,44 @@ module mld_d_prec_mod class(psb_d_base_sparse_mat), intent(in), optional :: amold class(psb_d_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd + ! character, intent(in),optional :: upd end subroutine mld_dprecbld end interface + interface mld_hierarchy_bld + subroutine mld_d_hierarchy_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & psb_d_base_sparse_mat, psb_d_base_vect_type, & + & psb_i_base_vect_type, mld_dprec_type, psb_ipk_ + implicit none + type(psb_dspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_dprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_sparse_mat), intent(in), optional :: amold + class(psb_d_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_d_hierarchy_bld + end interface + + interface mld_ml_prec_bld + subroutine mld_d_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_dspmat_type, psb_desc_type, psb_dpk_, & + & psb_d_base_sparse_mat, psb_d_base_vect_type, & + & psb_i_base_vect_type, mld_dprec_type, psb_ipk_ + implicit none + type(psb_dspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_dprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_d_base_sparse_mat), intent(in), optional :: amold + class(psb_d_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_d_ml_prec_bld + end interface + contains subroutine mld_d_iprecsetsm(p,val,info,pos) diff --git a/mlprec/mld_d_prec_type.f90 b/mlprec/mld_d_prec_type.f90 index 1372b146..a5f3f583 100644 --- a/mlprec/mld_d_prec_type.f90 +++ b/mlprec/mld_d_prec_type.f90 @@ -104,6 +104,7 @@ module mld_d_prec_type procedure, pass(prec) :: free => mld_d_prec_free procedure, pass(prec) :: get_complexity => mld_d_get_compl procedure, pass(prec) :: cmp_complexity => mld_d_cmp_compl + procedure, pass(prec) :: get_nlevs => mld_d_get_nlevs procedure, pass(prec) :: get_nzeros => mld_d_get_nzeros procedure, pass(prec) :: sizeof => mld_dprec_sizeof procedure, pass(prec) :: setsm => mld_dprecsetsm @@ -122,7 +123,7 @@ module mld_d_prec_type end type mld_dprec_type private :: mld_d_dump, mld_d_get_compl, mld_d_cmp_compl,& - & mld_d_get_nzeros, d_prec_move_alloc + & mld_d_get_nzeros, mld_d_get_nlevs, d_prec_move_alloc ! @@ -320,6 +321,18 @@ contains end if end function mld_d_get_solverp ! + ! Function returning the size of the precv(:) array + ! + function mld_d_get_nlevs(prec) result(val) + implicit none + class(mld_dprec_type), intent(in) :: prec + integer(psb_ipk_) :: val + val = 0 + if (allocated(prec%precv)) then + val = size(prec%precv) + end if + end function mld_d_get_nlevs + ! ! Function returning the size of the mld_prec_type data structure ! in bytes or in number of nonzeros of the operator(s) involved. ! diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90 index 4dc9922e..ed6dfa77 100644 --- a/mlprec/mld_s_inner_mod.f90 +++ b/mlprec/mld_s_inner_mod.f90 @@ -60,7 +60,7 @@ module mld_s_inner_mod class(psb_s_base_sparse_mat), intent(in), optional :: amold class(psb_s_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd +! !$ character, intent(in),optional :: upd end subroutine mld_smlprec_bld end interface mld_mlprec_bld diff --git a/mlprec/mld_s_prec_mod.f90 b/mlprec/mld_s_prec_mod.f90 index 594c79a9..2a52def1 100644 --- a/mlprec/mld_s_prec_mod.f90 +++ b/mlprec/mld_s_prec_mod.f90 @@ -70,8 +70,6 @@ module mld_s_prec_mod & mld_s_cprecseti, mld_s_cprecsetc, mld_s_cprecsetr end interface -!!$ interface mld_inner_precset - interface mld_precbld subroutine mld_sprecbld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_sspmat_type, psb_desc_type, psb_spk_, & @@ -85,10 +83,44 @@ module mld_s_prec_mod class(psb_s_base_sparse_mat), intent(in), optional :: amold class(psb_s_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd + ! character, intent(in),optional :: upd end subroutine mld_sprecbld end interface + interface mld_hierarchy_bld + subroutine mld_s_hierarchy_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & psb_s_base_sparse_mat, psb_s_base_vect_type, & + & psb_i_base_vect_type, mld_sprec_type, psb_ipk_ + implicit none + type(psb_sspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_sprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_sparse_mat), intent(in), optional :: amold + class(psb_s_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_s_hierarchy_bld + end interface + + interface mld_ml_prec_bld + subroutine mld_s_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_sspmat_type, psb_desc_type, psb_spk_, & + & psb_s_base_sparse_mat, psb_s_base_vect_type, & + & psb_i_base_vect_type, mld_sprec_type, psb_ipk_ + implicit none + type(psb_sspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_sprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_s_base_sparse_mat), intent(in), optional :: amold + class(psb_s_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_s_ml_prec_bld + end interface + contains subroutine mld_s_iprecsetsm(p,val,info,pos) diff --git a/mlprec/mld_s_prec_type.f90 b/mlprec/mld_s_prec_type.f90 index e3da89f4..384d587d 100644 --- a/mlprec/mld_s_prec_type.f90 +++ b/mlprec/mld_s_prec_type.f90 @@ -104,6 +104,7 @@ module mld_s_prec_type procedure, pass(prec) :: free => mld_s_prec_free procedure, pass(prec) :: get_complexity => mld_s_get_compl procedure, pass(prec) :: cmp_complexity => mld_s_cmp_compl + procedure, pass(prec) :: get_nlevs => mld_s_get_nlevs procedure, pass(prec) :: get_nzeros => mld_s_get_nzeros procedure, pass(prec) :: sizeof => mld_sprec_sizeof procedure, pass(prec) :: setsm => mld_sprecsetsm @@ -122,7 +123,7 @@ module mld_s_prec_type end type mld_sprec_type private :: mld_s_dump, mld_s_get_compl, mld_s_cmp_compl,& - & mld_s_get_nzeros, s_prec_move_alloc + & mld_s_get_nzeros, mld_s_get_nlevs, s_prec_move_alloc ! @@ -320,6 +321,18 @@ contains end if end function mld_s_get_solverp ! + ! Function returning the size of the precv(:) array + ! + function mld_s_get_nlevs(prec) result(val) + implicit none + class(mld_sprec_type), intent(in) :: prec + integer(psb_ipk_) :: val + val = 0 + if (allocated(prec%precv)) then + val = size(prec%precv) + end if + end function mld_s_get_nlevs + ! ! Function returning the size of the mld_prec_type data structure ! in bytes or in number of nonzeros of the operator(s) involved. ! diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90 index 6ed824f1..2af263d8 100644 --- a/mlprec/mld_z_inner_mod.f90 +++ b/mlprec/mld_z_inner_mod.f90 @@ -60,7 +60,7 @@ module mld_z_inner_mod class(psb_z_base_sparse_mat), intent(in), optional :: amold class(psb_z_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd +! !$ character, intent(in),optional :: upd end subroutine mld_zmlprec_bld end interface mld_mlprec_bld diff --git a/mlprec/mld_z_prec_mod.f90 b/mlprec/mld_z_prec_mod.f90 index 1360c6cc..40c25ef3 100644 --- a/mlprec/mld_z_prec_mod.f90 +++ b/mlprec/mld_z_prec_mod.f90 @@ -70,8 +70,6 @@ module mld_z_prec_mod & mld_z_cprecseti, mld_z_cprecsetc, mld_z_cprecsetr end interface -!!$ interface mld_inner_precset - interface mld_precbld subroutine mld_zprecbld(a,desc_a,prec,info,amold,vmold,imold) import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & @@ -85,10 +83,44 @@ module mld_z_prec_mod class(psb_z_base_sparse_mat), intent(in), optional :: amold class(psb_z_base_vect_type), intent(in), optional :: vmold class(psb_i_base_vect_type), intent(in), optional :: imold -!!$ character, intent(in),optional :: upd + ! character, intent(in),optional :: upd end subroutine mld_zprecbld end interface + interface mld_hierarchy_bld + subroutine mld_z_hierarchy_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & psb_z_base_sparse_mat, psb_z_base_vect_type, & + & psb_i_base_vect_type, mld_zprec_type, psb_ipk_ + implicit none + type(psb_zspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_zprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_sparse_mat), intent(in), optional :: amold + class(psb_z_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_z_hierarchy_bld + end interface + + interface mld_ml_prec_bld + subroutine mld_z_ml_prec_bld(a,desc_a,prec,info,amold,vmold,imold) + import :: psb_zspmat_type, psb_desc_type, psb_dpk_, & + & psb_z_base_sparse_mat, psb_z_base_vect_type, & + & psb_i_base_vect_type, mld_zprec_type, psb_ipk_ + implicit none + type(psb_zspmat_type), intent(in), target :: a + type(psb_desc_type), intent(inout), target :: desc_a + type(mld_zprec_type), intent(inout), target :: prec + integer(psb_ipk_), intent(out) :: info + class(psb_z_base_sparse_mat), intent(in), optional :: amold + class(psb_z_base_vect_type), intent(in), optional :: vmold + class(psb_i_base_vect_type), intent(in), optional :: imold + ! character, intent(in),optional :: upd + end subroutine mld_z_ml_prec_bld + end interface + contains subroutine mld_z_iprecsetsm(p,val,info,pos) diff --git a/mlprec/mld_z_prec_type.f90 b/mlprec/mld_z_prec_type.f90 index af73effb..b563cce4 100644 --- a/mlprec/mld_z_prec_type.f90 +++ b/mlprec/mld_z_prec_type.f90 @@ -104,6 +104,7 @@ module mld_z_prec_type procedure, pass(prec) :: free => mld_z_prec_free procedure, pass(prec) :: get_complexity => mld_z_get_compl procedure, pass(prec) :: cmp_complexity => mld_z_cmp_compl + procedure, pass(prec) :: get_nlevs => mld_z_get_nlevs procedure, pass(prec) :: get_nzeros => mld_z_get_nzeros procedure, pass(prec) :: sizeof => mld_zprec_sizeof procedure, pass(prec) :: setsm => mld_zprecsetsm @@ -122,7 +123,7 @@ module mld_z_prec_type end type mld_zprec_type private :: mld_z_dump, mld_z_get_compl, mld_z_cmp_compl,& - & mld_z_get_nzeros, z_prec_move_alloc + & mld_z_get_nzeros, mld_z_get_nlevs, z_prec_move_alloc ! @@ -320,6 +321,18 @@ contains end if end function mld_z_get_solverp ! + ! Function returning the size of the precv(:) array + ! + function mld_z_get_nlevs(prec) result(val) + implicit none + class(mld_zprec_type), intent(in) :: prec + integer(psb_ipk_) :: val + val = 0 + if (allocated(prec%precv)) then + val = size(prec%precv) + end if + end function mld_z_get_nlevs + ! ! Function returning the size of the mld_prec_type data structure ! in bytes or in number of nonzeros of the operator(s) involved. !