dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

On Sat, Nov 19, 2011 at 11:25:17AM +0000, Garth N. Wells wrote:
> On 19 November 2011 11:19, Anders Logg <logg@xxxxxxxxx> wrote:
> > On Sat, Nov 19, 2011 at 11:09:18AM -0000, noreply@xxxxxxxxxxxxx wrote:
> >> Merge authors:
> >>   Anders Logg (logg)
> >> ------------------------------------------------------------
> >> revno: 6447 [merge]
> >> committer: Garth N. Wells <gnw20@xxxxxxxxx>
> >> branch nick: trunk
> >> timestamp: Sat 2011-11-19 11:06:15 +0000
> >> message:
> >>   Merge with 1.0 branch. Why doesn't the 1.0 committer do this?
> >
> > Because it hasn't been tested yet. Shouldn't a merge wait until the
> > buildbot is green?
> >
>
> Just run the tests, and buy a new computer if it's too slow. Not
> merging leaves others to clean up conflicts.

I'm actually thinking of buying a new computer, but I still think it
makes sense for the buildbot (not just local tests) to be green for
one branch before it is merged into another.

--
Anders


> Garth
>
> >
> >
> >> modified:
> >>   demo/pde/mixed-poisson/cpp/documentation.rst
> >>   demo/pde/mixed-poisson/cpp/main.cpp
> >>   demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.h
> >>   demo/undocumented/auto-adaptive-poisson/cpp/AdaptivePoisson.h
> >>   demo/undocumented/periodic/cpp/main.cpp
> >>   demo/undocumented/periodic/python/demo_periodic.py
> >>   dolfin/adaptivity/AdaptiveLinearVariationalSolver.cpp
> >>   dolfin/adaptivity/AdaptiveNonlinearVariationalSolver.cpp
> >>   dolfin/adaptivity/ErrorControl.cpp
> >>   dolfin/adaptivity/Extrapolation.cpp
> >>   dolfin/adaptivity/GenericAdaptiveVariationalSolver.cpp
> >>   dolfin/adaptivity/GoalFunctional.cpp
> >>   dolfin/adaptivity/SpecialFacetFunction.cpp
> >>   dolfin/adaptivity/TimeSeries.cpp
> >>   dolfin/adaptivity/adapt.cpp
> >>   dolfin/ale/ALE.cpp
> >>   dolfin/common/Array.h
> >>   dolfin/common/IndexSet.h
> >>   dolfin/common/MPI.cpp
> >>   dolfin/common/MPI.h
> >>   dolfin/fem/Assembler.cpp
> >>   dolfin/fem/AssemblerTools.cpp
> >>   dolfin/fem/BoundaryCondition.cpp
> >>   dolfin/fem/DirichletBC.cpp
> >>   dolfin/fem/DofMap.cpp
> >>   dolfin/fem/DofMap.h
> >>   dolfin/fem/DofMapBuilder.cpp
> >>   dolfin/fem/Equation.cpp
> >>   dolfin/fem/FiniteElement.cpp
> >>   dolfin/fem/FiniteElement.h
> >>   dolfin/fem/Form.cpp
> >>   dolfin/fem/LinearVariationalProblem.cpp
> >>   dolfin/fem/LinearVariationalSolver.cpp
> >>   dolfin/fem/NonlinearVariationalProblem.cpp
> >>   dolfin/fem/NonlinearVariationalSolver.cpp
> >>   dolfin/fem/OpenMpAssembler.cpp
> >>   dolfin/fem/PeriodicBC.cpp
> >>   dolfin/fem/PointSource.cpp
> >>   dolfin/fem/SystemAssembler.cpp
> >>   dolfin/fem/UFC.cpp
> >>   dolfin/fem/UFCCell.h
> >>   dolfin/function/Constant.cpp
> >>   dolfin/function/Function.cpp
> >>   dolfin/function/FunctionSpace.cpp
> >>   dolfin/function/GenericFunction.cpp
> >>   dolfin/function/GenericFunction.h
> >>   dolfin/function/SpecialFunctions.cpp
> >>   dolfin/graph/BoostGraphInterface.cpp
> >>   dolfin/graph/BoostGraphInterface.h
> >>   dolfin/graph/GraphBuilder.cpp
> >>   dolfin/graph/MatrixRenumbering.cpp
> >>   dolfin/graph/ParMETIS.cpp
> >>   dolfin/graph/SCOTCH.cpp
> >>   dolfin/graph/ZoltanInterface.cpp
> >>   dolfin/intersection/IntersectionOperator.cpp
> >>   dolfin/io/RAWFile.cpp
> >>   dolfin/io/VTKFile.cpp
> >>   dolfin/io/VTKWriter.cpp
> >>   dolfin/io/XMLArray.h
> >>   dolfin/io/XMLFile.cpp
> >>   dolfin/io/XMLFunctionData.cpp
> >>   dolfin/io/XMLMesh.cpp
> >>   dolfin/io/XMLMeshFunction.h
> >>   dolfin/io/XMLMeshValueCollection.h
> >>   dolfin/io/XMLVector.cpp
> >>   dolfin/io/XYZFile.cpp
> >>   dolfin/la/BlockMatrix.cpp
> >>   dolfin/la/BlockVector.cpp
> >>   dolfin/la/CholmodCholeskySolver.cpp
> >>   dolfin/la/EpetraFactory.cpp
> >>   dolfin/la/EpetraKrylovSolver.cpp
> >>   dolfin/la/EpetraLUSolver.cpp
> >>   dolfin/la/EpetraMatrix.cpp
> >>   dolfin/la/EpetraSparsityPattern.cpp
> >>   dolfin/la/EpetraVector.cpp
> >>   dolfin/la/GenericVector.h
> >>   dolfin/la/ITLKrylovSolver.cpp
> >>   dolfin/la/KrylovSolver.cpp
> >>   dolfin/la/LUSolver.cpp
> >>   dolfin/la/LinearSolver.cpp
> >>   dolfin/la/MTL4Matrix.cpp
> >>   dolfin/la/MTL4Matrix.h
> >>   dolfin/la/MTL4Vector.cpp
> >>   dolfin/la/PETScBaseMatrix.cpp
> >>   dolfin/la/PETScKrylovSolver.cpp
> >>   dolfin/la/PETScLUSolver.cpp
> >>   dolfin/la/PETScMatrix.cpp
> >>   dolfin/la/PETScPreconditioner.cpp
> >>   dolfin/la/PETScVector.cpp
> >>   dolfin/la/SLEPcEigenSolver.cpp
> >>   dolfin/la/STLMatrix.cpp
> >>   dolfin/la/Scalar.h
> >>   dolfin/la/SingularSolver.cpp
> >>   dolfin/la/SparsityPattern.cpp
> >>   dolfin/la/TrilinosPreconditioner.cpp
> >>   dolfin/la/UmfpackLUSolver.cpp
> >>   dolfin/la/uBLASILUPreconditioner.cpp
> >>   dolfin/la/uBLASKrylovMatrix.cpp
> >>   dolfin/la/uBLASKrylovSolver.cpp
> >>   dolfin/la/uBLASMatrix.h
> >>   dolfin/la/uBLASVector.cpp
> >>   dolfin/log/Logger.cpp
> >>   dolfin/log/Logger.h
> >>   dolfin/log/log.cpp
> >>   dolfin/log/log.h
> >>   dolfin/math/Lagrange.cpp
> >>   dolfin/math/Legendre.cpp
> >>   dolfin/mesh/BoundaryComputation.cpp
> >>   dolfin/mesh/CellType.cpp
> >>   dolfin/mesh/DynamicMeshEditor.cpp
> >>   dolfin/mesh/Edge.cpp
> >>   dolfin/mesh/Face.cpp
> >>   dolfin/mesh/Facet.cpp
> >>   dolfin/mesh/FacetCell.cpp
> >>   dolfin/mesh/IntervalCell.cpp
> >>   dolfin/mesh/LocalMeshData.cpp
> >>   dolfin/mesh/LocalMeshValueCollection.h
> >>   dolfin/mesh/Mesh.cpp
> >>   dolfin/mesh/Mesh.h
> >>   dolfin/mesh/MeshColoring.cpp
> >>   dolfin/mesh/MeshConnectivity.cpp
> >>   dolfin/mesh/MeshData.cpp
> >>   dolfin/mesh/MeshDistributed.cpp
> >>   dolfin/mesh/MeshDomains.cpp
> >>   dolfin/mesh/MeshEditor.cpp
> >>   dolfin/mesh/MeshFunction.h
> >>   dolfin/mesh/MeshGeometry.h
> >>   dolfin/mesh/MeshPartitioning.cpp
> >>   dolfin/mesh/MeshPartitioning.h
> >>   dolfin/mesh/MeshRenumbering.cpp
> >>   dolfin/mesh/MeshTopology.cpp
> >>   dolfin/mesh/MeshValueCollection.h
> >>   dolfin/mesh/ParallelData.cpp
> >>   dolfin/mesh/Point.h
> >>   dolfin/mesh/TetrahedronCell.cpp
> >>   dolfin/mesh/TopologyComputation.cpp
> >>   dolfin/mesh/TriangleCell.cpp
> >>   dolfin/nls/NewtonSolver.cpp
> >>   dolfin/parameter/Parameters.cpp
> >>   dolfin/plot/FunctionPlotData.cpp
> >>   dolfin/plot/plot.cpp
> >>   dolfin/quadrature/BarycenterQuadrature.h
> >>   dolfin/quadrature/Quadrature.cpp
> >>   dolfin/refinement/RegularCutRefinement.cpp
> >>   dolfin/swig/docstrings.i
> >> The size of the diff (7223 lines) is larger than your specified limit of 500 lines
> >>
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~dolfin
> > Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~dolfin
> > More help   : https://help.launchpad.net/ListHelp
> >