Hi Fabio,

I think there might be some confusion here. Option c is not to continue development at the point of master from which you have currently branched. We're dropping support for pre-dmplex firedrake so that branch is going to stop working on all our systems. Option c means that you rebase the branch yourself rather than Lawrence doing it. 

Regards,

David

On 24 March 2014 16:33, Luporini, Fabio <f.luporini12@imperial.ac.uk> wrote:

For my branch:
- pyop2-ir-perf-eval

I choose option (c). It's still under development, but it's there just, as you said, for benchmarking.

Thanks

-- Fabio

2014-03-24 14:59 GMT+00:00 Mitchell, Lawrence <lawrence.mitchell@imperial.ac.uk>:

Dear firedrakers,

if you've been paying attention recently, you'll have noticed we just transitioned to a dmplex based mesh infrastructure.  Now would appear to be a good time to do a little bit of branch spring cleaning.  For each of the branches listed please tell me if you would like it:

(a) kept and pulled forward onto master (still under active development)
(b) pulled forward onto master and proposed for merging
(c) left alone (under development but you'll do it yourself)
(d) removed (the branch is abandoned)

I've organised the branches by "owner", that is the person who has made the most commits on it, but please check the entire list.

David's branches:

- form_cache is in (a), but already rebased
- public_coordinates is in (b)
- real-function-space
  Discussions suggest we need to actually implement these, but we probably need to sit down and think about how to do it properly.
- wave-demo
  This made the video on the front page of the website, should probably be pulled forward and documented in the same way as the other demos.

Doru's branches:

- extrusion-facets-rhs
  This appears under active development as in in review I think
- rebased-efr
  I think this is the same functionality as extrusion-facets-rhs but rebased on a different commit, abandon?
- extrusion-facets
  Abandoned in favour of extrusion-facets-rhs?
- extrusion-documentation
  In review but needing multiple fixes to text before merging
- extrusion-mixed-bcs
  I think this is abandoned, it's got a blowing up discretisation of extruded linear boussinesq we wrote for the October gung-ho meeting.
- ext_bc_demo
  no clue
- extrusion-vfs
  Has some tests, I don't know if they're in master
- extrusion-vfs-new
  has some tests and some IR-related changes.
- extrusion
  has some tests

Florian's branches:

- split-forms
  Needs pulling forward and merging, I think.
- split-kernels
  Abandoned in favour of split-forms?
- fenics-1.3
  Needs to come forward I think
- pytest-2.5.2
  Asks for newer pytest versions on travis
- petsc-ppa
  Probably abandon ware, since we don't have petsc packages for now.
- moar-lint
  Adds even tighter linking to travis


Lawrence's branches:

- more-nullspace
  In progress
- matrix-free
  Needs updating to master, I don't know what state the stuff Rod has been working on is in, that may be a better bet.
- blocked-matrices
  Abandon ware, will drop.

Fabio's branches:

- pyop2-ir-perf-eval
  A bunch of stuff implementing a benchmarking test suite I think.

Colin's branches:

- hydrostatic:
  A test case where the test and trial spaces differ.  Colin, do you want to keep this one?

Simon's branches:

- firedrake-adjoint
  Various bits and pieces of firedrake-adjoint testing, I think this can be dropped.

Cheers,

Lawrence

--

Dr David Ham
Departments of Mathematics and Computing
Imperial College London

http://www.imperial.ac.uk/people/david.ham