Adjusted Maps for solver and matrix generator