Added support for calibrating models with surface flow tables