We model linear, inviscid non-hydrostatic internal tides generated by the interaction of a barotropic tide with variable topography in two dimensions. We first derive an asymptotic solution for the nonuniform barotropic flow over the topography that serves as forcing for the baroclinic equations. The resulting internal-tide generation problem is reformulated as a Coupled-Mode System (CMS) by means of a series decomposition of the baroclinic stream function in terms of vertical basis functions. We solve this CMS numerically and also provide a method for estimating the sea-surface signature of internal tides. We consider several seamounts and shelf profiles and perform calculations for a wide range of (topographic) heights and slopes. For subcritical topographies, the energy flux as a function of height exhibits local maxima, separated by cases of weakly- or even non-radiating topographies. For supercritical topographies, the energy flux generally increases with height and criticality. Our calculations agree with the Weak Topography Approximation only for very small heights. Perhaps more surprisingly, they agree with the Knife Edge model only for moderately supercritical topographies. We also compare the effect of the adjusted barotropic tide on the energy flux and the local properties of the baroclinic field with other semi-analytical methods based on a uniform barotropic tide. We observe significant differences in the flow field near the topographies only.