Versions Compared

Version Old Version 1 New Version Current
Changes made by

Anthony Thornton

Anthony Thornton

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

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.

Bert/

28/4/2021

JuanPlease 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/2020ThomasNo (tried binary writing, but that has been superseeded by Julius' MPI_IO). Has been deleted.ChuteJonny/4/2018Jonny

r2719

r2737

r2808

r2809

Contains new test and new feature like curve linear chute should be megered will check with JonnyCleanUp/ThomasNo (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.

Two bug fixes that look usful

DPMBase and HertizianMin..

GCastillo/Unused, deleted

ED/


Rivas


House on fire ED version


Place in obsolute.

Edgar_Ortega/Unused, deletedFirstTimeStepInteractionFix/6/2018Irana/Thomas

r3094

r3103

HGridHack/

6/2018

Irana

Lots

Irana improves to the HGrid, do they work???

HanDoc/Unused and deletedIgor_Ostanin/ImproveHGrid/ThomasNo (has been merged and deleted)ImproveHGrid2/ThomasNo (has been merged and deleted)

5/2021

i.ostanin

Delete

JBarbosa/


JBarbosa/


This has the fault multiparticle implement (keep for now).

Juan/5/2021

j.e.alvareznaranjo

Lots

JanWillem




Done

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

Kose/Delete, only merges from Trunk no new code.

LeesEdwardsJonny/



Lots

To be merge

Merged. Waiting fo Jonny to confirm delete

Lego/


Thomas


Yes (Lego.cpp), but it first requires merge of MultiParticle branch.


.Louis/

lljing

LotsKeep 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

Delete.

mhaustein

OMP/JuliusNo (has been merged), and now deletedOMPThomas/ThomasNo (has been merged and deleted)OS/ThomasNo (has been merged and deleted)OSComparison/ThomasNo (has been merged and deleted)

Maser/




Very weird branch I do not understand.

MultiParticle/

Juan multiparticle branchNewDocumentation/AllNo (has been deleted, as it was a bit buggy to merge; we should make a new documentation branch)




please delete it.

OomphlibCoupling/


Thomas/Hong/Mitchel


Yes (Coupling)

OomphlibCoupling2/ThomasNo (has been deleted)

OomphlibCouplingImplicit/


Hong



OomphlibCouplingLagrange/


Hong



OomphlibCouplingPrivate/


Hao

OomphlibCouplingThomas/ThomasNo (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

We (Anthony Thornton and Thomas Weinhart ) thing this is a little strong what it does. So will orphan this branch for now.

SCouplingTest/


Hong/

j.e.alvareznaranjo

Silvie/



SCouplingThomas

DeleteSperl/

Mathias Sperl

weinhartt

No, has been merged. (not true)

SuperQuadricsDariel/Small bug to superquadric should be merged.ThomasGSH/ThomasNo (has been deleted)Timo/4/2021TimoTimo active branch (merge or keep alive)





Hong

SCouplingCloud





SCouloingThomasNewOoomph





TriangleWalls/


Hong


Triangle Walls fix

VCouplingExplicitTest/

This branches does not compile so hard to merge. Will discuss with Thomas.

Also there is an alternative fix to this problem in the Trunk, so in some sense this code is not needed.

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

LotsActive branch keeps.pourandi2/2/2021s.pourandi93

r5157

r5254

Has doc on how to create a new particle, is this merge with s.pourandi ?

Not true there is code from mfransen branch so either merge this or that branch.

xiuqiwang/