|Branch||Last Commit||Owner||Revs to merge||Comments|
TW: Yes (Anisotropic CG), but it is not implemented in general; there is simply a scale-factor added in the x-directon of the XZ statistics; also, no test available and using extern, global variables. I would not merge to trunk.
Place in obsolete.
|Juan||Please tell me what do lots of commits here|
Yes (Protolib binary writer), but will not be used now as we have MPI_IO. Can be removed.
Place in obsolute
|BinaryWrite/||12/2020||Thomas||No (tried binary writing, but that has been superseeded by Julius' MPI_IO). Has been deleted.|
|Contains new test and new feature like curve linear chute should be megered will check with Jonny|
|CleanUp/||Thomas||No (has been merged and deleted)|
Change and improve to setEuler function.
Carefully check and merge
|Documentation/||Juan, Marc, Mitchel|
Lots of stuff
Merge one by one.
House on fire ED version
Place in obsolute.
Two bug fixes that look usful
DPMBase and HertizianMin..
|HGridHack/||6/2018||Irana||Lots||Irana improves to the HGrid, do they work???|
|HanDoc/||Unused and deleted|
|ImproveHGrid/||Thomas||No (has been merged and deleted)|
|ImproveHGrid2/||Thomas||No (has been merged and deleted)|
|JBarbosa/||JBarbosa/||This has the fault multiparticle implement (keep for now).|
|Julius/||To be deleted. Has one commit but it is weird and I think should be deleted|
|Kose/||Delete, only merges from Trunk no new code.|
|LeesEdwardsJonny/||Lots||To be merge|
Yes (Lego.cpp), but it first requires merge of MultiParticle branch.
|Lots||Keep alives needs cleaning before merging.|
|LucaAlpha/||Luca||Contain Luca drivers|
|Julius as merged as at the moment.|
|Maser/||Very weird branch I do not understand.|
|MultiParticle/||Juan multiparticle branch|
|NewDocumentation/||All||No (has been deleted, as it was a bit buggy to merge; we should make a new documentation branch)|
|OMP/||Julius||No (has been merged), and now deleted|
|OMPThomas/||Thomas||No (has been merged and deleted)|
|OS/||Thomas||No (has been merged and deleted)|
|OSComparison/||Thomas||No (has been merged and deleted)|
|OomphlibCoupling2/||Thomas||No (has been deleted)|
|OomphlibCouplingThomas/||Thomas||No (has been deleted)|
|Paolo/||Already merge deleted|
Has the change to mkae Nonsperical work in parallel but breaks other parallel, think carefully.
Leave for now but do not move to git
|RaisaHertzMindlin/||Never use but I think it is active.|
|RestartFileOverWrite/||jmft||Restart bug 348 fix, should be merged|
No, has been merged. (not true)
|SuperQuadricsDariel/||Small bug to superquadric should be merged.|
|ThomasGSH/||Thomas||No (has been deleted)|
|Timo/||4/2021||Timo||Timo active branch (merge or keep alive)|
|Triangle Walls fix|
|Merge, delete or keep|
|mfransen/||4/2021||Marc||Lot||Merge, delete or keep|
|raisaroeplal/||3/2021||Raisa/Weinhartt||No code uncommit, so can be deleted.|
|Lots||Active branch keep|
|Has doc on how to create a new particle, is this merge with s.pourandi ?|