Finally got a working Godunov solver