On 5 January 2012 13:42, Marie E. Rognes <m...@simula.no> wrote: > > This seemed to break the build on the trunk buildbots, is there a fix in > progress? >
I've pushed a fix. A small change was required in the bench code. 'make runtests' doesn't seem to build the bench code, which is why I didn't pick it up locally. Garth > -- > Marie > > On 01/04/2012 02:24 AM, nore...@launchpad.net wrote: >> >> Merge authors: >> Garth Wells (garth-wells) >> ------------------------------------------------------------ >> revno: 6496 [merge] >> committer: Garth N. Wells<gn...@cam.ac.uk> >> branch nick: working >> timestamp: Tue 2012-01-03 23:45:26 +0000 >> message: >> merge with csc branch. >> modified: >> dolfin/fem/Assembler.cpp >> dolfin/fem/AssemblerTools.cpp >> dolfin/fem/AssemblerTools.h >> dolfin/fem/OpenMpAssembler.cpp >> dolfin/fem/SystemAssembler.cpp >> dolfin/la/DefaultFactory.cpp >> dolfin/la/DefaultFactory.h >> dolfin/la/EpetraFactory.cpp >> dolfin/la/EpetraFactory.h >> dolfin/la/EpetraSparsityPattern.cpp >> dolfin/la/EpetraSparsityPattern.h >> dolfin/la/GenericMatrix.cpp >> dolfin/la/GenericMatrix.h >> dolfin/la/GenericSparsityPattern.h >> dolfin/la/LinearAlgebraFactory.h >> dolfin/la/MTL4Factory.h >> dolfin/la/PETScFactory.cpp >> dolfin/la/PETScFactory.h >> dolfin/la/PaStiXLUSolver.cpp >> dolfin/la/STLFactory.h >> dolfin/la/STLMatrix.cpp >> dolfin/la/STLMatrix.h >> dolfin/la/SingularSolver.cpp >> dolfin/la/SparsityPattern.cpp >> dolfin/la/SparsityPattern.h >> dolfin/la/uBLASFactory.h >> The size of the diff (1346 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 > > > > -- > Marie Elisabeth Rognes Email: m...@simula.no > Postdoctoral Fellow Mobile: +47 45 66 23 96 > Simula Research Laboratory > Martin Linges v 17, Fornebu > PO Box 134 > N-1325 Lysaker, Norway > > > > > > _______________________________________________ > Mailing list: https://launchpad.net/~dolfin > Post to : dolfin@lists.launchpad.net > Unsubscribe : https://launchpad.net/~dolfin > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
