diff --git a/base/modules/desc/psb_desc_const_mod.f90 b/base/modules/desc/psb_desc_const_mod.f90 index 7a3eb4a4..173031e9 100644 --- a/base/modules/desc/psb_desc_const_mod.f90 +++ b/base/modules/desc/psb_desc_const_mod.f90 @@ -108,7 +108,7 @@ module psb_desc_const_mod integer(psb_ipk_), parameter :: psb_max_hash_bits = 22 integer(psb_ipk_), parameter :: psb_hash_size = 2**psb_hash_bits, psb_hash_mask=psb_hash_size-1 integer(psb_ipk_), parameter :: psb_hpnt_nentries_ = 7 - integer(psb_ipk_), parameter :: psb_default_large_threshold=1*1024*1024 + integer(psb_ipk_), parameter :: psb_default_hash_threshold=1*1024*1024 ! ! Choice of algorithm for sparse matrix A2AV ! diff --git a/base/modules/desc/psb_desc_mod.F90 b/base/modules/desc/psb_desc_mod.F90 index 2ae1b1a5..716e222c 100644 --- a/base/modules/desc/psb_desc_mod.F90 +++ b/base/modules/desc/psb_desc_mod.F90 @@ -285,14 +285,14 @@ module psb_desc_mod module procedure psb_cdfree end interface psb_free - interface psb_cd_set_large_threshold - module procedure psb_i_cd_set_large_threshold - end interface psb_cd_set_large_threshold + interface psb_cd_set_hash_threshold + module procedure psb_i_cd_set_hash_threshold + end interface psb_cd_set_hash_threshold #if defined(PSB_IPK4) && defined(PSB_LPK8) - interface psb_cd_set_large_threshold - module procedure psb_l_cd_set_large_threshold - end interface psb_cd_set_large_threshold + interface psb_cd_set_hash_threshold + module procedure psb_l_cd_set_hash_threshold + end interface psb_cd_set_hash_threshold #endif interface psb_set_sp_a2av_alg @@ -309,7 +309,7 @@ module psb_desc_mod & cd_g2ls2_ins, cd_g2lv1_ins, cd_g2lv2_ins, cd_fnd_owner - integer(psb_lpk_), private, save :: cd_large_threshold = psb_default_large_threshold + integer(psb_lpk_), private, save :: cd_hash_threshold = psb_default_hash_threshold integer(psb_ipk_), private, save :: sp_a2av_alg = psb_sp_a2av_smpl_triad_ contains @@ -363,27 +363,27 @@ contains - subroutine psb_i_cd_set_large_threshold(ith) + subroutine psb_i_cd_set_hash_threshold(ith) implicit none integer(psb_ipk_), intent(in) :: ith if (ith > 0) then - cd_large_threshold = ith + cd_hash_threshold = ith end if - end subroutine psb_i_cd_set_large_threshold + end subroutine psb_i_cd_set_hash_threshold - subroutine psb_l_cd_set_large_threshold(ith) + subroutine psb_l_cd_set_hash_threshold(ith) implicit none integer(psb_lpk_), intent(in) :: ith if (ith > 0) then - cd_large_threshold = ith + cd_hash_threshold = ith end if - end subroutine psb_l_cd_set_large_threshold + end subroutine psb_l_cd_set_hash_threshold - function psb_cd_get_large_threshold() result(val) + function psb_cd_get_hash_threshold() result(val) implicit none integer(psb_lpk_) :: val - val = cd_large_threshold - end function psb_cd_get_large_threshold + val = cd_hash_threshold + end function psb_cd_get_hash_threshold function psb_cd_is_large_size(m) result(val) use psb_penv_mod @@ -392,7 +392,7 @@ contains integer(psb_lpk_), intent(in) :: m logical :: val !locals - val = (m > psb_cd_get_large_threshold()) + val = (m > psb_cd_get_hash_threshold()) end function psb_cd_is_large_size function psb_cd_choose_large_state(ctxt,m) result(val) diff --git a/base/tools/psb_cd_inloc.f90 b/base/tools/psb_cd_inloc.f90 index 7315f376..eae2ace3 100644 --- a/base/tools/psb_cd_inloc.f90 +++ b/base/tools/psb_cd_inloc.f90 @@ -125,7 +125,7 @@ subroutine psb_cd_inloc(v, ctxt, desc, info, globalcheck,idx,usehash) if (me == psb_root_) then exch(1)=m exch(2)=n - exch(3)=psb_cd_get_large_threshold() + exch(3)=psb_cd_get_hash_threshold() call psb_bcast(ctxt,exch(1:3),root=psb_root_) else call psb_bcast(ctxt,exch(1:3),root=psb_root_) @@ -140,7 +140,7 @@ subroutine psb_cd_inloc(v, ctxt, desc, info, globalcheck,idx,usehash) call psb_errpush(err,name,l_err=l_err) goto 9999 endif - call psb_cd_set_large_threshold(exch(3)) + call psb_cd_set_hash_threshold(exch(3)) endif if (debug_level >= psb_debug_ext_) & & write(debug_unit,*) me,' ',trim(name),': doing global checks' diff --git a/base/tools/psb_cdals.f90 b/base/tools/psb_cdals.f90 index 1387b1a8..2d7d2ac3 100644 --- a/base/tools/psb_cdals.f90 +++ b/base/tools/psb_cdals.f90 @@ -99,7 +99,7 @@ subroutine psb_cdals(m, n, parts, ctxt, desc, info) & write(debug_unit,*) me,' ',trim(name),': doing global checks' !global check on m and n parameters if (me == psb_root_) then - exch(1)=m; exch(2)=n; exch(3)=psb_cd_get_large_threshold() + exch(1)=m; exch(2)=n; exch(3)=psb_cd_get_hash_threshold() call psb_bcast(ctxt,exch(1:3),root=psb_root_) else call psb_bcast(ctxt,exch(1:3),root=psb_root_) @@ -112,7 +112,7 @@ subroutine psb_cdals(m, n, parts, ctxt, desc, info) call psb_errpush(err,name,m_err=(/2/)) goto 9999 endif - call psb_cd_set_large_threshold(exch(3)) + call psb_cd_set_hash_threshold(exch(3)) endif call psb_nullify_desc(desc) diff --git a/base/tools/psb_cdalv.f90 b/base/tools/psb_cdalv.f90 index fcc10c79..f847d992 100644 --- a/base/tools/psb_cdalv.f90 +++ b/base/tools/psb_cdalv.f90 @@ -102,7 +102,7 @@ subroutine psb_cdalv(v, ctxt, desc, info, flag) if (me == psb_root_) then exch(1)=m exch(2)=n - exch(3)=psb_cd_get_large_threshold() + exch(3)=psb_cd_get_hash_threshold() call psb_bcast(ctxt,exch(1:3),root=psb_root_) else call psb_bcast(ctxt,exch(1:3),root=psb_root_) @@ -117,7 +117,7 @@ subroutine psb_cdalv(v, ctxt, desc, info, flag) call psb_errpush(err,name,l_err=l_err) goto 9999 endif - call psb_cd_set_large_threshold(exch(3)) + call psb_cd_set_hash_threshold(exch(3)) endif call psb_nullify_desc(desc) diff --git a/docs/psblas-3.9.pdf b/docs/psblas-3.9.pdf index f6e82066..c63fd89a 100644 --- a/docs/psblas-3.9.pdf +++ b/docs/psblas-3.9.pdf @@ -38262,8 +38262,8 @@ endobj 2461 0 obj << /Title (Parallel Sparse BLAS V. 3.9.0) /Subject (Parallel Sparse Basic Linear Algebra Subroutines) /Keywords (Computer Science Linear Algebra Fluid Dynamics Parallel Linux MPI PSBLAS Iterative Solvers Preconditioners) /Creator (pdfLaTeX) /Producer ($Id$) /Author()/Title()/Subject()/Creator(LaTeX with hyperref)/Keywords() -/CreationDate (D:20250403175441+02'00') -/ModDate (D:20250403175441+02'00') +/CreationDate (D:20250404093712+02'00') +/ModDate (D:20250404093712+02'00') /Trapped /False /PTEX.Fullbanner (This is pdfTeX, Version 3.141592653-2.6-1.40.25 (TeX Live 2023/Fedora 40) kpathsea version 6.3.5) >> @@ -38744,7 +38744,7 @@ endobj /W [1 3 1] /Root 2460 0 R /Info 2461 0 R -/ID [<967168E9B7CCEFAB140D63552E193731> <967168E9B7CCEFAB140D63552E193731>] +/ID [<4A7381D8FC94B32E72F6474995E896CA> <4A7381D8FC94B32E72F6474995E896CA>] /Length 12315 >> stream diff --git a/test/omp/psb_tomp.F90 b/test/omp/psb_tomp.F90 index 3e303594..45136ad0 100644 --- a/test/omp/psb_tomp.F90 +++ b/test/omp/psb_tomp.F90 @@ -728,7 +728,7 @@ program psb_d_pde3d if(psb_errstatus_fatal()) goto 9999 name='pde3d90' call psb_set_errverbosity(itwo) - call psb_cd_set_large_threshold(125000_psb_ipk_) + call psb_cd_set_hash_threshold(125000_psb_ipk_) ! ! Hello world !