From e2e8b05e330dccff8b8e08654ecffc4c7fca2cce Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 9 May 2012 16:59:21 +0000 Subject: [PATCH] mld2p4-2 mlprec/impl/mld_c_onelev_impl.f90 mlprec/impl/mld_d_onelev_impl.f90 mlprec/impl/mld_s_onelev_impl.f90 mlprec/impl/mld_z_onelev_impl.f90 mlprec/mld_c_prec_type.f90 mlprec/mld_d_prec_type.f90 mlprec/mld_s_prec_type.f90 mlprec/mld_z_prec_type.f90 Use desc%free(). --- mlprec/impl/mld_c_onelev_impl.f90 | 2 +- mlprec/impl/mld_d_onelev_impl.f90 | 2 +- mlprec/impl/mld_s_onelev_impl.f90 | 2 +- mlprec/impl/mld_z_onelev_impl.f90 | 2 +- mlprec/mld_c_prec_type.f90 | 2 +- mlprec/mld_d_prec_type.f90 | 2 +- mlprec/mld_s_prec_type.f90 | 2 +- mlprec/mld_z_prec_type.f90 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mlprec/impl/mld_c_onelev_impl.f90 b/mlprec/impl/mld_c_onelev_impl.f90 index d25bd23f..7bcdbdd4 100644 --- a/mlprec/impl/mld_c_onelev_impl.f90 +++ b/mlprec/impl/mld_c_onelev_impl.f90 @@ -155,7 +155,7 @@ subroutine mld_c_base_onelev_free(lv,info) call lv%ac%free() if (lv%desc_ac%is_ok()) & - & call psb_cdfree(lv%desc_ac,info) + & call lv%desc_ac%free(info) call lv%map%free(info) ! This is a pointer to something else, must not free it here. diff --git a/mlprec/impl/mld_d_onelev_impl.f90 b/mlprec/impl/mld_d_onelev_impl.f90 index c83ff1de..2056d76a 100644 --- a/mlprec/impl/mld_d_onelev_impl.f90 +++ b/mlprec/impl/mld_d_onelev_impl.f90 @@ -155,7 +155,7 @@ subroutine mld_d_base_onelev_free(lv,info) call lv%ac%free() if (lv%desc_ac%is_ok()) & - & call psb_cdfree(lv%desc_ac,info) + & call lv%desc_ac%free(info) call lv%map%free(info) ! This is a pointer to something else, must not free it here. diff --git a/mlprec/impl/mld_s_onelev_impl.f90 b/mlprec/impl/mld_s_onelev_impl.f90 index 3a5d9d68..e5e1e20b 100644 --- a/mlprec/impl/mld_s_onelev_impl.f90 +++ b/mlprec/impl/mld_s_onelev_impl.f90 @@ -155,7 +155,7 @@ subroutine mld_s_base_onelev_free(lv,info) call lv%ac%free() if (lv%desc_ac%is_ok()) & - & call psb_cdfree(lv%desc_ac,info) + & call lv%desc_ac%free(info) call lv%map%free(info) ! This is a pointer to something else, must not free it here. diff --git a/mlprec/impl/mld_z_onelev_impl.f90 b/mlprec/impl/mld_z_onelev_impl.f90 index 68f20bab..d66dfeb4 100644 --- a/mlprec/impl/mld_z_onelev_impl.f90 +++ b/mlprec/impl/mld_z_onelev_impl.f90 @@ -155,7 +155,7 @@ subroutine mld_z_base_onelev_free(lv,info) call lv%ac%free() if (lv%desc_ac%is_ok()) & - & call psb_cdfree(lv%desc_ac,info) + & call lv%desc_ac%free(info) call lv%map%free(info) ! This is a pointer to something else, must not free it here. diff --git a/mlprec/mld_c_prec_type.f90 b/mlprec/mld_c_prec_type.f90 index 690def55..82a9dd0f 100644 --- a/mlprec/mld_c_prec_type.f90 +++ b/mlprec/mld_c_prec_type.f90 @@ -387,7 +387,7 @@ contains do i=1,size(p%precv) call p%precv(i)%free(info) end do - deallocate(p%precv) + deallocate(p%precv,stat=info) end if call psb_erractionrestore(err_act) return diff --git a/mlprec/mld_d_prec_type.f90 b/mlprec/mld_d_prec_type.f90 index 296751c5..c9dacf64 100644 --- a/mlprec/mld_d_prec_type.f90 +++ b/mlprec/mld_d_prec_type.f90 @@ -387,7 +387,7 @@ contains do i=1,size(p%precv) call p%precv(i)%free(info) end do - deallocate(p%precv) + deallocate(p%precv,stat=info) end if call psb_erractionrestore(err_act) return diff --git a/mlprec/mld_s_prec_type.f90 b/mlprec/mld_s_prec_type.f90 index da4cc788..95ec9718 100644 --- a/mlprec/mld_s_prec_type.f90 +++ b/mlprec/mld_s_prec_type.f90 @@ -387,7 +387,7 @@ contains do i=1,size(p%precv) call p%precv(i)%free(info) end do - deallocate(p%precv) + deallocate(p%precv,stat=info) end if call psb_erractionrestore(err_act) return diff --git a/mlprec/mld_z_prec_type.f90 b/mlprec/mld_z_prec_type.f90 index f910d7ba..903f92eb 100644 --- a/mlprec/mld_z_prec_type.f90 +++ b/mlprec/mld_z_prec_type.f90 @@ -387,7 +387,7 @@ contains do i=1,size(p%precv) call p%precv(i)%free(info) end do - deallocate(p%precv) + deallocate(p%precv,stat=info) end if call psb_erractionrestore(err_act) return