lp:~corrado-maurini/dolfin/tao

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~fenics-core/dolfin/trunk

Garth Wells: Approve (very light) on 2013-03-31

Anders Logg: Needs Fixing on 2013-03-07

Diff: 6853 lines (+6648/-4)

23 files modified

CMakeLists.txt (+6/-1)
bench/logs/bench.log (+4/-0)
cmake/modules/FindSLEPc.cmake (+1/-1)
cmake/modules/FindTAO.cmake (+195/-0)
demo/undocumented/contact-vi-tao/cpp/CMakeLists.txt (+40/-0)
demo/undocumented/contact-vi-tao/cpp/Elasticity.h (+4785/-0)
demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl (+45/-0)
demo/undocumented/contact-vi-tao/cpp/main.cpp (+125/-0)
demo/undocumented/contact-vi-tao/python/demo_contact.py (+93/-0)
dolfin/CMakeLists.txt (+7/-0)
dolfin/common/defines.cpp (+9/-0)
dolfin/common/defines.h (+3/-0)
dolfin/nls/TAOLinearBoundSolver.cpp (+440/-0)
dolfin/nls/TAOLinearBoundSolver.h (+210/-0)
dolfin/nls/dolfin_nls.h (+1/-0)
dolfin/swig/modules/la/dependencies.txt (+1/-1)
dolfin/swig/modules/la/dependencies.txt.moved (+1/-0)
dolfin/swig/modules/la/module.i (+2/-0)
dolfin/swig/nls/docstrings.i.THIS (+272/-0)
dolfin/swig/shared_ptr_classes.i (+3/-0)
site-packages/dolfin/compilemodules/swigimportinfo.py.THIS (+295/-0)
test/unit/nls/python/TAOLinearBoundSolver.py (+109/-0)
test/unit/test.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6740. By corrado maurini on 2013-04-04

fix dolfin_assert in TAO

6739. By corrado maurini on 2013-04-04

merge with trunk and Johan fix to TAO

6738. By corrado maurini on 2013-04-04

add check for tao contact-vi-tao

6737. By corrado maurini on 2013-04-04

cleanup TAOLinearBoundSolver

6736. By corrado maurini on 2013-04-04

merge with trunk

6735. By corrado maurini on 2013-03-25

merge with trunk

6734. By corrado maurini on 2013-03-20

minor fix in the demo

6733. By corrado maurini on 2013-03-15

moving TAOLinearBoundSolver in nls

6732. By corrado maurini on 2013-03-15

merge from trunk and adding tests for nls TAOLinearBoundSolver and PETScSNESSolver in test/unit/test.py

6731. By corrado maurini on 2013-03-15

moving TAO