Apply conditioning of the grid scaling to cpu code

@m.schoenherr reworked the grid scaling and merged his changes here.

This needs to be applied in the cpu scaling functions as a prerequisite for the common test case #54.