From 4f610021e4c192e593e30176526c5fd888c05863 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 19 Oct 2007 13:10:53 +0000 Subject: [PATCH] Fixed mld_ name glitch. --- mlprec/mld_daggrmap_bld.f90 | 4 ++-- mlprec/mld_prec_type.f90 | 6 +++--- mlprec/mld_zaggrmap_bld.f90 | 4 ++-- test/fileread/runs/drt.sh | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mlprec/mld_daggrmap_bld.f90 b/mlprec/mld_daggrmap_bld.f90 index cb2a5d93..2e56e38e 100644 --- a/mlprec/mld_daggrmap_bld.f90 +++ b/mlprec/mld_daggrmap_bld.f90 @@ -72,7 +72,7 @@ subroutine mld_daggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info) ncol = psb_cd_get_local_cols(desc_a) select case (aggr_type) - case (mld_dec_aggr_,sym_mld_dec_aggr_) + case (mld_dec_aggr_,mld_sym_dec_aggr_) nr = a%m @@ -305,7 +305,7 @@ subroutine mld_daggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info) nlaggr(me+1) = naggr call psb_sum(ictxt,nlaggr(1:np)) - if (aggr_type == sym_mld_dec_aggr_) then + if (aggr_type == mld_sym_dec_aggr_) then call psb_sp_free(atmp,info) end if diff --git a/mlprec/mld_prec_type.f90 b/mlprec/mld_prec_type.f90 index 4f0795d6..9581c97a 100644 --- a/mlprec/mld_prec_type.f90 +++ b/mlprec/mld_prec_type.f90 @@ -170,9 +170,9 @@ module mld_prec_type integer, parameter :: mld_f_none_=0,mld_ilu_n_=1,mld_milu_n_=2, mld_ilu_t_=3 integer, parameter :: mld_slu_=4, mld_umf_=5, mld_sludist_=6 ! Legal values for entry: mld_aggr_alg_ - integer, parameter :: mld_dec_aggr_=0, sym_mld_dec_aggr_=1 - integer, parameter :: mld_glb_aggr_=2, new_mld_dec_aggr_=3 - integer, parameter :: new_mld_glb_aggr_=4, mld_max_aggr_=new_mld_glb_aggr_ + integer, parameter :: mld_dec_aggr_=0, mld_sym_dec_aggr_=1 + integer, parameter :: mld_glb_aggr_=2, mld_new_dec_aggr_=3 + integer, parameter :: mld_new_glb_aggr_=4, mld_max_aggr_=mld_new_glb_aggr_ ! Legal values for entry: mld_aggr_kind_ integer, parameter :: mld_no_smooth_=0, mld_smooth_prol_=1, mld_biz_prol_=2 ! Legal values for entry: mld_aggr_eig_ diff --git a/mlprec/mld_zaggrmap_bld.f90 b/mlprec/mld_zaggrmap_bld.f90 index a70fd54d..ef4411e6 100644 --- a/mlprec/mld_zaggrmap_bld.f90 +++ b/mlprec/mld_zaggrmap_bld.f90 @@ -72,7 +72,7 @@ subroutine mld_zaggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info) ncol = psb_cd_get_local_cols(desc_a) select case (aggr_type) - case (mld_dec_aggr_,sym_mld_dec_aggr_) + case (mld_dec_aggr_,mld_sym_dec_aggr_) nr = a%m @@ -305,7 +305,7 @@ subroutine mld_zaggrmap_bld(aggr_type,a,desc_a,nlaggr,ilaggr,info) nlaggr(me+1) = naggr call psb_sum(ictxt,nlaggr(1:np)) - if (aggr_type == sym_mld_dec_aggr_) then + if (aggr_type == mld_sym_dec_aggr_) then call psb_sp_free(atmp,info) end if diff --git a/test/fileread/runs/drt.sh b/test/fileread/runs/drt.sh index b9149753..d2544986 100755 --- a/test/fileread/runs/drt.sh +++ b/test/fileread/runs/drt.sh @@ -32,10 +32,10 @@ $ntry NTRY for each comb. print out best timings 30 NPRCS nov rst prl fc1 fl1 mlt agg smt cm smp ft2 fl2 jsw nl omg th1 th2 name none none 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1.0 1e-4 1e-4 NOPREC diag none 0 0 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 DIAG -bjac none 0 0 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 BJAC -as none 0 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS -as none 1 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS -as none 2 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS +bjac none 0 0 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 BJAC +as none 0 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS +as none 1 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS +as none 2 1 0 1 0 2 0 1 0 2 1 0 4 1 -1.0 1e-4 1e-4 RAS as ml 0 1 0 1 0 2 0 1 0 2 1 0 4 2 -1.0 1e-4 1e-4 2L-M-RAS-I-D4 as ml 1 1 0 1 0 2 0 1 0 2 1 0 4 2 -1.0 1e-4 1e-4 2L-M-RAS-I-D4 as ml 2 1 0 1 0 2 0 1 0 2 1 0 4 2 -1.0 1e-4 1e-4 2L-M-RAS-I-D4 @@ -61,12 +61,12 @@ as ml 0 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e as ml 1 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R as ml 2 1 0 1 0 2 0 1 1 2 5 0 1 3 -1.0 1e-4 1e-4 3L-M-RAS-U-R 2 Number of matrices +kivap004.mtx none +kivap001.mtx none thm50x30.mtx none thm200x120.mtx none thm1000x600.mtx none a400x400.mtx b400.mtx -kivap004.mtx none -kivap001.mtx none kivap007.mtx none !!! preconditioner templates bja none 0 0 0 0 0 0 0 0 0 0 0 0.0 Block Jacobi