fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 12:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some error conditions.

Browse Source
This commit is contained in:
Salvatore Filippone
2006-05-17 14:58:27 +00:00
parent 1a1ee5f548
commit f79fa05332
4 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prec/psb_dbaseprc_bld.f90
+13
View File
@@ -234,11 +234,24 @@ subroutine psb_dbaseprc_bld(a,desc_a,p,info,upd)
case(f_none_)
write(0,*) 'Fact=None in BASEPRC_BLD Bja/ASM??'
info=4010
ch_err='Inconsistent prec f_none_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
case default
write(0,*) 'Unknown factor type in baseprc_bld bja/asm: ',&
&p%iprcparm(f_type_)
info=4010
ch_err='Unknown f_type_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end select
case default
info=4010
ch_err='Unknown p_type_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end select
src/prec/psb_zbaseprc_bld.f90
+13
View File
@@ -234,11 +234,24 @@ subroutine psb_zbaseprc_bld(a,desc_a,p,info,upd)
case(f_none_)
write(0,*) 'Fact=None in BASEPRC_BLD Bja/ASM??'
info=4010
ch_err='Inconsistent prec f_none_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
case default
write(0,*) 'Unknown factor type in baseprc_bld bja/asm: ',&
&p%iprcparm(f_type_)
info=4010
ch_err='Unknown f_type_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end select
case default
info=4010
ch_err='Unknown p_type_'
call psb_errpush(info,name,a_err=ch_err)
goto 9999
end select
src/tools/psb_dcdovr.f90
+13 -8
View File
@@ -146,8 +146,10 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info)
!!$ info = mpe_describe_state(idscb,idsce,"CDASB ","NavyBlue")
!!$ info = mpe_describe_state(iovrb,iovre,"CDOVRR ","DeepPink")
!!$ endif
If(debug)Write(0,*)'BEGIN cdovr',me,nhalo
!!$ call blacs_barrier(icontxt,'All')
If(debug) then
Write(0,*)'BEGIN cdovr',me,nhalo
call blacs_barrier(icontxt,'All')
endif
t1 = mpi_wtime()
@@ -180,7 +182,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info)
allocate(desc_ov%ovrlap_index(novr*(Max(2*index_dim,1)+1)),&
& desc_ov%ovrlap_elem(novr*(Max(elem_dim,1)+3)),&
& desc_ov%matrix_data(10),&
& desc_ov%matrix_data(psb_mdata_size_),&
& desc_ov%halo_index(novr*(Size(desc_a%halo_index)+3)),STAT=INFO)
if (info.ne.0) then
info=4000
@@ -202,9 +204,10 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info)
desc_ov%loc_to_glob(:) = desc_a%loc_to_glob(:)
desc_ov%glob_to_loc(:) = desc_a%glob_to_loc(:)
If(debug)Write(0,*)'Start cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
If(debug) then
Write(0,*)'Start cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
endif
!
! The real work goes on in here....
!
@@ -217,8 +220,10 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info)
goto 9999
end if
desc_ov%matrix_data(psb_dec_type_) = psb_desc_asb_
If(debug)Write(0,*)'Done cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
If(debug) then
Write(0,*)'Done cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
endif
!!$ ierr = MPE_Log_event( idsce, 0, "st CDASB" )
call psb_erractionrestore(err_act)
src/tools/psb_zcdovr.f90
+13 -7
View File
@@ -146,8 +146,10 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info)
!!$ info = mpe_describe_state(idscb,idsce,"CDASB ","NavyBlue")
!!$ info = mpe_describe_state(iovrb,iovre,"CDOVRR ","DeepPink")
!!$ endif
If(debug)Write(0,*)'BEGIN cdovr',me,nhalo
!!$ call blacs_barrier(icontxt,'All')
If(debug)then
Write(0,*)'BEGIN cdovr',me,nhalo
call blacs_barrier(icontxt,'All')
endif
t1 = mpi_wtime()
@@ -180,7 +182,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info)
allocate(desc_ov%ovrlap_index(novr*(Max(2*index_dim,1)+1)),&
& desc_ov%ovrlap_elem(novr*(Max(elem_dim,1)+3)),&
& desc_ov%matrix_data(10),&
& desc_ov%matrix_data(psb_mdata_size_),&
& desc_ov%halo_index(novr*(Size(desc_a%halo_index)+3)),STAT=INFO)
if (info.ne.0) then
info=4000
@@ -202,8 +204,10 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info)
desc_ov%loc_to_glob(:) = desc_a%loc_to_glob(:)
desc_ov%glob_to_loc(:) = desc_a%glob_to_loc(:)
If(debug)Write(0,*)'Start cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
If(debug)then
Write(0,*)'Start cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
endif
!
! The real work goes on in here....
@@ -217,8 +221,10 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info)
goto 9999
end if
desc_ov%matrix_data(psb_dec_type_) = psb_desc_asb_
If(debug)Write(0,*)'Done cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
If(debug)then
Write(0,*)'Done cdovrbld',me,lworks,lworkr
call blacs_barrier(icontxt,'All')
endif
!!$ ierr = MPE_Log_event( idsce, 0, "st CDASB" )
call psb_erractionrestore(err_act)