mirror of
https://github.com/sfilippone/psblas3.git
synced 2026-10-06 22:55:08 +00:00
Finish dual OMP/notOMP g2lv1_ins
This commit is contained in:
@@ -652,7 +652,7 @@ contains
|
||||
integer(psb_ipk_) :: me, np
|
||||
character(len=20) :: name,ch_err
|
||||
logical, allocatable :: mask_(:)
|
||||
logical :: use_openmp = .true.
|
||||
!!$ logical :: use_openmp = .true.
|
||||
#ifdef OPENMP
|
||||
integer(kind = OMP_lock_kind) :: ins_lck
|
||||
#endif
|
||||
@@ -683,119 +683,32 @@ contains
|
||||
mglob = idxmap%get_gr()
|
||||
nrow = idxmap%get_lr()
|
||||
!write(0,*) me,name,' before loop ',psb_errstatus_fatal()
|
||||
if (use_openmp) then
|
||||
#ifdef OPENMP
|
||||
!call OMP_init_lock(ins_lck)
|
||||
!call OMP_init_lock(ins_lck)
|
||||
|
||||
if (idxmap%is_bld()) then
|
||||
if (idxmap%is_bld()) then
|
||||
|
||||
isLoopValid = .true.
|
||||
ncol = idxmap%get_lc()
|
||||
isLoopValid = .true.
|
||||
ncol = idxmap%get_lc()
|
||||
if (present(mask)) then
|
||||
mask_ = mask
|
||||
else
|
||||
allocate(mask_(size(idx)))
|
||||
mask_ = .true.
|
||||
end if
|
||||
|
||||
if (present(lidx)) then
|
||||
if (present(mask)) then
|
||||
mask_ = mask
|
||||
else
|
||||
allocate(mask_(size(idx)))
|
||||
mask_ = .true.
|
||||
end if
|
||||
!$omp critical(hash_g2l_ins)
|
||||
|
||||
if (present(lidx)) then
|
||||
if (present(mask)) then
|
||||
!$omp critical(hash_g2l_ins)
|
||||
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mask,mglob,idxmap,ncol,nrow,laddsz,lidx) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
!call OMP_set_lock(ins_lck)
|
||||
ncol = idxmap%get_lc()
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
|
||||
! At first, we check the index presence in 'idxmap'. Usually
|
||||
! the index is found. If it is not found, we repeat the checking,
|
||||
! but inside a critical region.
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing).
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = lidx(i)
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
! Index not found
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
|
||||
if (info >= 0) then
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
! to the existing mapping.
|
||||
if (nxt == tlip) then
|
||||
|
||||
ncol = MAX(ncol,nxt)
|
||||
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 1'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
|
||||
isLoopValid = .false.
|
||||
idx(i) = -1
|
||||
else
|
||||
idx(i) = lip
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
end if
|
||||
end if
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
end if
|
||||
else
|
||||
idx(i) = lip
|
||||
end if
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
end if
|
||||
else
|
||||
!$omp critical(hash_g2l_ins)
|
||||
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mglob,idxmap,ncol,nrow,laddsz,lidx) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mask,mglob,idxmap,ncol,nrow,laddsz,lidx) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
@@ -812,6 +725,7 @@ contains
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing).
|
||||
@@ -823,9 +737,11 @@ contains
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
! Index not found
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
|
||||
if (info >= 0) then
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
@@ -838,7 +754,7 @@ contains
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 2'
|
||||
!write(0,*) 'Error spot 1'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
|
||||
@@ -858,160 +774,160 @@ contains
|
||||
else
|
||||
idx(i) = lip
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
end if
|
||||
else if (.not.present(lidx)) then
|
||||
if(present(mask)) then
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mask,mglob,idxmap,ncol,nrow,laddsz) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
|
||||
!$omp critical(hash_g2l_ins)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
!call OMP_set_lock(ins_lck)
|
||||
ncol = idxmap%get_lc()
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
else
|
||||
!$omp critical(hash_g2l_ins)
|
||||
|
||||
! At first, we check the index presence in 'idxmap'. Usually
|
||||
! the index is found. If it is not found, we repeat the checking,
|
||||
! but inside a critical region.
|
||||
!write(0,*) me,name,' b hic 1 ',psb_errstatus_fatal()
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
!write(0,*) me,name,' a hic 1 ',psb_errstatus_fatal()
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing, so this lock is relatively rare).
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = ncol + 1
|
||||
!write(0,*) me,name,' b hic 2 ',psb_errstatus_fatal()
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
!write(0,*) me,name,' a hic 2 ',psb_errstatus_fatal()
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
! Index not found
|
||||
!write(0,*) me,name,' b hsik ',psb_errstatus_fatal()
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
if (psb_errstatus_fatal()) write(0,*) me,name,' a hsik ',info,omp_get_thread_num()
|
||||
!write(0,*) me,name,' a hsik ',psb_errstatus_fatal()
|
||||
lip = tlip
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mglob,idxmap,ncol,nrow,laddsz,lidx) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
!call OMP_set_lock(ins_lck)
|
||||
ncol = idxmap%get_lc()
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
|
||||
if (info >= 0) then
|
||||
!write(0,*) 'Error before spot 3', info
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
! to the existing mapping.
|
||||
if (nxt == tlip) then
|
||||
! At first, we check the index presence in 'idxmap'. Usually
|
||||
! the index is found. If it is not found, we repeat the checking,
|
||||
! but inside a critical region.
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing).
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = lidx(i)
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
|
||||
ncol = MAX(ncol,nxt)
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (psb_errstatus_fatal()) write(0,*) me,name,' a esz ',info,omp_get_thread_num()
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 3', info
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
isLoopValid = .false.
|
||||
idx(i) = -1
|
||||
else
|
||||
idx(i) = lip
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
end if
|
||||
end if
|
||||
else
|
||||
if (info >= 0) then
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
! to the existing mapping.
|
||||
if (nxt == tlip) then
|
||||
|
||||
ncol = MAX(ncol,nxt)
|
||||
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 2'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
|
||||
isLoopValid = .false.
|
||||
idx(i) = -1
|
||||
else
|
||||
idx(i) = lip
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
end if
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
end if
|
||||
else
|
||||
idx(i) = lip
|
||||
idx(i) = -1
|
||||
end if
|
||||
else
|
||||
idx(i) = -1
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
else
|
||||
idx(i) = lip
|
||||
end if
|
||||
else
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mglob,idxmap,ncol,nrow,laddsz) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
!$omp critical(hash_g2l_ins)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
end if
|
||||
end if
|
||||
else if (.not.present(lidx)) then
|
||||
if(present(mask)) then
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mask,mglob,idxmap,ncol,nrow,laddsz) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
|
||||
!$omp critical(hash_g2l_ins)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
!call OMP_set_lock(ins_lck)
|
||||
!call OMP_set_lock(ins_lck)
|
||||
ncol = idxmap%get_lc()
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
|
||||
! At first, we check the index presence in 'idxmap'. Usually
|
||||
! the index is found. If it is not found, we repeat the checking,
|
||||
! but inside a critical region.
|
||||
!write(0,*) me,name,' b hic 1 ',psb_errstatus_fatal()
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
!write(0,*) me,name,' a hic 1 ',psb_errstatus_fatal()
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing).
|
||||
! is often already existing, so this lock is relatively rare).
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = ncol + 1
|
||||
nxt = ncol + 1
|
||||
!write(0,*) me,name,' b hic 2 ',psb_errstatus_fatal()
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
|
||||
!write(0,*) me,name,' a hic 2 ',psb_errstatus_fatal()
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
! Index not found
|
||||
!write(0,*) me,name,' b hsik ',psb_errstatus_fatal()
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
if (psb_errstatus_fatal()) write(0,*) me,name,' a hsik ',info,omp_get_thread_num()
|
||||
!write(0,*) me,name,' a hsik ',psb_errstatus_fatal()
|
||||
lip = tlip
|
||||
|
||||
if (info >= 0) then
|
||||
!write(0,*) 'Error before spot 3', info
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
! to the existing mapping.
|
||||
if (nxt == tlip) then
|
||||
|
||||
ncol = MAX(ncol,nxt)
|
||||
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
|
||||
if (psb_errstatus_fatal()) write(0,*) me,name,' a esz ',info,omp_get_thread_num()
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 4'
|
||||
!write(0,*) 'Error spot 3', info
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
|
||||
@@ -1028,116 +944,145 @@ contains
|
||||
end if
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
end if
|
||||
|
||||
else
|
||||
idx(i) = lip
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
end if
|
||||
end if
|
||||
else
|
||||
! Wrong state
|
||||
idx = -1
|
||||
info = -1
|
||||
end if
|
||||
!call OMP_destroy_lock(ins_lck)
|
||||
#endif
|
||||
else if (.not.use_openmp) then
|
||||
#ifdef OPENMP
|
||||
! $ omp parallel
|
||||
! $ omp critical
|
||||
!write(0,*) 'In cnv: ',omp_get_num_threads()
|
||||
#endif
|
||||
isLoopValid = .true.
|
||||
if (idxmap%is_bld()) then
|
||||
else
|
||||
! $ OMP PARALLEL DO default(none) schedule(DYNAMIC) &
|
||||
! $ OMP shared(name,me,is,idx,ins_lck,mglob,idxmap,ncol,nrow,laddsz) &
|
||||
! $ OMP private(i,ip,lip,tlip,nxt,info) &
|
||||
! $ OMP reduction(.AND.:isLoopValid)
|
||||
!$omp critical(hash_g2l_ins)
|
||||
do i = 1, is
|
||||
info = 0
|
||||
if (.not. isLoopValid) cycle
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
!call OMP_set_lock(ins_lck)
|
||||
ncol = idxmap%get_lc()
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
|
||||
if (present(lidx)) then
|
||||
if (present(mask)) then
|
||||
do i = 1, is
|
||||
! At first, we check the index presence in 'idxmap'. Usually
|
||||
! the index is found. If it is not found, we repeat the checking,
|
||||
! but inside a critical region.
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
!call OMP_set_lock(ins_lck)
|
||||
! We check again if the index is already in 'idxmap', this
|
||||
! time inside a critical region (we assume that the index
|
||||
! is often already existing).
|
||||
ncol = idxmap%get_lc()
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob) ) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
tlip = lip
|
||||
nxt = lidx(i)
|
||||
if (nxt <= nrow) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
if (info >=0) then
|
||||
if (nxt == tlip) then
|
||||
ncol = max(ncol,nxt)
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
nxt = ncol + 1
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
|
||||
if (lip > 0) then
|
||||
idx(i) = lip
|
||||
else if (lip < 0) then
|
||||
! Index not found
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
if (info >= 0) then
|
||||
! 'nxt' is not equal to 'tlip' when the key is already inside
|
||||
! the hash map. In that case 'tlip' is the value corresponding
|
||||
! to the existing mapping.
|
||||
if (nxt == tlip) then
|
||||
|
||||
ncol = MAX(ncol,nxt)
|
||||
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
|
||||
if (info /= psb_success_) then
|
||||
!write(0,*) 'Error spot 4'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
|
||||
isLoopValid = .false.
|
||||
idx(i) = -1
|
||||
else
|
||||
idx(i) = lip
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
endif
|
||||
info = psb_success_
|
||||
else
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err='SearchInsKeyVal',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
end if
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
else
|
||||
idx(i) = -1
|
||||
!call OMP_unset_lock(ins_lck)
|
||||
end if
|
||||
enddo
|
||||
|
||||
else if (.not.present(mask)) then
|
||||
else
|
||||
idx(i) = lip
|
||||
end if
|
||||
|
||||
do i = 1, is
|
||||
ncol = idxmap%get_lc()
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
end do
|
||||
! $ OMP END PARALLEL DO
|
||||
!$omp end critical(hash_g2l_ins)
|
||||
|
||||
if (.not. isLoopValid) then
|
||||
goto 9999
|
||||
end if
|
||||
|
||||
end if
|
||||
end if
|
||||
else
|
||||
! Wrong state
|
||||
idx = -1
|
||||
info = -1
|
||||
end if
|
||||
!call OMP_destroy_lock(ins_lck)
|
||||
#else
|
||||
!!$ else if (.not.use_openmp) then
|
||||
isLoopValid = .true.
|
||||
if (idxmap%is_bld()) then
|
||||
|
||||
if (present(lidx)) then
|
||||
if (present(mask)) then
|
||||
do i = 1, is
|
||||
ncol = idxmap%get_lc()
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob) ) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,idxmap%hashv,&
|
||||
& idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,&
|
||||
& idxmap%hashv,idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
tlip = lip
|
||||
nxt = lidx(i)
|
||||
if (nxt <= nrow) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
if (info >=0) then
|
||||
if (nxt == lip) then
|
||||
ncol = max(nxt,ncol)
|
||||
if (nxt == tlip) then
|
||||
ncol = max(ncol,nxt)
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
info=1
|
||||
!write(0,*) 'Error spot'
|
||||
!write(0,*) 'Error spot'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
@@ -1151,66 +1096,71 @@ contains
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
enddo
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
enddo
|
||||
|
||||
end if
|
||||
else if (.not.present(mask)) then
|
||||
|
||||
else if (.not.present(lidx)) then
|
||||
do i = 1, is
|
||||
ncol = idxmap%get_lc()
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,idxmap%hashv,&
|
||||
& idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
nxt = lidx(i)
|
||||
if (nxt <= nrow) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
|
||||
if (present(mask)) then
|
||||
do i = 1, is
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
if (info >=0) then
|
||||
if (nxt == lip) then
|
||||
ncol = max(nxt,ncol)
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
info=1
|
||||
!write(0,*) 'Error spot'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err='psb_ensure_size',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
endif
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = ncol + 1
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,idxmap%hashv,&
|
||||
& idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
end if
|
||||
|
||||
if (info >=0) then
|
||||
if (nxt == lip) then
|
||||
ncol = nxt
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
info=1
|
||||
write(0,*) 'Error spot 5'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err='psb_ensure_size',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
endif
|
||||
info = psb_success_
|
||||
else
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err='SearchInsKeyVal',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
else
|
||||
idx(i) = -1
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err='SearchInsKeyVal',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
enddo
|
||||
else if (.not.present(mask)) then
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
enddo
|
||||
|
||||
do i = 1, is
|
||||
ncol = idxmap%get_lc()
|
||||
ip = idx(i)
|
||||
end if
|
||||
|
||||
else if (.not.present(lidx)) then
|
||||
|
||||
if (present(mask)) then
|
||||
do i = 1, is
|
||||
if (mask(i)) then
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
nxt = ncol + 1
|
||||
ncol = idxmap%get_lc()
|
||||
nxt = ncol + 1
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,idxmap%hashv,&
|
||||
& idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
@@ -1225,41 +1175,80 @@ contains
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
info=1
|
||||
write(0,*) 'Error spot 6'
|
||||
ch_err='psb_ensure_size'
|
||||
write(0,*) 'Error spot 5'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err=ch_err,i_err=(/info,izero,izero,izero,izero/))
|
||||
& a_err='psb_ensure_size',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
endif
|
||||
info = psb_success_
|
||||
else
|
||||
ch_err='SearchInsKeyVal'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err=ch_err,i_err=(/info,izero,izero,izero,izero/))
|
||||
isLoopValid = .false.
|
||||
& a_err='SearchInsKeyVal',i_err=(/info/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
enddo
|
||||
else
|
||||
idx(i) = -1
|
||||
end if
|
||||
enddo
|
||||
else if (.not.present(mask)) then
|
||||
|
||||
do i = 1, is
|
||||
ncol = idxmap%get_lc()
|
||||
ip = idx(i)
|
||||
if ((ip < 1 ).or.(ip>mglob)) then
|
||||
idx(i) = -1
|
||||
cycle
|
||||
endif
|
||||
nxt = ncol + 1
|
||||
call hash_inner_cnv(ip,lip,idxmap%hashvmask,idxmap%hashv,&
|
||||
& idxmap%glb_lc,ncol)
|
||||
if (lip < 0) then
|
||||
call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
|
||||
lip = tlip
|
||||
end if
|
||||
|
||||
if (info >=0) then
|
||||
if (nxt == lip) then
|
||||
ncol = nxt
|
||||
call psb_ensure_size(ncol,idxmap%loc_to_glob,info,&
|
||||
& pad=-1_psb_lpk_,addsz=laddsz)
|
||||
if (info /= psb_success_) then
|
||||
info=1
|
||||
write(0,*) 'Error spot 6'
|
||||
ch_err='psb_ensure_size'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
&a_err=ch_err,i_err=(/info,izero,izero,izero,izero/))
|
||||
isLoopValid = .false.
|
||||
|
||||
end if
|
||||
idxmap%loc_to_glob(nxt) = ip
|
||||
call idxmap%set_lc(ncol)
|
||||
endif
|
||||
info = psb_success_
|
||||
else
|
||||
ch_err='SearchInsKeyVal'
|
||||
call psb_errpush(psb_err_from_subroutine_ai_,name,&
|
||||
& a_err=ch_err,i_err=(/info,izero,izero,izero,izero/))
|
||||
isLoopValid = .false.
|
||||
end if
|
||||
idx(i) = lip
|
||||
info = psb_success_
|
||||
enddo
|
||||
|
||||
end if
|
||||
end if
|
||||
else
|
||||
! Wrong state
|
||||
idx = -1
|
||||
info = -1
|
||||
end if
|
||||
#ifdef OPENMP
|
||||
! $ omp end critical
|
||||
! $ omp end parallel
|
||||
|
||||
#endif
|
||||
if (.not. isLoopValid) goto 9999
|
||||
else
|
||||
! Wrong state
|
||||
idx = -1
|
||||
info = -1
|
||||
end if
|
||||
if (.not. isLoopValid) goto 9999
|
||||
#endif
|
||||
!write(0,*) me,name,' after loop ',psb_errstatus_fatal()
|
||||
call psb_erractionrestore(err_act)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user