Merge lp:~ldeo-magma/dolfin/devfixes into lp:dolfin/1.0.x
Proposed by
Cian Wilson
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 6351 | ||||
Proposed branch: | lp:~ldeo-magma/dolfin/devfixes | ||||
Merge into: | lp:dolfin/1.0.x | ||||
Diff against target: |
382 lines (+190/-128) 3 files modified
dolfin/common/defines.cpp (+170/-0) dolfin/common/defines.h (+16/-124) site-packages/dolfin_utils/meshconvert.py (+4/-4) |
||||
To merge this branch: | bzr merge lp:~ldeo-magma/dolfin/devfixes | ||||
Related bugs: |
|
||||
Related blueprints: |
Extend interface to MeshValueCollection
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Registry Administrators | Pending | ||
Review via email: mp+79484@code.launchpad.net |
Description of the change
The following are so trivial they may not be worth your while merging from this branch but I thought I'd flag them anyway.
meshconvert.py still produces xml headers with 'meshfunction' in them, which produces a warning at runtime. Changing to 'mesh_function'.
defines.h was producing multiple definitions of its various subroutines during linking (I have multiple libraries which include dolfin.h). I've split it up into definitions and implementation now and this fixes my problem but don't know if you have a preferred solution.
This all appears to work for me but hasn't been thoroughly tested.
To post a comment you must log in.
Cian!
Thanks for the fixes. They all look good. Have you looked at the webpage for
contributing code?
http:// fenicsproject. org/contributin g/contributing_ code.html
There are a copyright consent you need to sign (if you have not done it).
Basically giving the consent that FEniCS can be distributed with LGPL3.0 or
later.
Johan
On Saturday October 15 2011 17:47:29 Cian Wilson wrote: /code.launchpad .net/~ldeo- magma/dolfin/ devfixes/ +merge/ 79484
> Cian Wilson has proposed merging lp:~ldeo-magma/dolfin/devfixes into
> lp:dolfin.
>
> Requested reviews:
> DOLFIN Core Team (dolfin-core)
>
> For more details, see:
> https:/
>
> The following are so trivial they may not be worth your while merging from
> this branch but I thought I'd flag them anyway.
>
> meshconvert.py still produces xml headers with 'meshfunction' in them,
> which produces a warning at runtime. Changing to 'mesh_function'.
>
> defines.h was producing multiple definitions of its various subroutines
> during linking (I have multiple libraries which include dolfin.h). I've
> split it up into definitions and implementation now and this fixes my
> problem but don't know if you have a preferred solution.
>
> This all appears to work for me but hasn't been thoroughly tested.