#2441 r21455 and r21502 break Intel pedantic compiler by having too many num_cells variables in scope at the same time

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@21578 b5f69653-2bf5-0310-8201-b0dafb8e1405
Avoid spurious failures based on re-used archive name

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@21580 b5f69653-2bf5-0310-8201-b0dafb8e1405