From 443e36bf334360265f406837cc95c30a43630bca Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Fri, 30 Sep 2016 19:27:55 +0000 Subject: [PATCH] mld2p4-extaggr: mlprec/impl/mld_caggrmat_asb.f90 mlprec/impl/mld_daggrmat_asb.f90 mlprec/impl/mld_saggrmat_asb.f90 mlprec/impl/mld_zaggrmat_asb.f90 mlprec/mld_c_inner_mod.f90 mlprec/mld_d_inner_mod.f90 mlprec/mld_s_inner_mod.f90 mlprec/mld_z_inner_mod.f90 Fix import and interface. --- mlprec/impl/mld_caggrmat_asb.f90 | 1 - mlprec/impl/mld_daggrmat_asb.f90 | 1 - mlprec/impl/mld_saggrmat_asb.f90 | 1 - mlprec/impl/mld_zaggrmat_asb.f90 | 1 - mlprec/mld_c_inner_mod.f90 | 9 +++++---- mlprec/mld_d_inner_mod.f90 | 9 +++++---- mlprec/mld_s_inner_mod.f90 | 9 +++++---- mlprec/mld_z_inner_mod.f90 | 9 +++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mlprec/impl/mld_caggrmat_asb.f90 b/mlprec/impl/mld_caggrmat_asb.f90 index 1cef24ee..39f9cf11 100644 --- a/mlprec/impl/mld_caggrmat_asb.f90 +++ b/mlprec/impl/mld_caggrmat_asb.f90 @@ -110,7 +110,6 @@ subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) type(mld_sml_parms), intent(inout) :: parms - type(mld_c_onelev_type), intent(inout), target :: p type(psb_cspmat_type), intent(inout) :: ac, op_prol,op_restr integer(psb_ipk_), intent(out) :: info diff --git a/mlprec/impl/mld_daggrmat_asb.f90 b/mlprec/impl/mld_daggrmat_asb.f90 index 2c7ab573..f8422b0f 100644 --- a/mlprec/impl/mld_daggrmat_asb.f90 +++ b/mlprec/impl/mld_daggrmat_asb.f90 @@ -110,7 +110,6 @@ subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) type(mld_dml_parms), intent(inout) :: parms - type(mld_d_onelev_type), intent(inout), target :: p type(psb_dspmat_type), intent(inout) :: ac, op_prol,op_restr integer(psb_ipk_), intent(out) :: info diff --git a/mlprec/impl/mld_saggrmat_asb.f90 b/mlprec/impl/mld_saggrmat_asb.f90 index 36bcb4db..bbee5a6f 100644 --- a/mlprec/impl/mld_saggrmat_asb.f90 +++ b/mlprec/impl/mld_saggrmat_asb.f90 @@ -110,7 +110,6 @@ subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) type(mld_sml_parms), intent(inout) :: parms - type(mld_s_onelev_type), intent(inout), target :: p type(psb_sspmat_type), intent(inout) :: ac, op_prol,op_restr integer(psb_ipk_), intent(out) :: info diff --git a/mlprec/impl/mld_zaggrmat_asb.f90 b/mlprec/impl/mld_zaggrmat_asb.f90 index f7a4dbe7..7a5cfeff 100644 --- a/mlprec/impl/mld_zaggrmat_asb.f90 +++ b/mlprec/impl/mld_zaggrmat_asb.f90 @@ -110,7 +110,6 @@ subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,inf type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) type(mld_dml_parms), intent(inout) :: parms - type(mld_z_onelev_type), intent(inout), target :: p type(psb_zspmat_type), intent(inout) :: ac, op_prol,op_restr integer(psb_ipk_), intent(out) :: info diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90 index 6b349f97..8073b94c 100644 --- a/mlprec/mld_c_inner_mod.f90 +++ b/mlprec/mld_c_inner_mod.f90 @@ -125,7 +125,7 @@ module mld_c_inner_mod interface mld_bld_mlhier_array subroutine mld_c_bld_mlhier_array(nplevs,casize,mnaggratio,a,desc_a,precv,info) - use psb_base_mod, only : psb_ipk_, psb_cspmat_type, psb_desc_type + use psb_base_mod, only : psb_ipk_, psb_cspmat_type, psb_desc_type, psb_spk_ use mld_c_prec_type, only : mld_c_onelev_type implicit none integer(psb_ipk_), intent(inout) :: nplevs, casize @@ -192,14 +192,15 @@ module mld_c_inner_mod end interface mld_lev_mat_asb interface mld_aggrmat_asb - subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) + subroutine mld_caggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) use psb_base_mod, only : psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_ - use mld_c_prec_type, only : mld_c_onelev_type + use mld_c_prec_type, only : mld_sml_parms implicit none type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_c_onelev_type), intent(inout), target :: p + type(mld_sml_parms), intent(inout) :: parms + type(psb_cspmat_type), intent(out) :: ac,op_prol,op_restr integer(psb_ipk_), intent(out) :: info end subroutine mld_caggrmat_asb end interface mld_aggrmat_asb diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90 index 309119ce..19eab0ca 100644 --- a/mlprec/mld_d_inner_mod.f90 +++ b/mlprec/mld_d_inner_mod.f90 @@ -125,7 +125,7 @@ module mld_d_inner_mod interface mld_bld_mlhier_array subroutine mld_d_bld_mlhier_array(nplevs,casize,mnaggratio,a,desc_a,precv,info) - use psb_base_mod, only : psb_ipk_, psb_dspmat_type, psb_desc_type + use psb_base_mod, only : psb_ipk_, psb_dspmat_type, psb_desc_type, psb_dpk_ use mld_d_prec_type, only : mld_d_onelev_type implicit none integer(psb_ipk_), intent(inout) :: nplevs, casize @@ -192,14 +192,15 @@ module mld_d_inner_mod end interface mld_lev_mat_asb interface mld_aggrmat_asb - subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) + subroutine mld_daggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) use psb_base_mod, only : psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ - use mld_d_prec_type, only : mld_d_onelev_type + use mld_d_prec_type, only : mld_dml_parms implicit none type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_d_onelev_type), intent(inout), target :: p + type(mld_dml_parms), intent(inout) :: parms + type(psb_dspmat_type), intent(out) :: ac,op_prol,op_restr integer(psb_ipk_), intent(out) :: info end subroutine mld_daggrmat_asb end interface mld_aggrmat_asb diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90 index 3adf013d..631a1a1f 100644 --- a/mlprec/mld_s_inner_mod.f90 +++ b/mlprec/mld_s_inner_mod.f90 @@ -125,7 +125,7 @@ module mld_s_inner_mod interface mld_bld_mlhier_array subroutine mld_s_bld_mlhier_array(nplevs,casize,mnaggratio,a,desc_a,precv,info) - use psb_base_mod, only : psb_ipk_, psb_sspmat_type, psb_desc_type + use psb_base_mod, only : psb_ipk_, psb_sspmat_type, psb_desc_type, psb_spk_ use mld_s_prec_type, only : mld_s_onelev_type implicit none integer(psb_ipk_), intent(inout) :: nplevs, casize @@ -192,14 +192,15 @@ module mld_s_inner_mod end interface mld_lev_mat_asb interface mld_aggrmat_asb - subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) + subroutine mld_saggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) use psb_base_mod, only : psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_ - use mld_s_prec_type, only : mld_s_onelev_type + use mld_s_prec_type, only : mld_sml_parms implicit none type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_s_onelev_type), intent(inout), target :: p + type(mld_sml_parms), intent(inout) :: parms + type(psb_sspmat_type), intent(out) :: ac,op_prol,op_restr integer(psb_ipk_), intent(out) :: info end subroutine mld_saggrmat_asb end interface mld_aggrmat_asb diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90 index b1f811ce..bf5d416a 100644 --- a/mlprec/mld_z_inner_mod.f90 +++ b/mlprec/mld_z_inner_mod.f90 @@ -125,7 +125,7 @@ module mld_z_inner_mod interface mld_bld_mlhier_array subroutine mld_z_bld_mlhier_array(nplevs,casize,mnaggratio,a,desc_a,precv,info) - use psb_base_mod, only : psb_ipk_, psb_zspmat_type, psb_desc_type + use psb_base_mod, only : psb_ipk_, psb_zspmat_type, psb_desc_type, psb_dpk_ use mld_z_prec_type, only : mld_z_onelev_type implicit none integer(psb_ipk_), intent(inout) :: nplevs, casize @@ -192,14 +192,15 @@ module mld_z_inner_mod end interface mld_lev_mat_asb interface mld_aggrmat_asb - subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,p,info) + subroutine mld_zaggrmat_asb(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) use psb_base_mod, only : psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_ - use mld_z_prec_type, only : mld_z_onelev_type + use mld_z_prec_type, only : mld_dml_parms implicit none type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_ipk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_z_onelev_type), intent(inout), target :: p + type(mld_dml_parms), intent(inout) :: parms + type(psb_zspmat_type), intent(out) :: ac,op_prol,op_restr integer(psb_ipk_), intent(out) :: info end subroutine mld_zaggrmat_asb end interface mld_aggrmat_asb