Feature/use different dof numbers for cg

I'm not 100% sure this gives the right number of dofs for parallel applications, but at least for serial applications it is correct.