Add master option for subgrid model

Merged Loic Hausammann requested to merge master_options into master

Implements #422 (closed).

Edited by Matthieu Schaller

Merge request reports