changed SimulationType and Shape to compile macros