base/modules/psb_const_mod.F90
 base/modules/psb_error_mod.F90
 base/modules/psb_realloc_mod.F90
 base/serial/f03/psb_c_base_mat_impl.f03
 base/serial/f03/psb_c_coo_impl.f03
 base/serial/f03/psb_c_csc_impl.f03
 base/serial/f03/psb_c_csr_impl.f03
 base/serial/f03/psb_c_mat_impl.f03
 base/serial/f03/psb_d_base_mat_impl.f03
 base/serial/f03/psb_d_coo_impl.f03
 base/serial/f03/psb_d_csc_impl.f03
 base/serial/f03/psb_d_csr_impl.f03
 base/serial/f03/psb_d_mat_impl.f03
 base/serial/f03/psb_s_base_mat_impl.f03
 base/serial/f03/psb_s_coo_impl.f03
 base/serial/f03/psb_s_csc_impl.f03
 base/serial/f03/psb_s_csr_impl.f03
 base/serial/f03/psb_s_mat_impl.f03
 base/serial/f03/psb_z_base_mat_impl.f03
 base/serial/f03/psb_z_coo_impl.f03
 base/serial/f03/psb_z_csc_impl.f03
 base/serial/f03/psb_z_csr_impl.f03
 base/serial/f03/psb_z_mat_impl.f03
 base/serial/psb_cnumbmm.f90
 base/serial/psb_csymbmm.f90
 base/serial/psb_dnumbmm.f90
 base/serial/psb_dsymbmm.f90
 base/serial/psb_snumbmm.f90
 base/serial/psb_ssymbmm.f90
 base/serial/psb_znumbmm.f90
 base/serial/psb_zsymbmm.f90
 test/serial/Makefile
 test/serial/d_matgen.f03
 test/serial/psb_d_cxx_impl.f03
 test/serial/psb_d_cxx_mat_mod.f03

New psb_err_invalid_mat_state_ and error message. 
Debug statements REMEMBER TO TAKE THEM OUT!!
This commit is contained in:
Salvatore Filippone
2010-07-16 15:43:34 +00:00
parent 18ecc8983c
commit de705a3dc6
35 changed files with 395 additions and 406 deletions
+1
View File
@@ -170,6 +170,7 @@ module psb_const_mod
integer, parameter, public :: psb_err_many_optional_arg_=583
integer, parameter, public :: psb_err_spmat_invalid_state_=600
integer, parameter, public :: psb_err_missing_override_method_=700
integer, parameter, public :: psb_err_invalid_mat_state_=1121
integer, parameter, public :: psb_err_invalid_cd_state_=1122
integer, parameter, public :: psb_err_invalid_a_and_cd_state_=1123
integer, parameter, public :: psb_err_context_error_=2010
+2
View File
@@ -428,6 +428,8 @@ contains
write(psb_err_unit,&
& '("Base class method ",a," called: the class for ",a," is missing an overriding implementation")')&
& trim(r_name), trim(a_e_d)
case (psb_err_invalid_mat_state_)
write(psb_err_unit,'("Invalid state for sparse matrix")')
case (psb_err_invalid_cd_state_)
write(psb_err_unit,'("Invalid state for communication descriptor")')
case (psb_err_invalid_a_and_cd_state_)
+20 -52
View File
@@ -2913,12 +2913,7 @@ Contains
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(psb_err_unit,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
@@ -2940,11 +2935,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -2968,12 +2961,7 @@ Contains
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(psb_err_unit,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
@@ -2995,11 +2983,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3022,11 +3008,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3047,11 +3031,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3074,11 +3056,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3099,11 +3079,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3126,12 +3104,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(psb_err_unit,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3152,11 +3127,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3180,12 +3153,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
!!$ write(psb_err_unit,*) 'move_alloc: Clearing output'
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)
@@ -3206,11 +3176,9 @@ Contains
!
info=psb_success_
#ifdef HAVE_MOVE_ALLOC
if (allocated(vin)) then
call move_alloc(vin,vout)
else if (allocated(vout)) then
deallocate(vout)
end if
#else
if (allocated(vout)) then
deallocate(vout,stat=info)