← Back to team overview

dolfin team mailing list archive

Re: [HG DOLFIN] merge

 

On Tuesday 08 September 2009 15:03:26 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:   6979:93ddeaac596e17d99b24a16ca55e91342f576940
> tag:         tip
> parent:      6978:19f0721f5a3d0221dc6ae292302b2ccfffa580b3
> parent:      6977:3d54df3ed64ee441001571f125cd7eae95b235f3
> user:        Anders Logg <logg@xxxxxxxxx>
> date:        Tue Sep 08 15:03:19 2009 +0200
> files:       dolfin/mesh/MeshFunction.h
> description:
> merge
> 
> 
> changeset:   6978:19f0721f5a3d0221dc6ae292302b2ccfffa580b3
> parent:      6975:37efb9fe9fe684b23521574a89048705a9a0bc6e
> user:        Anders Logg <logg@xxxxxxxxx>
> date:        Tue Sep 08 15:03:05 2009 +0200
> files:       ChangeLog dolfin/common/Variable.h dolfin/graph/Graph.h
>  dolfin/la/BlockMatrix.h dolfin/la/BlockVector.h
>  dolfin/la/EpetraKrylovSolver.h dolfin/la/EpetraLUSolver.h
>  dolfin/la/EpetraMatrix.cpp dolfin/la/EpetraMatrix.h
>  dolfin/la/EpetraVector.h dolfin/la/GenericMatrix.h
>  dolfin/la/GenericTensor.h dolfin/la/ITLKrylovSolver.h
>  dolfin/la/MTL4Matrix.cpp dolfin/la/MTL4Matrix.h dolfin/la/MTL4Vector.h
>  dolfin/la/Matrix.h dolfin/la/PETScKrylovMatrix.h
>  dolfin/la/PETScKrylovSolver.h dolfin/la/PETScLUSolver.h
>  dolfin/la/PETScMatrix.cpp dolfin/la/PETScMatrix.h dolfin/la/PETScVector.h
>  dolfin/la/STLMatrix.h dolfin/la/Vector.h dolfin/la/uBLASKrylovMatrix.h
>  dolfin/la/uBLASKrylovSolver.h dolfin/la/uBLASMatrix.h
>  dolfin/la/uBLASVector.h dolfin/log/LogStream.cpp dolfin/math/Lagrange.h
>  dolfin/mesh/CellType.h dolfin/mesh/IntervalCell.h
>  dolfin/mesh/LocalMeshData.h dolfin/mesh/Mesh.h
>  dolfin/mesh/MeshConnectivity.h dolfin/mesh/MeshData.h
>  dolfin/mesh/MeshEntity.h dolfin/mesh/MeshEntityIterator.h
>  dolfin/mesh/MeshFunction.h dolfin/mesh/MeshGeometry.h
>  dolfin/mesh/MeshTopology.h dolfin/mesh/Point.h dolfin/mesh/PointCell.h
>  dolfin/mesh/TetrahedronCell.h dolfin/mesh/TriangleCell.h
>  dolfin/ode/Dependencies.h dolfin/ode/Method.h
>  dolfin/ode/MonoAdaptiveTimeSlab.h dolfin/ode/MultiAdaptiveTimeSlab.h
>  dolfin/ode/cGqMethod.h dolfin/ode/dGqMethod.h
>  dolfin/parameter/Parameters.h dolfin/quadrature/GaussQuadrature.h
>  dolfin/quadrature/LobattoQuadrature.h dolfin/quadrature/RadauQuadrature.h
>  description:
> Remove default arguments in all virtual functions.

I think your find and replace function should be refined:


In file included from ./dolfin/la/LUSolver.h:25,
                 from dolfin/fem/VariationalProblem.cpp:9:
./dolfin/la/EpetraMatrix.h:114: error: ‘virtual void 
dolfin::EpetraMatrix::mult(const dolfin::GenericVector&, 
dolfin::GenericVector&) const’ cannot be overloaded
./dolfin/la/EpetraMatrix.h:111: error: with ‘virtual void 
dolfin::EpetraMatrix::mult(const dolfin::GenericVector&, 
dolfin::GenericVector&) const’

Johan

> changeset:   6977:3d54df3ed64ee441001571f125cd7eae95b235f3
> user:        "Ola Skavhaug <skavhaug@xxxxxxxxx>"
> date:        Tue Sep 08 14:38:11 2009 +0200
> files:       dolfin/mesh/MeshFunction.h
> description:
> Re-enable verbose output of MeshFunctions even though they are templated.
> 
> ----------------------------------------------------------------------
> For more details, visit http://www.fenics.org/hg/dolfin
> _______________________________________________
> DOLFIN-dev mailing list
> DOLFIN-dev@xxxxxxxxxx
> http://www.fenics.org/mailman/listinfo/dolfin-dev
> 


Follow ups

References