 Salvatore Filippone
|
6866558372
|
Merge branch 'new-context' into implement-ainv
# Conflicts:
# prec/impl/psb_c_bjacprec_impl.f90
# prec/impl/psb_c_prec_type_impl.f90
# prec/impl/psb_d_bjacprec_impl.f90
# prec/impl/psb_d_prec_type_impl.f90
# prec/impl/psb_s_bjacprec_impl.f90
# prec/impl/psb_s_prec_type_impl.f90
# prec/impl/psb_z_bjacprec_impl.f90
# prec/impl/psb_z_prec_type_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.f90
# test/pargen/psb_d_pde2d.f90
# test/pargen/psb_d_pde3d.f90
# test/pargen/psb_s_pde2d.f90
# test/pargen/psb_s_pde3d.f90
|
2020-11-20 17:18:40 +01:00 |
|
sfilippone
Cirdans-Home