← Back to team overview

dolfin team mailing list archive

[HG] fix merge problems.

 

One or more new changesets pushed to the primary DOLFIN repository.
A short summary of the last three changesets is included below.

changeset:   2092:796fb98f02471ac91ba5bc2c362b3172fe1ead4d
tag:         tip
parent:      2091:c6d8aa52a0e859f245a2f244dfd4ce8c8e93967a
parent:      2090:6967de5a3f8d0392fc2f870fe214cc7b62e7968d
user:        "Garth N. Wells <g.n.wells@xxxxxxxxxx>"
date:        Tue Aug 08 23:42:43 2006 +0200
files:       src/kernel/ode/MonoAdaptiveNewtonSolver.cpp src/kernel/ode/MultiAdaptiveNewtonSolver.cpp src/kernel/ode/dolfin/MonoAdaptiveNewtonSolver.h
description:
fix merge problems.


changeset:   2091:c6d8aa52a0e859f245a2f244dfd4ce8c8e93967a
parent:      2088:b501bb9d3672ba8c7d3d5a89500b0206dcc6c477
user:        "Garth N. Wells <g.n.wells@xxxxxxxxxx>"
date:        Tue Aug 08 18:09:15 2006 +0200
files:       src/kernel/la/dolfin/PETScPreconditioner.h src/kernel/la/dolfin/uBlasILUPreconditioner.h src/kernel/la/dolfin/uBlasKrylovSolver.h src/kernel/la/dolfin/uBlasLUSolver.h src/kernel/la/dolfin/uBlasLinearSolver.h src/kernel/la/dolfin/uBlasMatrix.h src/kernel/la/dolfin/uBlasPreconditioner.h src/kernel/la/uBlasILUPreconditioner.cpp src/kernel/la/uBlasKrylovSolver.cpp src/kernel/la/uBlasLUSolver.cpp src/kernel/ode/Homotopy.cpp src/kernel/ode/MonoAdaptiveNewtonSolver.cpp src/kernel/ode/MultiAdaptiveNewtonSolver.cpp src/kernel/ode/dolfin/Homotopy.h src/kernel/ode/dolfin/MonoAdaptiveNewtonSolver.h
description:
More clean ups to uBlasKrylovSolver and work in setting preconditioner.


changeset:   2090:6967de5a3f8d0392fc2f870fe214cc7b62e7968d
parent:      2089:0593d2067e3b562b966185fb877504edbcc6cbc2
parent:      2088:b501bb9d3672ba8c7d3d5a89500b0206dcc6c477
user:        "Anders Logg <logg@xxxxxxxxx>"
date:        Tue Aug 08 16:00:55 2006 +0200
files:       
description:
merge


-------------------------------------------------------
For more details, visit http://www.fenics.org/hg/dolfin