From 44cffb0d361d25a80680cf721060672d5321ec87 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 27 Mar 2008 11:08:01 +0000 Subject: [PATCH] psblas2-dev: prec/psb_dprecinit.f90 prec/psb_prec_type.f90 prec/psb_zprecinit.f90 Changed name of dprcparm into rprcparm. --- prec/psb_dprecinit.f90 | 2 +- prec/psb_prec_type.f90 | 22 +++++++++++----------- prec/psb_zprecinit.f90 | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/prec/psb_dprecinit.f90 b/prec/psb_dprecinit.f90 index e7bc681d..1b202b4d 100644 --- a/prec/psb_dprecinit.f90 +++ b/prec/psb_dprecinit.f90 @@ -41,7 +41,7 @@ subroutine psb_dprecinit(p,ptype,info) info = 0 call psb_realloc(psb_ifpsz,p%iprcparm,info) - if (info == 0) call psb_realloc(psb_dfpsz,p%dprcparm,info) + if (info == 0) call psb_realloc(psb_rfpsz,p%rprcparm,info) if (info /= 0) return p%iprcparm(:) = 0 diff --git a/prec/psb_prec_type.f90 b/prec/psb_prec_type.f90 index 1fece286..c5ed142e 100644 --- a/prec/psb_prec_type.f90 +++ b/prec/psb_prec_type.f90 @@ -53,9 +53,9 @@ module psb_prec_type !Renumbering. SEE BELOW integer, parameter :: psb_renum_none_=0, psb_renum_glb_=1, psb_renum_gps_=2 integer, parameter :: psb_ifpsz=10 - ! Entries in dprcparm: ILU(E) epsilon, smoother omega + ! Entries in rprcparm: ILU(E) epsilon, smoother omega integer, parameter :: psb_fact_eps_=1 - integer, parameter :: psb_dfpsz=4 + integer, parameter :: psb_rfpsz=4 ! Factorization types: none, ILU(N), ILU(E) integer, parameter :: psb_f_none_=0,psb_f_ilu_n_=1 ! Fields for sparse matrices ensembles: @@ -68,7 +68,7 @@ module psb_prec_type real(psb_dpk_), allocatable :: d(:) type(psb_desc_type) :: desc_data integer, allocatable :: iprcparm(:) - real(psb_dpk_), allocatable :: dprcparm(:) + real(psb_dpk_), allocatable :: rprcparm(:) integer, allocatable :: perm(:), invperm(:) integer :: prec, base_prec end type psb_dprec_type @@ -78,7 +78,7 @@ module psb_prec_type complex(psb_dpk_), allocatable :: d(:) type(psb_desc_type) :: desc_data integer, allocatable :: iprcparm(:) - real(psb_dpk_), allocatable :: dprcparm(:) + real(psb_dpk_), allocatable :: rprcparm(:) integer, allocatable :: perm(:), invperm(:) integer :: prec, base_prec end type psb_zprec_type @@ -257,8 +257,8 @@ contains if (allocated(p%desc_data%matrix_data)) & & call psb_cdfree(p%desc_data,info) - if (allocated(p%dprcparm)) then - deallocate(p%dprcparm,stat=info) + if (allocated(p%rprcparm)) then + deallocate(p%rprcparm,stat=info) end if if (allocated(p%perm)) then @@ -291,7 +291,7 @@ contains use psb_base_mod type(psb_dprec_type), intent(inout) :: p -!!$ nullify(p%av,p%d,p%iprcparm,p%dprcparm,p%perm,p%invperm,p%mlia,& +!!$ nullify(p%av,p%d,p%iprcparm,p%rprcparm,p%perm,p%invperm,p%mlia,& !!$ & p%nlaggr,p%base_a,p%base_desc,p%dorig,p%desc_data, p%desc_ac) end subroutine psb_nullify_dprec @@ -326,8 +326,8 @@ contains if (allocated(p%desc_data%matrix_data)) & & call psb_cdfree(p%desc_data,info) - if (allocated(p%dprcparm)) then - deallocate(p%dprcparm,stat=info) + if (allocated(p%rprcparm)) then + deallocate(p%rprcparm,stat=info) end if if (allocated(p%perm)) then @@ -390,7 +390,7 @@ contains val = 0 if (allocated(prec%iprcparm)) val = val + psb_sizeof_int * size(prec%iprcparm) - if (allocated(prec%dprcparm)) val = val + psb_sizeof_dp * size(prec%dprcparm) + if (allocated(prec%rprcparm)) val = val + psb_sizeof_dp * size(prec%rprcparm) if (allocated(prec%d)) val = val + psb_sizeof_dp * size(prec%d) if (allocated(prec%perm)) val = val + psb_sizeof_int * size(prec%perm) if (allocated(prec%invperm)) val = val + psb_sizeof_int * size(prec%invperm) @@ -413,7 +413,7 @@ contains val = 0 if (allocated(prec%iprcparm)) val = val + psb_sizeof_int * size(prec%iprcparm) - if (allocated(prec%dprcparm)) val = val + psb_sizeof_dp * size(prec%dprcparm) + if (allocated(prec%rprcparm)) val = val + psb_sizeof_dp * size(prec%rprcparm) if (allocated(prec%d)) val = val + 2 * psb_sizeof_dp * size(prec%d) if (allocated(prec%perm)) val = val + psb_sizeof_int * size(prec%perm) if (allocated(prec%invperm)) val = val + psb_sizeof_int * size(prec%invperm) diff --git a/prec/psb_zprecinit.f90 b/prec/psb_zprecinit.f90 index 2c0ad958..43a94cb1 100644 --- a/prec/psb_zprecinit.f90 +++ b/prec/psb_zprecinit.f90 @@ -42,7 +42,7 @@ subroutine psb_zprecinit(p,ptype,info) info = 0 call psb_realloc(psb_ifpsz,p%iprcparm,info) - if (info == 0) call psb_realloc(psb_dfpsz,p%dprcparm,info) + if (info == 0) call psb_realloc(psb_rfpsz,p%rprcparm,info) if (info /= 0) return p%iprcparm(:) = 0