Merge branch 'LXmat' of https://github.com/sfilippone/psblas3 into LXmat
# Conflicts: # base/comm/internals/psi_covrl_restr.f90 # base/comm/internals/psi_covrl_restr_a.f90 # base/comm/internals/psi_covrl_save.f90 # base/comm/internals/psi_covrl_save_a.f90 # base/comm/internals/psi_covrl_upd.f90 # base/comm/internals/psi_covrl_upd_a.f90 # base/comm/internals/psi_dovrl_restr.f90 # base/comm/internals/psi_dovrl_restr_a.f90 # base/comm/internals/psi_dovrl_save.f90 # base/comm/internals/psi_dovrl_save_a.f90 # base/comm/internals/psi_dovrl_upd.f90 # base/comm/internals/psi_dovrl_upd_a.f90 # base/comm/internals/psi_eovrl_restr_a.f90 # base/comm/internals/psi_eovrl_save_a.f90 # base/comm/internals/psi_eovrl_upd_a.f90 # base/comm/internals/psi_iovrl_restr.f90 # base/comm/internals/psi_iovrl_save.f90 # base/comm/internals/psi_iovrl_upd.f90 # base/comm/internals/psi_lovrl_restr.f90 # base/comm/internals/psi_lovrl_save.f90 # base/comm/internals/psi_lovrl_upd.f90 # base/comm/internals/psi_movrl_restr_a.f90 # base/comm/internals/psi_movrl_save_a.f90 # base/comm/internals/psi_movrl_upd_a.f90 # base/comm/internals/psi_sovrl_restr.f90 # base/comm/internals/psi_sovrl_restr_a.f90 # base/comm/internals/psi_sovrl_save.f90 # base/comm/internals/psi_sovrl_save_a.f90 # base/comm/internals/psi_sovrl_upd.f90 # base/comm/internals/psi_sovrl_upd_a.f90 # base/comm/internals/psi_zovrl_restr.f90 # base/comm/internals/psi_zovrl_restr_a.f90 # base/comm/internals/psi_zovrl_save.f90 # base/comm/internals/psi_zovrl_save_a.f90 # base/comm/internals/psi_zovrl_upd.f90 # base/comm/internals/psi_zovrl_upd_a.f90 # base/comm/psb_cgather.f90 # base/comm/psb_cgather_a.f90 # base/comm/psb_chalo.f90 # base/comm/psb_chalo_a.f90 # base/comm/psb_covrl.f90 # base/comm/psb_covrl_a.f90 # base/comm/psb_cscatter.F90 # base/comm/psb_cscatter_a.F90 # base/comm/psb_cspgather.F90 # base/comm/psb_dgather.f90 # base/comm/psb_dgather_a.f90 # base/comm/psb_dhalo.f90 # base/comm/psb_dhalo_a.f90 # base/comm/psb_dovrl.f90 # base/comm/psb_dovrl_a.f90 # base/comm/psb_dscatter.F90 # base/comm/psb_dscatter_a.F90 # base/comm/psb_dspgather.F90 # base/comm/psb_egather_a.f90 # base/comm/psb_ehalo_a.f90 # base/comm/psb_eovrl_a.f90 # base/comm/psb_escatter_a.F90 # base/comm/psb_igather.f90 # base/comm/psb_ihalo.f90 # base/comm/psb_iovrl.f90 # base/comm/psb_iscatter.F90 # base/comm/psb_ispgather.F90 # base/comm/psb_lgather.f90 # base/comm/psb_lhalo.f90 # base/comm/psb_lovrl.f90 # base/comm/psb_lscatter.F90 # base/comm/psb_lspgather.F90 # base/comm/psb_mgather_a.f90 # base/comm/psb_mhalo_a.f90 # base/comm/psb_movrl_a.f90 # base/comm/psb_mscatter_a.F90 # base/comm/psb_sgather.f90 # base/comm/psb_sgather_a.f90 # base/comm/psb_shalo.f90 # base/comm/psb_shalo_a.f90 # base/comm/psb_sovrl.f90 # base/comm/psb_sovrl_a.f90 # base/comm/psb_sscatter.F90 # base/comm/psb_sscatter_a.F90 # base/comm/psb_sspgather.F90 # base/comm/psb_zgather.f90 # base/comm/psb_zgather_a.f90 # base/comm/psb_zhalo.f90 # base/comm/psb_zhalo_a.f90 # base/comm/psb_zovrl.f90 # base/comm/psb_zovrl_a.f90 # base/comm/psb_zscatter.F90 # base/comm/psb_zscatter_a.F90 # base/comm/psb_zspgather.F90 # base/psblas/psb_camax.f90 # base/psblas/psb_casum.f90 # base/psblas/psb_caxpby.f90 # base/psblas/psb_cdot.f90 # base/psblas/psb_cnrm2.f90 # base/psblas/psb_cnrmi.f90 # base/psblas/psb_cspmm.f90 # base/psblas/psb_cspsm.f90 # base/psblas/psb_damax.f90 # base/psblas/psb_dasum.f90 # base/psblas/psb_daxpby.f90 # base/psblas/psb_ddot.f90 # base/psblas/psb_dnrm2.f90 # base/psblas/psb_dnrmi.f90 # base/psblas/psb_dspmm.f90 # base/psblas/psb_dspsm.f90 # base/psblas/psb_samax.f90 # base/psblas/psb_sasum.f90 # base/psblas/psb_saxpby.f90 # base/psblas/psb_sdot.f90 # base/psblas/psb_snrm2.f90 # base/psblas/psb_snrmi.f90 # base/psblas/psb_sspmm.f90 # base/psblas/psb_sspsm.f90 # base/psblas/psb_zamax.f90 # base/psblas/psb_zasum.f90 # base/psblas/psb_zaxpby.f90 # base/psblas/psb_zdot.f90 # base/psblas/psb_znrm2.f90 # base/psblas/psb_znrmi.f90 # base/psblas/psb_zspmm.f90 # base/psblas/psb_zspsm.f90 # base/serial/psi_c_serial_impl.f90 # base/serial/psi_d_serial_impl.f90 # base/serial/psi_e_serial_impl.f90 # base/serial/psi_m_serial_impl.f90 # base/serial/psi_s_serial_impl.f90 # base/serial/psi_z_serial_impl.f90 # base/tools/psb_callc_a.f90 # base/tools/psb_casb_a.f90 # base/tools/psb_cfree_a.f90 # base/tools/psb_cins_a.f90 # base/tools/psb_cspalloc.f90 # base/tools/psb_cspfree.f90 # base/tools/psb_csphalo.F90 # base/tools/psb_dallc_a.f90 # base/tools/psb_dasb_a.f90 # base/tools/psb_dfree_a.f90 # base/tools/psb_dins_a.f90 # base/tools/psb_dspalloc.f90 # base/tools/psb_dspfree.f90 # base/tools/psb_dsphalo.F90 # base/tools/psb_eallc_a.f90 # base/tools/psb_easb_a.f90 # base/tools/psb_efree_a.f90 # base/tools/psb_eins_a.f90 # base/tools/psb_mallc_a.f90 # base/tools/psb_masb_a.f90 # base/tools/psb_mfree_a.f90 # base/tools/psb_mins_a.f90 # base/tools/psb_sallc_a.f90 # base/tools/psb_sasb_a.f90 # base/tools/psb_sfree_a.f90 # base/tools/psb_sins_a.f90 # base/tools/psb_sspalloc.f90 # base/tools/psb_sspfree.f90 # base/tools/psb_ssphalo.F90 # base/tools/psb_zallc_a.f90 # base/tools/psb_zasb_a.f90 # base/tools/psb_zfree_a.f90 # base/tools/psb_zins_a.f90 # base/tools/psb_zspalloc.f90 # base/tools/psb_zspfree.f90 # base/tools/psb_zsphalo.F90 # prec/impl/psb_c_bjacprec_impl.f90 # prec/impl/psb_d_bjacprec_impl.f90 # prec/impl/psb_s_bjacprec_impl.f90 # prec/impl/psb_z_bjacprec_impl.f90 # prec/psb_c_prec_type.f90 # prec/psb_d_prec_type.f90 # prec/psb_s_prec_type.f90 # prec/psb_z_prec_type.f90ILmat
Salvatore Filippone
8 years ago
commit
32ebf9efc0