Commit Graph

2 Commits (148a5e5e1437c2aecf6fc7d75d755743d374e7ec)

Author SHA1 Message Date
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
4 years ago
Cirdans-Home 3e22e9e963 implemented biconjugation 4 years ago