← Back to team overview

dolfin team mailing list archive

Re: [HG] merge

 

On Thu, Jul 06, 2006 at 10:13:40PM +0200, Garth N. Wells wrote:
> On Thu, 2006-07-06 at 22:10 +0200, DOLFIN wrote:
> > One or more new changesets pushed to the primary DOLFIN repository.
> > A short summary of the last three changesets is included below.
> > 
> > changeset:   2042:2ade03d7f2aadeee5f77d8cc43e449084e95429f
> > tag:         tip
> > parent:      2041:cfddabebddfb52ba1049db33c091cb9c4bf8c08b
> > parent:      2039:dbdd1de36f243ac6063a7b39a6fac82a4f8dd445
> > user:        "Garth N. Wells <g.n.wells@xxxxxxxxxx>"
> > date:        Thu Jul 06 22:09:42 2006 +0200
> > files:       
> > description:
> > merge
> > 
> > 
> > changeset:   2041:cfddabebddfb52ba1049db33c091cb9c4bf8c08b
> > parent:      2040:9460c5bdd9c15dec8a59a36f9ef1faacdb931dc3
> > parent:      2038:afb2d919f7594f51eb5f9569e1497c956c9a6ecf
> > user:        "Garth N. Wells <g.n.wells@xxxxxxxxxx>"
> > date:        Thu Jul 06 21:56:02 2006 +0200
> > files:       
> > description:
> > merge
> > 
> > 
> > changeset:   2040:9460c5bdd9c15dec8a59a36f9ef1faacdb931dc3
> > parent:      2037:c7974f4aff20c967f84e6fd6e7d6812e3a746f96
> > user:        "Garth N. Wells <g.n.wells@xxxxxxxxxx>"
> > date:        Thu Jul 06 21:54:31 2006 +0200
> > files:       src/kernel/la/Makefile.am src/kernel/la/Makefile.in src/kernel/la/dolfin/LinearSolver.h src/kernel/la/dolfin/uBlasDenseMatrix.h src/kernel/la/dolfin/uBlasLUSolver.h src/kernel/la/dolfin/uBlasSparseMatrix.h src/kernel/ode/Dependencies.cpp src/kernel/ode/dolfin/Dependencies.h src/kernel/ode/dolfin/ODE.h
> > description:
> > Make uBlasDenseMatrix and uBlasSparseMatrix typedef's for uBlasMatrix<ublas_dense_matrix> and uBlasMatrix<ublas_sparse_matrix>, respectively, rather than derive classes.
> > 
> > 
> 
> I've changed things to use typedef's for different uBlasMatrix types
> instead of derived classes. The advantage over making uBlasDenseMatrix
> and uBlasSparseMatrix derived classes is that there is no need to
> program constructors for each class - hence less code and less scope for
> error. Disadvantage is that forward declarations of uBlasDenseMatrix and
> uBlasSparseMatrix don't work. You need to include the header file. If
> using typdefs is a problem, it's easy to roll back.
> 
> Garth

Looks good to me.

/Anders


References