implements #417 (closed) and #419 (closed)
This MR helps to distinguish better between physical model and discretization.