From 3f2088fbfbb48ea1f4d5edd90466a0f1703a0662 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 4 Nov 2008 15:54:39 +0000 Subject: [PATCH] mld2p4: Merged new linear map stuff. --- mlprec/mld_caggrmat_raw_asb.F90 | 2 +- mlprec/mld_caggrmat_smth_asb.F90 | 2 +- mlprec/mld_daggrmat_raw_asb.F90 | 2 +- mlprec/mld_daggrmat_smth_asb.F90 | 2 +- mlprec/mld_prec_type.f90 | 10 +++++----- mlprec/mld_saggrmat_raw_asb.F90 | 2 +- mlprec/mld_saggrmat_smth_asb.F90 | 2 +- mlprec/mld_zaggrmat_raw_asb.F90 | 2 +- mlprec/mld_zaggrmat_smth_asb.F90 | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mlprec/mld_caggrmat_raw_asb.F90 b/mlprec/mld_caggrmat_raw_asb.F90 index a1799c5f..6db5f368 100644 --- a/mlprec/mld_caggrmat_raw_asb.F90 +++ b/mlprec/mld_caggrmat_raw_asb.F90 @@ -266,7 +266,7 @@ subroutine mld_caggrmat_raw_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_caggrmat_smth_asb.F90 b/mlprec/mld_caggrmat_smth_asb.F90 index 8f07a7f1..94a5ac17 100644 --- a/mlprec/mld_caggrmat_smth_asb.F90 +++ b/mlprec/mld_caggrmat_smth_asb.F90 @@ -653,7 +653,7 @@ subroutine mld_caggrmat_smth_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_daggrmat_raw_asb.F90 b/mlprec/mld_daggrmat_raw_asb.F90 index c7a54002..c963ee05 100644 --- a/mlprec/mld_daggrmat_raw_asb.F90 +++ b/mlprec/mld_daggrmat_raw_asb.F90 @@ -266,7 +266,7 @@ subroutine mld_daggrmat_raw_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_daggrmat_smth_asb.F90 b/mlprec/mld_daggrmat_smth_asb.F90 index 3563afe4..c471a0db 100644 --- a/mlprec/mld_daggrmat_smth_asb.F90 +++ b/mlprec/mld_daggrmat_smth_asb.F90 @@ -653,7 +653,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_prec_type.f90 b/mlprec/mld_prec_type.f90 index 9c895005..b6857833 100644 --- a/mlprec/mld_prec_type.f90 +++ b/mlprec/mld_prec_type.f90 @@ -65,7 +65,7 @@ module mld_prec_type use psb_base_mod, only :& & psb_dspmat_type, psb_zspmat_type,& & psb_sspmat_type, psb_cspmat_type,& - & psb_desc_type, psb_inter_desc_type,& + & psb_desc_type, psb_linear_map_type,& & psb_dpk_, psb_spk_, psb_long_int_k_, & & psb_sp_free, psb_cdfree, psb_halo_, psb_none_, psb_sum_, psb_avg_, & & psb_nohalo_, psb_square_root_, psb_toupper, psb_root_,& @@ -184,7 +184,7 @@ module mld_prec_type integer, allocatable :: mlia(:), nlaggr(:) type(psb_sspmat_type), pointer :: base_a => null() type(psb_desc_type), pointer :: base_desc => null() - type(psb_inter_desc_type) :: map_desc + type(psb_linear_map_type) :: map_desc end type mld_s_onelev_prec_type type mld_sprec_type @@ -209,7 +209,7 @@ module mld_prec_type integer, allocatable :: mlia(:), nlaggr(:) type(psb_dspmat_type), pointer :: base_a => null() type(psb_desc_type), pointer :: base_desc => null() - type(psb_inter_desc_type) :: map_desc + type(psb_linear_map_type) :: map_desc end type mld_d_onelev_prec_type type mld_dprec_type @@ -235,7 +235,7 @@ module mld_prec_type integer, allocatable :: mlia(:), nlaggr(:) type(psb_cspmat_type), pointer :: base_a => null() type(psb_desc_type), pointer :: base_desc => null() - type(psb_inter_desc_type) :: map_desc + type(psb_linear_map_type) :: map_desc end type mld_c_onelev_prec_type type mld_cprec_type @@ -260,7 +260,7 @@ module mld_prec_type integer, allocatable :: mlia(:), nlaggr(:) type(psb_zspmat_type), pointer :: base_a => null() type(psb_desc_type), pointer :: base_desc => null() - type(psb_inter_desc_type) :: map_desc + type(psb_linear_map_type) :: map_desc end type mld_z_onelev_prec_type type mld_zprec_type diff --git a/mlprec/mld_saggrmat_raw_asb.F90 b/mlprec/mld_saggrmat_raw_asb.F90 index 54e3da69..6cc2d942 100644 --- a/mlprec/mld_saggrmat_raw_asb.F90 +++ b/mlprec/mld_saggrmat_raw_asb.F90 @@ -266,7 +266,7 @@ subroutine mld_saggrmat_raw_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_saggrmat_smth_asb.F90 b/mlprec/mld_saggrmat_smth_asb.F90 index c9d3d5c4..f6c695ef 100644 --- a/mlprec/mld_saggrmat_smth_asb.F90 +++ b/mlprec/mld_saggrmat_smth_asb.F90 @@ -653,7 +653,7 @@ subroutine mld_saggrmat_smth_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_zaggrmat_raw_asb.F90 b/mlprec/mld_zaggrmat_raw_asb.F90 index ce51b4bf..2779cb8e 100644 --- a/mlprec/mld_zaggrmat_raw_asb.F90 +++ b/mlprec/mld_zaggrmat_raw_asb.F90 @@ -266,7 +266,7 @@ subroutine mld_zaggrmat_raw_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info) diff --git a/mlprec/mld_zaggrmat_smth_asb.F90 b/mlprec/mld_zaggrmat_smth_asb.F90 index b56f6592..a7d356ee 100644 --- a/mlprec/mld_zaggrmat_smth_asb.F90 +++ b/mlprec/mld_zaggrmat_smth_asb.F90 @@ -653,7 +653,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,p,info) ! am2 => PR^T i.e. restriction operator ! am1 => PR i.e. prolongation operator ! - p%map_desc = psb_inter_desc(psb_map_aggr_,desc_a,& + p%map_desc = psb_linear_map(psb_map_aggr_,desc_a,& & p%desc_ac,am2,am1) if (info == 0) call psb_sp_free(am1,info) if (info == 0) call psb_sp_free(am2,info)