Preprocessor changes for initial_condition_decomposition

Johannes Pfeiferrequested to merge
JohannesPfeifer:initial_condition_decomposition into master

Merge request reports