Laboratory Investigation of Bedform Geometry under Regular and Irregular Surface Gravity Waves