Keplerian ring test

The Keplerian Ring Test.

@pdraper I have been having some issues squashing commits in this branch; could you please check this out before merging in 197 separate commits? There must be something that I am missing but whenever I try to squash I get a bunch of conflicts.

An example plot:

Yes, it is a bit of a mess. This is down to all the merges that have happened using this same branch (so all the merges you have done in the past need to be replayed, git isn't always great at that). You'd probably have fewer issues if you tried to rebase when you noticed that two developments of the same branch had diverged. That would keep the history clean.

Anyway that doesn't fix where we are at. I can squash all this in the merge to master, if you'd like to generate a commit message for it all. Using:

git merge --squash keplerian-ring-test

on the command-line.

Alternatively you could create a squashed branch yourself and make a new merge request. Something like:

git checkout keplerian-ring-test
git checkout -b keplerian-ring-test-squash
git reset --soft HEAD~198
git commit -m "Keplerian ring test etc. etc...."

the 198 is the current number of commits since the branch from master. The git reset --soft just undoes all the commits, but leaves the file in the cache so you can just commit them.

Hi Peter,

Thanks for the advice!

I think the easiest thing to do would be to squash during the merge (as long as @matthieu is okay with having this stuff merged in the current state); the appropriate commit message would be:

Added the Keplerian Ring hydro test along with two new relevant softened potentials.

I will remove the WIP tag.

unmarked as a Work In Progress

Ok, I will attempt that bit of git magic. Are you changing the bottom-left panel of the plot first to give the mass outised of the ring in units of the ring mass?

I will change the bottom-left today, yeah. It sounds like a good plan, actually, as then we can use that as our 'measure of accuracy' (it should be strictly bounded in [0, 1] I guess).

added 1 commit

• 78fb13cd - Now plot mass flow in terms of initial ring mass

Compare with previous version

This is now ready for merging.

Ok. All done using @pdraper's first method above. @jborrow could you please check that everything is correct in master now?

Looks good to me. I will be able to test more thoroughly in the coming days.

closed

Ok. I will close this then. Please re-open if there is an issue.