| 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. | ||||
| Bert/ | 28/4/2021 | Juan | Please tell me what do lots of commits here | |||||
| 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 | |||||
| BinaryWrite/ | 12/2020 | Thomas | No (tried binary writing, but that has been superseeded by Julius' MPI_IO). Has been deleted. | |||||
| 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 | ||||
| CleanUp/ | Thomas | No (has been merged and deleted) | ||||||
| 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. | ||||||
| Edgar_Ortega/ | Unused, deleted | |||||||
| FirstTimeStepInteractionFix/ | 6/2018 | Irana/Thomas | r3094 r3103 | Two bug fixes that look usful DPMBase and HertizianMin..
| ||||
| GCastillo/ | Unused, deleted | |||||||
| HGridHack/ | 6/2018 | Irana | Lots | Irana improves to the HGrid, do they work??? | ||||
| HanDoc/ | Unused and deleted | |||||||
| Igor_Ostanin/ | 5/2021 | i.ostanin | Delete | |||||
| 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). | ||||||
| Juan/ | 5/2021 | j.e.alvareznaranjo | Lots | |||||
| Juan_oomphLib/ | 3/2021 | j.e.alvareznaranjo | Lots | |||||
| 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 | ||||||
| Lego/ | Thomas | Yes (Lego.cpp), but it first requires merge of MultiParticle branch.
| ||||||
| Louis/ | lljing | Lots | Keep alives needs cleaning before merging. | |||||
| LucaAlpha/ | Luca | Contain Luca drivers | ||||||
| LucaTrunk/ | Deleted | |||||||
| MPI_IO/ | r5271 r5373 r5376 r5555 | Julius as merged as at the moment. | ||||||
| Martin/ | 7/2020 | mhaustein | Delete.
| |||||
| 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) | ||||||
| OomphlibCoupling/ | Thomas/Hong/Mitchel | Yes (Coupling) | ||||||
| OomphlibCoupling2/ | Thomas | No (has been deleted) | ||||||
| OomphlibCouplingImplicit/ | Hong | |||||||
| OomphlibCouplingLagrange/ | Hong | |||||||
| OomphlibCouplingPrivate/ | Hao | |||||||
| OomphlibCouplingThomas/ | Thomas | No (has been deleted) | ||||||
| OomphlibMarnixReconnect/ | Marnix | |||||||
| Paolo/ | Already merge deleted | |||||||
| 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 | |||||||
| Silvie/ | Delete | |||||||
| Sperl/ | Mathias Sperl weinhartt |
| 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) | |||||
| TriangleWalls/ | Hong |
| Triangle Walls fix | |||||
| VCouplingExplicitTest/ | Hong |
| ||||||
| 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 | ||||
| s.pourandi2/ | 2/2021 | s.pourandi93 | r5157 r5254 | Has doc on how to create a new particle, is this merge with s.pourandi ? |
Page Comparison
General
Content
Integrations