Peak strength and ultimate strain prediction for FRP confined square and circular concrete sections