Commit Graph

690 Commits (c8852cc22e4cf7eaeed667be9fd4b290009f807f)

Author SHA1 Message Date
Salvatore Filippone 743dd38121 Fix configry. Fixed onelev%SET to call aggr method.
Salvatore Filippone 3951e449bb New version with aggregator object interface.
Take out SET with integer WHAT.
Salvatore Filippone 85d97093cd Reinstate printout of smoothed/unsmoothed.
Salvatore Filippone 5848b592bd Override DESCR for aggregator, testing.
Salvatore Filippone 660d00d49b First version working with BootCMatch. To be tested in detail.
Salvatore Filippone dcb051d059 Use a CSR buffer in soc1_map_bld
Salvatore Filippone 1e5e86ee89 Use optional argument in GETROW in SOC1_MAP_BLD.
Salvatore Filippone 9de544f540 Avoid warnings on ALLOCATE by using tmp_aggr object,
Salvatore Filippone 9184e29ba3 Intel compiler gave an ICE with generic names for mlptec_aply.
Salvatore Filippone 06a4ee5707 Minor fixes for I8.
Salvatore Filippone 565b48ea90 Fixed wrong use of e_err instead of l_err.
Salvatore Filippone d6981973c1 Fix SLU interface for LPK.
Salvatore Filippone f0472fa227 Fixed all versions of MAT_ASB.
Salvatore Filippone 5bdd07b13b UMF interaction with IPK8.
Salvatore Filippone 281c5531da More conversions.
Salvatore Filippone 265f8b5e99 Update interface declaration for SOC_map_bld and MAT_ASB.
Salvatore Filippone 3fd565bc99 Make base_solver_free a noop, check for error in level_setsv.
Salvatore Filippone 59a75755a9 Make base_solver_free a noop, check for error in level_setsv.
Salvatore Filippone eeb5a5e00f Fix use of errstatus.
Salvatore Filippone cc144c0d51 Fixes for mat asb. Compiles, to be fully debugged.
Salvatore Filippone 013a55142b Version with LX for RWEXTD.
Salvatore Filippone 935010381c Further changes to handle CLIP on LX
Salvatore Filippone 5e1b8f1ae4 Expand LPK treatment. Need to go back to PSBLAS and fix RXEXTD.
Salvatore Filippone 507db73ea4 Merge branch 'tryLsp' of https://github.com/sfilippone/mld2p4-2 into tryLsp
# Conflicts:
#	mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90
#	mlprec/impl/aggregator/mld_c_dec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_c_symdec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90
#	mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_d_symdec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90
#	mlprec/impl/aggregator/mld_s_dec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_s_symdec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90
#	mlprec/impl/aggregator/mld_z_dec_aggregator_tprol.f90
#	mlprec/impl/aggregator/mld_z_symdec_aggregator_tprol.f90
#	mlprec/impl/mld_c_extprol_bld.F90
#	mlprec/impl/mld_d_extprol_bld.F90
#	mlprec/impl/mld_s_extprol_bld.F90
#	mlprec/impl/mld_z_extprol_bld.F90
#	mlprec/mld_d_sludist_solver.F90
#	mlprec/mld_z_sludist_solver.F90
#	tests/Bcmatch/mld_d_bcmatch_aggregator_mat_asb.f90
#	tests/Bcmatch/mld_d_bcmatch_aggregator_tprol.f90
Salvatore Filippone 386e970512 Changes for compilation
Salvatore Filippone b5b2a808d4 Take out spurious "mpik"
Salvatore Filippone 62cb1e86e8 Temp fix for ext_prol with LPK8.
Salvatore Filippone a1ad85f351 Conditional compilation with LPK8; will need a better long term soluton.
Salvatore Filippone 5ca07fc901 smoother/
Salvatore Filippone 459a9d034e Merge branch 'mrgext' into MixedI8
Salvatore Filippone 6632e01e97 Fixed transfer of data for prespecified number of levels.
Salvatore Filippone d6e990b04c Renamed VMB and HYB into SOC1 and SOC2.
Salvatore Filippone 7732bb90d3 Take out hybrid, no longer needed.
Salvatore Filippone 13f0954cab Fixed hybrid map bld.
Salvatore Filippone e58eab504e Take out hybrid from internal makefiles.
Salvatore Filippone 0b371bf7e2 Take out hybrid
Salvatore Filippone a2a843ce0b Take out hybrid_aggregator for the time being.
Salvatore Filippone e1d9157136 Unified vmb and hyb map_bld inside dec_aggregator.
Salvatore Filippone 9f2c23b2a4 Redefine map_bld interfaces.
Salvatore Filippone cce189c450 Rename dec_map_bld into vmb_map_bld, following the split between
PAR_AGGR_ALG and AGGR_TYPE.
Salvatore Filippone 13dc383079 Fixed inheritance and setup of aggregators.
Salvatore Filippone f131e0d86d Clear par_aggr_alg when setting from external aggregator.
Salvatore Filippone 036c072ebc Fixed setup of aggregators.
Salvatore Filippone 7aadb73bd6 New inheritance structure for aggregator object.
Salvatore Filippone 24988bcfc5 Moved BootCMatch interface to tests; to be reviewed later.
Salvatore Filippone ef5256b3b4 Updated version number in headers.
Salvatore Filippone 7092dc2063 Fixed compilation process.
Salvatore Filippone e0b15f495e Fixed compilation in level.
Salvatore Filippone 6b87221cea Compilation works in aggregator. Cleanup needed.
Salvatore Filippone d707a6c9ba Progress with compilation in aggregator subdir.
Salvatore Filippone 535d3aa059 Fixed Makefile.
Salvatore Filippone 6ccb787857 Created aggregator subdir.
Salvatore Filippone b331b1b928 Merge aggregator: module interfaces now compile.
Salvatore Filippone 939ba5f6aa Started merging extaggr branch.
Salvatore Filippone 85f0abfa66 Moved mld_?ilu?_fact to solver subdir.
Salvatore Filippone 29232bf0d2 Moved mld_?ilu?_fact to solver subdir.
Salvatore Filippone 48b211f9d7 Modified IPK/LPK/EPK/MPK.
Salvatore Filippone fa1b5dcdea Fixed op_restr build for unsmoothed aggregation.
Salvatore Filippone 822075fd12 Updated copyright statement.
Salvatore Filippone 6178a2ec13 Check error conditions in single level apply. Make sure AS vectors are good.
Salvatore Filippone a7bd1fb466 Print UMF's own error message when needed.
Salvatore Filippone 260e596c3c Work vectors for X2Y/Y2X should be taken from different levels.
Salvatore Filippone 5783117209 Fix wrong call in lv%bld
Salvatore Filippone 4e88068e2a Defined a new CNV method for wrkspace. Changed LV%BLD to call CNV method at end, so all relevant fields are taken care of. Fixed LV%BLD to handle all smoothers and wrkspace.
Salvatore Filippone 62a58d59cc Merged fix for dynamic type of vector in diagonal solver build.
Salvatore Filippone 03719469f0 Fixed use of Jacobi as coarse solver.
Salvatore Filippone 54d1478e21 Added use of WV in solve apply_vect
Salvatore Filippone 63233716c4 K-Cycle now using work vectors correctly.
Salvatore Filippone 68f5691a99 version of K-cycle working, but to be investigated further.
Salvatore Filippone 2481fec23d Added WV to solver apply_vect interface.
Salvatore Filippone 4564e1e4ba Cleanup smoother_apply.
Salvatore Filippone 3250853810 Taken out WRK(:) component of PREC, now we have the WRK component of LEV.
Salvatore Filippone 554f21992f New WRK methods in onelev data structure.
Salvatore Filippone 823db4f943 Fixed allocte_wrk & free_wrk for WV allocation.
Modified interface of smoothers to use WV.
Initial tests.
Added WV to calls to MAP_X2Y & MAP_Y2X.
Salvatore Filippone 6f9a3c10d2 Use ASSOCIATE for wrk vectors. KCYCLE to be debugged.
Salvatore Filippone 08040c455b Added level%allocate_wrk. Fix wrksize calculation.
Salvatore Filippone f982986a1c Initial methods to keep track of work vectors.
Salvatore Filippone 5e174d062e Update mlprec_aply to use WRK.
Salvatore Filippone 55ec0f3da0 Added WV to smoother method
Salvatore Filippone fe110b83ca First step in work area: define alloc/free methods.
Salvatore Filippone 449e73bbb4 Minor README tweak. Changed DESCR printout to omit ordering if NATURAL.
Salvatore Filippone fcd370a304 New structure of input files. Fixed defaults.
Salvatore Filippone 079af357ed Fixes for application 1lev, defaults, precdescr.
Salvatore Filippone 9c7b84ed07 Fix call to psb_info in apply
Salvatore Filippone c758ee13ba Merge branch 'master' of https://github.com/sfilippone/mld2p4-2
Salvatore Filippone d2ebac6a77 Rewrite precbld to simply call hierarchy/smoothers.
Salvatore Filippone 4c70174c9f Comment for fixes to apply_vect.
Salvatore Filippone 7d4264176a Fix zeroing of tx in as_apply_vect.
Salvatore Filippone 3cd6ede9f1 Fixed dump smoother.
Salvatore Filippone 39b7d031c5 Fixed AS default.
Salvatore Filippone fc7ed00981 Fixes for new cbind-version of psblas 3.5.0
Salvatore Filippone c3985888f7 Fixed base smoother descr.
Salvatore Filippone 212730c62d Fixed application and description of 1lev precs.
Salvatore Filippone b5e116dc08 Added GS/FBGS for precs. Fixed 1-level application of twosided.
Salvatore Filippone 339d1e4a33 Fixed checks in smoothers_bld for 1lev
Salvatore Filippone e8b7fbb7e4 Fix silly typo.
Salvatore Filippone 93c16477b2 Modified copyright vs contribution.
Salvatore Filippone 47cd4f0995 Use new TRIL/TRIU in GS build to improve performance.
Salvatore Filippone 1503eb1301 Change aggregation threshold default
Salvatore Filippone ff402e413c New Jacobi description, handling Point Jacobi and Gauss-Seidel.