From ba2c6aa721f094a525afda2d2ac2d7b8b09c39ac Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 27 Sep 2021 14:19:04 +0200 Subject: [PATCH] Fix TestFerdous --- amgprec/amg_d_onelev_mod.f90 | 1 - .../amg_d_parmatch_aggregator_inner_mat_asb.F90 | 2 +- amgprec/impl/level/amg_d_base_onelev_csetc.F90 | 9 ++------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/amgprec/amg_d_onelev_mod.f90 b/amgprec/amg_d_onelev_mod.f90 index 1ca0e9cb..e924eb97 100644 --- a/amgprec/amg_d_onelev_mod.f90 +++ b/amgprec/amg_d_onelev_mod.f90 @@ -57,7 +57,6 @@ module amg_d_onelev_mod use amg_d_base_smoother_mod use amg_d_dec_aggregator_mod use amg_d_parmatch_aggregator_mod - use amg_d_newmatch_aggregator_mod use psb_base_mod, only : psb_dspmat_type, psb_d_vect_type, & & psb_d_base_vect_type, psb_ldspmat_type, psb_dlinmap_type, psb_dpk_, & diff --git a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_inner_mat_asb.F90 b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_inner_mat_asb.F90 index aa74dd2c..0b5574d7 100644 --- a/amgprec/impl/aggregator/amg_d_parmatch_aggregator_inner_mat_asb.F90 +++ b/amgprec/impl/aggregator/amg_d_parmatch_aggregator_inner_mat_asb.F90 @@ -99,7 +99,7 @@ subroutine amg_d_parmatch_aggregator_inner_mat_asb(ag,parms,a,desc_a,& use psb_base_mod use amg_base_prec_type #if defined(SERIAL_MPI) - use amg_d_parmatch_aggregator_mod + use amg_d_parmatch_aggregator_mod #else use amg_d_parmatch_aggregator_mod, amg_protect_name => amg_d_parmatch_aggregator_inner_mat_asb #endif diff --git a/amgprec/impl/level/amg_d_base_onelev_csetc.F90 b/amgprec/impl/level/amg_d_base_onelev_csetc.F90 index caedc4d9..eaacabbc 100644 --- a/amgprec/impl/level/amg_d_base_onelev_csetc.F90 +++ b/amgprec/impl/level/amg_d_base_onelev_csetc.F90 @@ -43,7 +43,6 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) use amg_d_dec_aggregator_mod use amg_d_symdec_aggregator_mod use amg_d_parmatch_aggregator_mod - use amg_d_newmatch_aggregator_mod use amg_d_jac_smoother use amg_d_as_smoother use amg_d_diag_solver @@ -253,6 +252,8 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) lv%parms%ml_cycle = amg_stringval(val) case ('PAR_AGGR_ALG') + ival = amg_stringval(val) + lv%parms%par_aggr_alg = ival if (allocated(lv%aggr)) then call lv%aggr%free(info) if (info == 0) deallocate(lv%aggr,stat=info) @@ -262,9 +263,6 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) end if end if - ival = amg_stringval(val) - lv%parms%par_aggr_alg = ival - select case(val) case('DEC') allocate(amg_d_dec_aggregator_type :: lv%aggr, stat=info) @@ -272,12 +270,9 @@ subroutine amg_d_base_onelev_csetc(lv,what,val,info,pos,idx) allocate(amg_d_symdec_aggregator_type :: lv%aggr, stat=info) case('COUP','COUPLED') allocate(amg_d_parmatch_aggregator_type :: lv%aggr, stat=info) - case('NEWMTC') - allocate(amg_d_newmatch_aggregator_type :: lv%aggr, stat=info) case default info = psb_err_internal_error_ end select - if (info == psb_success_) call lv%aggr%default() case ('AGGR_ORD')