Added solver and preconditioner types. The CG solver has been tested and works.