Working version using function that are to be removed
Pressure solver running except for hdma solver, one step to go...