Generalised Modelling of Hydrogen Diffusion and Trapping