Coupling MercuryDPM and oomph-lib

Plan

Encapsulate Mercury into oomphlib, with hooks in both codes; use cmake to create a combined compilation tool; commit the hooks back to oomphlib.

There will be a new class that encapsulates both MercuryDPM and Oomphlib (composition) but for the coupled code Oomphlib will be the main code.

However, for installation it will be MercuryDPM driven.

oomph-lib access

Two public-facing repositories are

 svn://oomph-lib.maths.man.ac.uk/release

 and

svn://oomph-lib.maths.man.ac.uk/testing

Creating a git clone of the testing branch

  1. First setup it up as a git-svn bridge 
    git svn clone svn://oomph-lib.maths.man.ac.uk/testing -T trunk -b branches  -t tags --ignore-path='david-branch' <YourLocalName>
    Please note, this command will take 1-2 hours to run; but will give you all version history in a git repos, you can commit and play with.
  2. Second add a git origin to be the version of oomph-lib in bit bucket that we can all edit
    git remote add origin https://antrthorn@bitbucket.org/antrthorn/oomph-lib-ut.git
  3. Third make your current branch (git) upstream repo be the one on bit bucket
    git branch --set-upstream-to=origin/master
  4. Finally update (pull in) the changes from the Bitbucket version
    git pull

You now have a repo that you can push back to our git repository and if we had write access we could push back to the Manchester main oomph-lib svn repository.