← Back to team overview

dolfin team mailing list archive

Re: [HG DOLFIN] merge

 

On Sun, Jul 05, 2009 at 11:12:00PM +0200, Johan Hake wrote:
> On Sunday 05 July 2009 23:05:33 Anders Logg wrote:
> > On Sun, Jul 05, 2009 at 10:59:21PM +0200, Johan Hake wrote:
> > > On Sunday 05 July 2009 22:41:40 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:   6420:920786635f4ec37a05fe3752d0701d9cf472f125
> > > > tag:         tip
> > > > parent:      6419:8d098ee6533779a969591119a1073fc1c59d12fd
> > > > parent:      6418:af869a96c99f563c7fe8a49322033a168aea5d89
> > > > user:        Anders Logg <logg@xxxxxxxxx>
> > > > date:        Sun Jul 05 22:41:35 2009 +0200
> > > > files:
> > > > description:
> > > > merge
> > > >
> > > >
> > > > changeset:   6419:8d098ee6533779a969591119a1073fc1c59d12fd
> > > > parent:      6416:e645d3295afb8732b2186e4fc62d026a48c6fb55
> > > > user:        Anders Logg <logg@xxxxxxxxx>
> > > > date:        Sun Jul 05 22:40:47 2009 +0200
> > > > files:       demo/la/eigensolver/cpp/main.cpp
> > > > demo/ode/harmonic/cpp/main_solvedual.cpp demo/ode/stiff/cpp/main.cpp
> > > > demo/pde/cahn-hilliard/cpp/main.cpp demo/pde/dg/biharmonic/cpp/main.cpp
> > > > demo/pde/dg/poisson/cpp/main.cpp dolfin/common/Timer.h
> > > > dolfin/io/GenericFile.cpp dolfin/io/GenericFile.h dolfin/io/XMLFile.h
> > > > dolfin/io/XMLParameterList.cpp dolfin/io/XMLParameterList.h
> > > > dolfin/io/XMLParameters.cpp dolfin/io/XMLParameters.h
> > > > dolfin/la/DefaultFactory.cpp dolfin/la/EpetraPreconditioner.h
> > > > dolfin/la/SLEPcEigenSolver.h dolfin/la/uBLASPreconditioner.h
> > > > dolfin/mesh/Mesh.h dolfin/ode/Adaptivity.cpp
> > > > dolfin/ode/Dependencies.cpp dolfin/ode/GMPObject.h
> > > > dolfin/ode/MonoAdaptiveFixedPointSolver.cpp
> > > > dolfin/ode/MonoAdaptiveNewtonSolver.cpp
> > > > dolfin/ode/MonoAdaptiveTimeSlab.cpp dolfin/ode/MonoAdaptivity.cpp
> > > > dolfin/ode/MultiAdaptiveFixedPointSolver.cpp
> > > > dolfin/ode/MultiAdaptiveNewtonSolver.cpp
> > > > dolfin/ode/MultiAdaptiveTimeSlab.cpp dolfin/ode/MultiAdaptivity.cpp
> > > > dolfin/ode/ODE.cpp dolfin/ode/ODESolution.cpp dolfin/ode/ODESolver.cpp
> > > > dolfin/ode/Partition.cpp dolfin/ode/TimeSlab.cpp dolfin/ode/TimeSlab.h
> > > > dolfin/ode/TimeSlabSolver.cpp dolfin/ode/TimeStepper.cpp
> > > > dolfin/parameter/DefaultParameters.h dolfin/parameter/NewParameters.cpp
> > > > dolfin/parameter/NewParameters.h dolfin/parameter/Parameter.cpp
> > > > dolfin/parameter/Parameter.h dolfin/parameter/ParameterList.cpp
> > > > dolfin/parameter/ParameterList.h dolfin/parameter/ParameterSystem.cpp
> > > > dolfin/parameter/ParameterSystem.h dolfin/parameter/ParameterValue.cpp
> > > > dolfin/parameter/ParameterValue.h dolfin/parameter/Parametrized.cpp
> > > > dolfin/parameter/Parametrized.h dolfin/parameter/dolfin_parameter.h
> > > > dolfin/parameter/parameters.cpp dolfin/parameter/parameters.h
> > > > dolfin/plot/plot.cpp dolfin/swig/dolfin_docstrings.i
> > > > dolfin/swig/dolfin_function_post.i dolfin/swig/dolfin_headers.i
> > > > dolfin/swig/dolfin_io_post.i description:
> > > > Remove old parameter system, including dolfin_get, dolfin_set
> > > > and use new global parameters everywhere. Python untested and
> > > > probably needs work.
> > >
> > > Did you forget to commit SLEPcEigenSolver.cpp?
> >
> > Strange, it compiled here, including all demos.
> 
> Which indicates that you just forgot to include SLEPcEigenSolver.cpp in the 
> commit.

No, I just did 'hg commit' which should pick up all the files. The
strange thing was that it even compiled on my machine with the old
wrong version there. Perhaps something with time stamps etc on the .os
files. It's a mystery. Anyway, I've pushed the new version now (I
think...).

-- 
Anders


> > I'll add the correct 
> > version shortly. I'm working on renaming NewParameter to Parameter etc
> > so it will be in the same changeset.
> 
> Ok
> 
> johan

Attachment: signature.asc
Description: Digital signature


Follow ups

References