Add check for solver type with free surface