Diffusion and dispersion in porous media