MEEEEEEEERGE
Merge branch 'master' of github.com:nataliaeire/Project3
Merge branch 'master' of github.com:nataliaeire/Project3
Merge branch 'master' of github.com:nataliaeire/Project3
The part of our code using adaptive time steps seems to be working
fairly well. Changed the order of bodies1, bodies2, etc. to match the
if-tests in for instance calculateForcesAdaptively(). Implemented an
adaptive Velocity Verlet-solver in Integrator.
Added an adaptive Velocity Verlet-solver in Integrator. Changed the
order of bodies1, bodies2, etc. to match the if-tests in for instance
calculateForcesAdaptively. The adaptive solver seems to be working
fairly well, though we might want to double-check the output.