Analysis of layered solid-fluid media using a discrete wavenumber and normal-mode superposition method