changed used architecture to ivybridge, added to new scripts for analysis of simulations
fixed conflicts