| 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. | ||
| 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. | |||
| 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. | |||
| Documentation/ | Juan, Marc, Mitchel | Lots of stuff | ||||
| ED/ | Rivas | House on fire ED version | ||||
| 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 | ||||
| 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 | |||||
| Lego/ | Thomas | Yes (Lego.cpp), but it first requires merge of MultiParticle branch. | ||||
| Louis/ | lljing | Lots | ||||
| LucaAlpha/ | Luca | Contain Luca drivers | ||||
| LucaTrunk/ | Deleted | |||||
| MPI_IO/ | r5271 r5373 r5376 r5555 | Julius as merged as at the moment. | ||||
| Martin/ | 7/2020 | mhaustein | ||||
| Maser/ | ||||||
| MultiParticle/ | ||||||
| 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) | ||||
| 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/ | ||||||
| ParallelNonSpherical/ | ||||||
| RaisaHertzMindlin/ | ||||||
| RestartFileOverWrite/ | jmft | |||||
| SCouplingTest/ | Hong | |||||
| Silvie/ | ||||||
| Sperl/ | Mathias Sperl | No, has been merged. | ||||
| SuperQuadricsDariel/ | ||||||
| ThomasGSH/ | Thomas | No (has been deleted) | ||||
| Timo/ | ||||||
| TriangleWalls/ | Hong | |||||
| VCouplingExplicitTest/ | Hong | |||||
| Yousef/ | ||||||
| mfransen/ | Marc | |||||
| oomphLibTest/ | Ant | |||||
| raisaroeplal/ | ||||||
| s.pourandi/ | ||||||
| s.pourandi2/ |
Page Comparison
General
Content
Integrations