Computational models for the analysis/design of hypersonic scramjet components, II Inlet and ramp/forebody models