Oscillations of liquid with a free surface in a tank of combined shape