Merge branch 'instrument'
Conflict in Makefile, fixed with formatting corrections
src/cases/tank_rho.cpp
0 → 100644
This diff is collapsed.
src/cases/tankrho/spins.conf
0 → 100644
Conflict in Makefile, fixed with formatting corrections