We will use the following colours: Orphan, merge 1.0, merge post 1.0.
| Branch | Last Commit | Owner | Revs to merge | Comments | ||||
|---|---|---|---|---|---|---|---|---|
| AnisotropicCG/ | 05/2019 | Irana | r3356 r3357 r3358 r3361 r3665 r5610 | 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. | ||||
| BinaryOutput/ | 05/2017 | Thomas | Yes (Protolib binary writer), but will not be used now as we have MPI_IO. Can be removed. Place in obsolute | |||||
| ChuteJonny/ | 4/2018 | Jonny | r2719 r2737 r2808 r2809 | Contains new test and new feature like curve linear chute should be megered will check with Jonny | ||||
| Dariel/ | ddelfin | r4622 r4623 | Change and improve to setEuler function. Carefully check and merge | |||||
| Documentation/ | Juan, Marc, Mitchel | Lots of stuff Merge one by one. | ||||||
| ED/ | Rivas | House on fire ED version Place in obsolute. | FirstTimeStepInteractionFix/ | 6/2018 | Irana/Thomas | r3094|||
Two bug fixes that look usful DPMBase and HertizianMin..
You can delete, this change is superseded but other change. | HGridHack/ | 6/2018 | Irana | Lots | Irana improves to the HGrid, do they work??? | |||
| Igor_Ostanin/ | 5/2021 | i.ostanin | Delete | |||||
| JBarbosa/ | JBarbosa/ | This has the fault multiparticle implement (keep for now). | ||||||
| Jan Willem | ||||||||
| Juan/ | 5/2021 | j.e.alvareznaranjo | Lots | Active branch, please keep | ||||
| Juan_oomphLib/ | 3/2021 | j.e.alvareznaranjo | Lots | Active branch, please keep | ||||
| Julius/ | To be deleted. Has one commit but it is weird and I think should be deleted | |||||||
| KillMeSoftly | ||||||||
| LeesEdwardsJonny/ | Lots | To be merge | ||||||
| Lego/ | Thomas | |||||||
| Louis/ | lljing | Lots | Keep alives needs cleaning before merging. | |||||
| LucaAlpha/ | Luca | Contain Luca drivers | ||||||
| MPIBindings | Check and delete | |||||||
| MPI_IO/ | r5271 r5373 r5376 r5555 | Julius as merged as at the moment. | ||||||
| Martin/ | 7/2020 | mhaustein | ||||||
| Maser/ | Very weird branch I do not understand. | |||||||
| MultiParticle/ | please delete it. | |||||||
| MultiParticle_Igor | ||||||||
| OomphlibCoupling/ | Thomas/Hong/Mitchel | Yes (Coupling) | ||||||
| OomphlibCouplingImplicit/ | Hong | |||||||
| OomphlibCouplingLagrange/ | Hong | |||||||
| OomphlibCouplingPrivate/ | Hao | |||||||
| OomphlibMarnixReconnect/ | Marnix | |||||||
| ParallelNonSpherical/ | 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 | ||||||
| SCouplingTest/ | Hong/ j.e.alvareznaranjo | |||||||
| SCouplingThomas | ||||||||
| SCouplingCloud | ||||||||
| SCouloingThomasNewOoomph | ||||||||
| Sperl/ | Mathias Sperl weinhartt | |||||||
| SuperQuadricsDariel/ | Small bug to superquadric should be merged. | |||||||
| Timo/ | 4/2021 | Timo | Merge and delete one boundary to rule them all. | |||||
| TriangleWalls/ | Hong | Triangle Walls fix | ||||||
| Yousef/ | 4/2021 | m.y.shaheen | Lots | Merge, delete or keep | ||||
| mfransen/ | 4/2021 | Marc | Lot | Merge, delete or keep | ||||
| oomphLibTest/ | Ant | |||||||
| raisaroeplal/ | 3/2021 | Raisa/Weinhartt | No code uncommit, so can be deleted. | |||||
| s.pourandi/ | 5/2021 | s.pourandi93 | Lots | Active branch keep | ||||
xiuqiwang/ |