I installed TAO version 2.1 and tried compile this merge. There were several compile errors and misrepresentation of tabs, which cluttered the code. There were also other code format issues.
I have tried fixing the compile issues. Not sure I return the correct number from solve. The TAO unittest does not run as some shared_ptr assertion is raised. Corrado could you please fix this? Johan On 03/31/2013 04:25 PM, [email protected] wrote: > Merge authors: > corrado maurini (corrado-maurini) > corrado maurini (corrado-maurini) > corrado maurini (corrado-maurini) > corrado maurini (corrado-maurini) > Related merge proposals: > https://code.launchpad.net/~corrado-maurini/dolfin/tao/+merge/123195 > proposed by: corrado maurini (corrado-maurini) > review: Approve - Garth Wells (garth-wells) > review: Needs Fixing - Anders Logg (logg) > ------------------------------------------------------------ > revno: 7590 [merge] > committer: Garth N. Wells <[email protected]> > branch nick: testing > timestamp: Sun 2013-03-31 15:23:18 +0100 > message: > Merge TAO interface from Corrado Maurini > added: > cmake/modules/FindTAO.cmake > demo/undocumented/contact-vi-tao/ > demo/undocumented/contact-vi-tao/cpp/ > demo/undocumented/contact-vi-tao/cpp/CMakeLists.txt > demo/undocumented/contact-vi-tao/cpp/Elasticity.ufl > demo/undocumented/contact-vi-tao/cpp/main.cpp > demo/undocumented/contact-vi-tao/python/ > demo/undocumented/contact-vi-tao/python/demo_contact.py > dolfin/nls/TAOLinearBoundSolver.cpp > dolfin/nls/TAOLinearBoundSolver.h > test/unit/nls/python/TAOLinearBoundSolver.py > modified: > CMakeLists.txt > bench/logs/bench.log > cmake/modules/FindSLEPc.cmake > dolfin/CMakeLists.txt > dolfin/common/defines.cpp > dolfin/common/defines.h > dolfin/nls/dolfin_nls.h > dolfin/swig/modules/la/dependencies.txt > dolfin/swig/modules/la/module.i > dolfin/swig/shared_ptr_classes.i > test/unit/test.py > The size of the diff (1481 lines) is larger than your specified limit of 500 > lines > > -- > lp:dolfin > https://code.launchpad.net/~dolfin-core/dolfin/trunk > > Your team DOLFIN Core Team is subscribed to branch lp:dolfin. > To unsubscribe from this branch go to > https://code.launchpad.net/~dolfin-core/dolfin/trunk/+edit-subscription > _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : [email protected] Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
