From 76b1d9cdf9f04e786b28e6b75b7670d9b51ca9ee Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 6 Nov 2009 14:15:46 +0000 Subject: [PATCH] psblas3: prec/psb_c_bjacprec.f03 prec/psb_c_diagprec.f03 prec/psb_c_nullprec.f03 prec/psb_d_bjacprec.f03 prec/psb_d_diagprec.f03 prec/psb_d_nullprec.f03 prec/psb_prec_type.f03 prec/psb_s_bjacprec.f03 prec/psb_s_diagprec.f03 prec/psb_s_nullprec.f03 prec/psb_z_bjacprec.f03 prec/psb_z_diagprec.f03 prec/psb_z_nullprec.f03 util/psb_hbio_mod.f90 Fixes for HBIO. Name of methods in base preconditioners. --- prec/psb_c_bjacprec.f03 | 12 +++++------ prec/psb_c_diagprec.f03 | 12 +++++------ prec/psb_c_nullprec.f03 | 12 +++++------ prec/psb_d_bjacprec.f03 | 12 +++++------ prec/psb_d_diagprec.f03 | 12 +++++------ prec/psb_d_nullprec.f03 | 12 +++++------ prec/psb_prec_type.f03 | 44 ++++++++++++++++++++--------------------- prec/psb_s_bjacprec.f03 | 12 +++++------ prec/psb_s_diagprec.f03 | 12 +++++------ prec/psb_s_nullprec.f03 | 12 +++++------ prec/psb_z_bjacprec.f03 | 12 +++++------ prec/psb_z_diagprec.f03 | 12 +++++------ prec/psb_z_nullprec.f03 | 12 +++++------ util/psb_hbio_mod.f90 | 6 +++--- 14 files changed, 97 insertions(+), 97 deletions(-) diff --git a/prec/psb_c_bjacprec.f03 b/prec/psb_c_bjacprec.f03 index f2c2c394..014ed12b 100644 --- a/prec/psb_c_bjacprec.f03 +++ b/prec/psb_c_bjacprec.f03 @@ -10,12 +10,12 @@ module psb_c_bjacprec procedure, pass(prec) :: apply => c_bjac_apply procedure, pass(prec) :: precbld => c_bjac_precbld procedure, pass(prec) :: precinit => c_bjac_precinit - procedure, pass(prec) :: c_base_precseti => c_bjac_precseti - procedure, pass(prec) :: c_base_precsetr => c_bjac_precsetr - procedure, pass(prec) :: c_base_precsetc => c_bjac_precsetc - procedure, pass(prec) :: precfree => c_bjac_precfree - procedure, pass(prec) :: precdescr => c_bjac_precdescr - procedure, pass(prec) :: sizeof => c_bjac_sizeof + procedure, pass(prec) :: precseti => c_bjac_precseti + procedure, pass(prec) :: precsetr => c_bjac_precsetr + procedure, pass(prec) :: precsetc => c_bjac_precsetc + procedure, pass(prec) :: precfree => c_bjac_precfree + procedure, pass(prec) :: precdescr => c_bjac_precdescr + procedure, pass(prec) :: sizeof => c_bjac_sizeof end type psb_c_bjac_prec_type diff --git a/prec/psb_c_diagprec.f03 b/prec/psb_c_diagprec.f03 index b63b4665..09fd7ba3 100644 --- a/prec/psb_c_diagprec.f03 +++ b/prec/psb_c_diagprec.f03 @@ -8,12 +8,12 @@ module psb_c_diagprec procedure, pass(prec) :: apply => c_diag_apply procedure, pass(prec) :: precbld => c_diag_precbld procedure, pass(prec) :: precinit => c_diag_precinit - procedure, pass(prec) :: c_base_precseti => c_diag_precseti - procedure, pass(prec) :: c_base_precsetr => c_diag_precsetr - procedure, pass(prec) :: c_base_precsetc => c_diag_precsetc - procedure, pass(prec) :: precfree => c_diag_precfree - procedure, pass(prec) :: precdescr => c_diag_precdescr - procedure, pass(prec) :: sizeof => c_diag_sizeof + procedure, pass(prec) :: precseti => c_diag_precseti + procedure, pass(prec) :: precsetr => c_diag_precsetr + procedure, pass(prec) :: precsetc => c_diag_precsetc + procedure, pass(prec) :: precfree => c_diag_precfree + procedure, pass(prec) :: precdescr => c_diag_precdescr + procedure, pass(prec) :: sizeof => c_diag_sizeof end type psb_c_diag_prec_type diff --git a/prec/psb_c_nullprec.f03 b/prec/psb_c_nullprec.f03 index bb6f77c4..621d6f5f 100644 --- a/prec/psb_c_nullprec.f03 +++ b/prec/psb_c_nullprec.f03 @@ -7,12 +7,12 @@ module psb_c_nullprec procedure, pass(prec) :: apply => c_null_apply procedure, pass(prec) :: precbld => c_null_precbld procedure, pass(prec) :: precinit => c_null_precinit - procedure, pass(prec) :: c_base_precseti => c_null_precseti - procedure, pass(prec) :: c_base_precsetr => c_null_precsetr - procedure, pass(prec) :: c_base_precsetc => c_null_precsetc - procedure, pass(prec) :: precfree => c_null_precfree - procedure, pass(prec) :: precdescr => c_null_precdescr - procedure, pass(prec) :: sizeof => c_null_sizeof + procedure, pass(prec) :: precseti => c_null_precseti + procedure, pass(prec) :: precsetr => c_null_precsetr + procedure, pass(prec) :: precsetc => c_null_precsetc + procedure, pass(prec) :: precfree => c_null_precfree + procedure, pass(prec) :: precdescr => c_null_precdescr + procedure, pass(prec) :: sizeof => c_null_sizeof end type psb_c_null_prec_type diff --git a/prec/psb_d_bjacprec.f03 b/prec/psb_d_bjacprec.f03 index 3130f21b..ae01dc3e 100644 --- a/prec/psb_d_bjacprec.f03 +++ b/prec/psb_d_bjacprec.f03 @@ -10,12 +10,12 @@ module psb_d_bjacprec procedure, pass(prec) :: apply => d_bjac_apply procedure, pass(prec) :: precbld => d_bjac_precbld procedure, pass(prec) :: precinit => d_bjac_precinit - procedure, pass(prec) :: d_base_precseti => d_bjac_precseti - procedure, pass(prec) :: d_base_precsetr => d_bjac_precsetr - procedure, pass(prec) :: d_base_precsetc => d_bjac_precsetc - procedure, pass(prec) :: precfree => d_bjac_precfree - procedure, pass(prec) :: precdescr => d_bjac_precdescr - procedure, pass(prec) :: sizeof => d_bjac_sizeof + procedure, pass(prec) :: precseti => d_bjac_precseti + procedure, pass(prec) :: precsetr => d_bjac_precsetr + procedure, pass(prec) :: precsetc => d_bjac_precsetc + procedure, pass(prec) :: precfree => d_bjac_precfree + procedure, pass(prec) :: precdescr => d_bjac_precdescr + procedure, pass(prec) :: sizeof => d_bjac_sizeof end type psb_d_bjac_prec_type diff --git a/prec/psb_d_diagprec.f03 b/prec/psb_d_diagprec.f03 index f3d2f651..25070eee 100644 --- a/prec/psb_d_diagprec.f03 +++ b/prec/psb_d_diagprec.f03 @@ -8,12 +8,12 @@ module psb_d_diagprec procedure, pass(prec) :: apply => d_diag_apply procedure, pass(prec) :: precbld => d_diag_precbld procedure, pass(prec) :: precinit => d_diag_precinit - procedure, pass(prec) :: d_base_precseti => d_diag_precseti - procedure, pass(prec) :: d_base_precsetr => d_diag_precsetr - procedure, pass(prec) :: d_base_precsetc => d_diag_precsetc - procedure, pass(prec) :: precfree => d_diag_precfree - procedure, pass(prec) :: precdescr => d_diag_precdescr - procedure, pass(prec) :: sizeof => d_diag_sizeof + procedure, pass(prec) :: precseti => d_diag_precseti + procedure, pass(prec) :: precsetr => d_diag_precsetr + procedure, pass(prec) :: precsetc => d_diag_precsetc + procedure, pass(prec) :: precfree => d_diag_precfree + procedure, pass(prec) :: precdescr => d_diag_precdescr + procedure, pass(prec) :: sizeof => d_diag_sizeof end type psb_d_diag_prec_type diff --git a/prec/psb_d_nullprec.f03 b/prec/psb_d_nullprec.f03 index e648be62..8d18a1dd 100644 --- a/prec/psb_d_nullprec.f03 +++ b/prec/psb_d_nullprec.f03 @@ -7,12 +7,12 @@ module psb_d_nullprec procedure, pass(prec) :: apply => d_null_apply procedure, pass(prec) :: precbld => d_null_precbld procedure, pass(prec) :: precinit => d_null_precinit - procedure, pass(prec) :: d_base_precseti => d_null_precseti - procedure, pass(prec) :: d_base_precsetr => d_null_precsetr - procedure, pass(prec) :: d_base_precsetc => d_null_precsetc - procedure, pass(prec) :: precfree => d_null_precfree - procedure, pass(prec) :: precdescr => d_null_precdescr - procedure, pass(prec) :: sizeof => d_null_sizeof + procedure, pass(prec) :: precseti => d_null_precseti + procedure, pass(prec) :: precsetr => d_null_precsetr + procedure, pass(prec) :: precsetc => d_null_precsetc + procedure, pass(prec) :: precfree => d_null_precfree + procedure, pass(prec) :: precdescr => d_null_precdescr + procedure, pass(prec) :: sizeof => d_null_sizeof end type psb_d_null_prec_type diff --git a/prec/psb_prec_type.f03 b/prec/psb_prec_type.f03 index 596781eb..29c5532f 100644 --- a/prec/psb_prec_type.f03 +++ b/prec/psb_prec_type.f03 @@ -68,11 +68,11 @@ module psb_prec_type contains procedure, pass(prec) :: apply => s_base_apply procedure, pass(prec) :: precbld => s_base_precbld - procedure, pass(prec) :: s_base_precseti - procedure, pass(prec) :: s_base_precsetr - procedure, pass(prec) :: s_base_precsetc - procedure, pass(prec) :: sizeof => s_base_sizeof - generic, public :: precset => s_base_precseti, s_base_precsetr, s_base_precsetc + procedure, pass(prec) :: precseti => s_base_precseti + procedure, pass(prec) :: precsetr => s_base_precsetr + procedure, pass(prec) :: precsetc => s_base_precsetc + procedure, pass(prec) :: sizeof => s_base_sizeof + generic, public :: precset => precseti, precsetr, precsetc procedure, pass(prec) :: precinit => s_base_precinit procedure, pass(prec) :: precfree => s_base_precfree procedure, pass(prec) :: precdescr => s_base_precdescr @@ -88,13 +88,13 @@ module psb_prec_type type psb_d_base_prec_type contains - procedure, pass(prec) :: apply => d_base_apply + procedure, pass(prec) :: apply => d_base_apply procedure, pass(prec) :: precbld => d_base_precbld - procedure, pass(prec) :: d_base_precseti - procedure, pass(prec) :: d_base_precsetr - procedure, pass(prec) :: d_base_precsetc - procedure, pass(prec) :: sizeof => d_base_sizeof - generic, public :: precset => d_base_precseti, d_base_precsetr, d_base_precsetc + procedure, pass(prec) :: precseti => d_base_precseti + procedure, pass(prec) :: precsetr => d_base_precsetr + procedure, pass(prec) :: precsetc => d_base_precsetc + procedure, pass(prec) :: sizeof => d_base_sizeof + generic, public :: precset => precseti, precsetr, precsetc procedure, pass(prec) :: precinit => d_base_precinit procedure, pass(prec) :: precfree => d_base_precfree procedure, pass(prec) :: precdescr => d_base_precdescr @@ -113,11 +113,11 @@ module psb_prec_type contains procedure, pass(prec) :: apply => c_base_apply procedure, pass(prec) :: precbld => c_base_precbld - procedure, pass(prec) :: c_base_precseti - procedure, pass(prec) :: c_base_precsetr - procedure, pass(prec) :: c_base_precsetc - procedure, pass(prec) :: sizeof => c_base_sizeof - generic, public :: precset => c_base_precseti, c_base_precsetr, c_base_precsetc + procedure, pass(prec) :: precseti => c_base_precseti + procedure, pass(prec) :: precsetr => c_base_precsetr + procedure, pass(prec) :: precsetc => c_base_precsetc + procedure, pass(prec) :: sizeof => c_base_sizeof + generic, public :: precset => precseti, precsetr, precsetc procedure, pass(prec) :: precinit => c_base_precinit procedure, pass(prec) :: precfree => c_base_precfree procedure, pass(prec) :: precdescr => c_base_precdescr @@ -133,13 +133,13 @@ module psb_prec_type type psb_z_base_prec_type contains - procedure, pass(prec) :: apply => z_base_apply + procedure, pass(prec) :: apply => z_base_apply procedure, pass(prec) :: precbld => z_base_precbld - procedure, pass(prec) :: z_base_precseti - procedure, pass(prec) :: z_base_precsetr - procedure, pass(prec) :: z_base_precsetc - procedure, pass(prec) :: sizeof => z_base_sizeof - generic, public :: precset => z_base_precseti, z_base_precsetr, z_base_precsetc + procedure, pass(prec) :: precseti => z_base_precseti + procedure, pass(prec) :: precsetr => z_base_precsetr + procedure, pass(prec) :: precsetc => z_base_precsetc + procedure, pass(prec) :: sizeof => z_base_sizeof + generic, public :: precset => precseti, precsetr, precsetc procedure, pass(prec) :: precinit => z_base_precinit procedure, pass(prec) :: precfree => z_base_precfree procedure, pass(prec) :: precdescr => z_base_precdescr diff --git a/prec/psb_s_bjacprec.f03 b/prec/psb_s_bjacprec.f03 index b7554fb8..0788a4ed 100644 --- a/prec/psb_s_bjacprec.f03 +++ b/prec/psb_s_bjacprec.f03 @@ -10,12 +10,12 @@ module psb_s_bjacprec procedure, pass(prec) :: apply => s_bjac_apply procedure, pass(prec) :: precbld => s_bjac_precbld procedure, pass(prec) :: precinit => s_bjac_precinit - procedure, pass(prec) :: s_base_precseti => s_bjac_precseti - procedure, pass(prec) :: s_base_precsetr => s_bjac_precsetr - procedure, pass(prec) :: s_base_precsetc => s_bjac_precsetc - procedure, pass(prec) :: precfree => s_bjac_precfree - procedure, pass(prec) :: precdescr => s_bjac_precdescr - procedure, pass(prec) :: sizeof => s_bjac_sizeof + procedure, pass(prec) :: precseti => s_bjac_precseti + procedure, pass(prec) :: precsetr => s_bjac_precsetr + procedure, pass(prec) :: precsetc => s_bjac_precsetc + procedure, pass(prec) :: precfree => s_bjac_precfree + procedure, pass(prec) :: precdescr => s_bjac_precdescr + procedure, pass(prec) :: sizeof => s_bjac_sizeof end type psb_s_bjac_prec_type diff --git a/prec/psb_s_diagprec.f03 b/prec/psb_s_diagprec.f03 index 392f3f04..f5c009f7 100644 --- a/prec/psb_s_diagprec.f03 +++ b/prec/psb_s_diagprec.f03 @@ -8,12 +8,12 @@ module psb_s_diagprec procedure, pass(prec) :: apply => s_diag_apply procedure, pass(prec) :: precbld => s_diag_precbld procedure, pass(prec) :: precinit => s_diag_precinit - procedure, pass(prec) :: s_base_precseti => s_diag_precseti - procedure, pass(prec) :: s_base_precsetr => s_diag_precsetr - procedure, pass(prec) :: s_base_precsetc => s_diag_precsetc - procedure, pass(prec) :: precfree => s_diag_precfree - procedure, pass(prec) :: precdescr => s_diag_precdescr - procedure, pass(prec) :: sizeof => s_diag_sizeof + procedure, pass(prec) :: precseti => s_diag_precseti + procedure, pass(prec) :: precsetr => s_diag_precsetr + procedure, pass(prec) :: precsetc => s_diag_precsetc + procedure, pass(prec) :: precfree => s_diag_precfree + procedure, pass(prec) :: precdescr => s_diag_precdescr + procedure, pass(prec) :: sizeof => s_diag_sizeof end type psb_s_diag_prec_type diff --git a/prec/psb_s_nullprec.f03 b/prec/psb_s_nullprec.f03 index 1feedcbc..5b798a82 100644 --- a/prec/psb_s_nullprec.f03 +++ b/prec/psb_s_nullprec.f03 @@ -7,12 +7,12 @@ module psb_s_nullprec procedure, pass(prec) :: apply => s_null_apply procedure, pass(prec) :: precbld => s_null_precbld procedure, pass(prec) :: precinit => s_null_precinit - procedure, pass(prec) :: s_base_precseti => s_null_precseti - procedure, pass(prec) :: s_base_precsetr => s_null_precsetr - procedure, pass(prec) :: s_base_precsetc => s_null_precsetc - procedure, pass(prec) :: precfree => s_null_precfree - procedure, pass(prec) :: precdescr => s_null_precdescr - procedure, pass(prec) :: sizeof => s_null_sizeof + procedure, pass(prec) :: precseti => s_null_precseti + procedure, pass(prec) :: precsetr => s_null_precsetr + procedure, pass(prec) :: precsetc => s_null_precsetc + procedure, pass(prec) :: precfree => s_null_precfree + procedure, pass(prec) :: precdescr => s_null_precdescr + procedure, pass(prec) :: sizeof => s_null_sizeof end type psb_s_null_prec_type diff --git a/prec/psb_z_bjacprec.f03 b/prec/psb_z_bjacprec.f03 index 877c9fda..7778f64f 100644 --- a/prec/psb_z_bjacprec.f03 +++ b/prec/psb_z_bjacprec.f03 @@ -10,12 +10,12 @@ module psb_z_bjacprec procedure, pass(prec) :: apply => z_bjac_apply procedure, pass(prec) :: precbld => z_bjac_precbld procedure, pass(prec) :: precinit => z_bjac_precinit - procedure, pass(prec) :: z_base_precseti => z_bjac_precseti - procedure, pass(prec) :: z_base_precsetr => z_bjac_precsetr - procedure, pass(prec) :: z_base_precsetc => z_bjac_precsetc - procedure, pass(prec) :: precfree => z_bjac_precfree - procedure, pass(prec) :: precdescr => z_bjac_precdescr - procedure, pass(prec) :: sizeof => z_bjac_sizeof + procedure, pass(prec) :: precseti => z_bjac_precseti + procedure, pass(prec) :: precsetr => z_bjac_precsetr + procedure, pass(prec) :: precsetc => z_bjac_precsetc + procedure, pass(prec) :: precfree => z_bjac_precfree + procedure, pass(prec) :: precdescr => z_bjac_precdescr + procedure, pass(prec) :: sizeof => z_bjac_sizeof end type psb_z_bjac_prec_type diff --git a/prec/psb_z_diagprec.f03 b/prec/psb_z_diagprec.f03 index 34a14e50..a4205230 100644 --- a/prec/psb_z_diagprec.f03 +++ b/prec/psb_z_diagprec.f03 @@ -8,12 +8,12 @@ module psb_z_diagprec procedure, pass(prec) :: apply => z_diag_apply procedure, pass(prec) :: precbld => z_diag_precbld procedure, pass(prec) :: precinit => z_diag_precinit - procedure, pass(prec) :: z_base_precseti => z_diag_precseti - procedure, pass(prec) :: z_base_precsetr => z_diag_precsetr - procedure, pass(prec) :: z_base_precsetc => z_diag_precsetc - procedure, pass(prec) :: precfree => z_diag_precfree - procedure, pass(prec) :: precdescr => z_diag_precdescr - procedure, pass(prec) :: sizeof => z_diag_sizeof + procedure, pass(prec) :: precseti => z_diag_precseti + procedure, pass(prec) :: precsetr => z_diag_precsetr + procedure, pass(prec) :: precsetc => z_diag_precsetc + procedure, pass(prec) :: precfree => z_diag_precfree + procedure, pass(prec) :: precdescr => z_diag_precdescr + procedure, pass(prec) :: sizeof => z_diag_sizeof end type psb_z_diag_prec_type diff --git a/prec/psb_z_nullprec.f03 b/prec/psb_z_nullprec.f03 index 20888dcb..bdc8b4bd 100644 --- a/prec/psb_z_nullprec.f03 +++ b/prec/psb_z_nullprec.f03 @@ -7,12 +7,12 @@ module psb_z_nullprec procedure, pass(prec) :: apply => z_null_apply procedure, pass(prec) :: precbld => z_null_precbld procedure, pass(prec) :: precinit => z_null_precinit - procedure, pass(prec) :: z_base_precseti => z_null_precseti - procedure, pass(prec) :: z_base_precsetr => z_null_precsetr - procedure, pass(prec) :: z_base_precsetc => z_null_precsetc - procedure, pass(prec) :: precfree => z_null_precfree - procedure, pass(prec) :: precdescr => z_null_precdescr - procedure, pass(prec) :: sizeof => z_null_sizeof + procedure, pass(prec) :: precseti => z_null_precseti + procedure, pass(prec) :: precsetr => z_null_precsetr + procedure, pass(prec) :: precsetc => z_null_precsetc + procedure, pass(prec) :: precfree => z_null_precfree + procedure, pass(prec) :: precdescr => z_null_precdescr + procedure, pass(prec) :: sizeof => z_null_sizeof end type psb_z_null_prec_type diff --git a/util/psb_hbio_mod.f90 b/util/psb_hbio_mod.f90 index 7f2fa485..e8cb6c47 100644 --- a/util/psb_hbio_mod.f90 +++ b/util/psb_hbio_mod.f90 @@ -562,7 +562,7 @@ contains select type(aa=>a%a) - type is (psb_s_csc_sparse_mat) + type is (psb_d_csc_sparse_mat) acpnt => aa @@ -909,7 +909,7 @@ contains select type(aa=>a%a) - type is (psb_s_csc_sparse_mat) + type is (psb_c_csc_sparse_mat) acpnt => aa @@ -1255,7 +1255,7 @@ contains select type(aa=>a%a) - type is (psb_s_csc_sparse_mat) + type is (psb_z_csc_sparse_mat) acpnt => aa