This change comments out the typedef for dolfin::uint. It may need some work on 32-bit machines. All tests pass on a 64-bit machine.
Once it all works, we can consider adding the typedef back for the next release. In the meantime it will force developers to update. Garth ---------- Forwarded message ---------- From: <nore...@launchpad.net> Date: Tue, Dec 4, 2012 at 10:05 PM Subject: [Branch ~dolfin-core/dolfin/trunk] Rev 7179: Merge size_t changes To: Garth Wells <gn...@cam.ac.uk> Merge authors: Garth Wells (garth-wells) ------------------------------------------------------------ revno: 7179 [merge] committer: Garth N. Wells <gn...@cam.ac.uk> branch nick: staging timestamp: Tue 2012-12-04 22:02:56 +0000 message: Merge size_t changes modified: bench/fem/assembly/cpp/forms/Elasticity3D.h bench/fem/assembly/cpp/forms/NSEMomentum3D.h bench/fem/assembly/cpp/forms/Poisson2DP1.h bench/fem/assembly/cpp/forms/Poisson2DP2.h bench/fem/assembly/cpp/forms/Poisson2DP3.h bench/fem/assembly/cpp/forms/StabStokes2D.h bench/fem/assembly/cpp/forms/THStokes2D.h bench/fem/convergence/cpp/forms/Poisson2D_1.h bench/fem/convergence/cpp/forms/Poisson2D_2.h bench/fem/convergence/cpp/forms/Poisson2D_3.h bench/fem/convergence/cpp/forms/Poisson2D_4.h bench/fem/convergence/cpp/forms/Poisson2D_5.h bench/fem/convergence/cpp/forms/Poisson3D_1.h bench/fem/convergence/cpp/forms/Poisson3D_2.h bench/fem/convergence/cpp/forms/Poisson3D_3.h bench/fem/convergence/cpp/forms/Poisson3D_4.h bench/fem/convergence/cpp/forms/Poisson3D_5.h bench/fem/multicore/cpp/NavierStokes.h bench/fem/multicore/cpp/Poisson.h bench/fem/speedup/cpp/Poisson.h bench/function/evaluation/cpp/P1.h demo/la/eigenvalue/cpp/StiffnessMatrix.h demo/pde/biharmonic/cpp/Biharmonic.h demo/pde/cahn-hilliard/cpp/CahnHilliard2D.cpp demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h demo/pde/cahn-hilliard/cpp/CahnHilliard3D.cpp demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h demo/pde/hyperelasticity/cpp/HyperElasticity.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/navier-stokes/cpp/PressureUpdate.h demo/pde/navier-stokes/cpp/TentativeVelocity.h demo/pde/navier-stokes/cpp/VelocityUpdate.h demo/pde/navier-stokes/cpp/documentation.rst demo/pde/navier-stokes/cpp/main.cpp demo/pde/poisson/cpp/Poisson.h demo/pde/stokes-iterative/cpp/Stokes.h demo/pde/stokes-iterative/cpp/StokesPreconditioner.h demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.h demo/undocumented/advection-diffusion/cpp/Velocity.h demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.h demo/undocumented/auto-adaptive-navier-stokes/cpp/main.cpp demo/undocumented/auto-adaptive-poisson/cpp/AdaptivePoisson.h demo/undocumented/auto-adaptive-poisson/cpp/main.cpp demo/undocumented/bcs/cpp/Poisson.h demo/undocumented/block-matrix/cpp/StiffnessMatrix.h demo/undocumented/conditional/cpp/Conditional.h demo/undocumented/curl-curl/cpp/CurrentDensity.h demo/undocumented/curl-curl/cpp/EddyCurrents.h demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.h demo/undocumented/dg-advection-diffusion/cpp/Projection.h demo/undocumented/dg-advection-diffusion/cpp/Velocity.h demo/undocumented/dg-poisson/cpp/Poisson.h demo/undocumented/distancequeries/cpp/main.cpp demo/undocumented/elasticity/cpp/Elasticity.h demo/undocumented/elasticity/cpp/main.cpp demo/undocumented/elastodynamics/cpp/DG0_eps_xx.h demo/undocumented/elastodynamics/cpp/ElastoDynamics.h demo/undocumented/elastodynamics/cpp/main.cpp demo/undocumented/eval/cpp/Projection.h demo/undocumented/extrapolation/cpp/P1.h demo/undocumented/extrapolation/cpp/P2.h demo/undocumented/functional/cpp/EnergyNorm.h demo/undocumented/heatequation/cpp/HeatEquation.ufl demo/undocumented/heatequation/cpp/Heat_2D.h demo/undocumented/lift-drag/cpp/Drag.h demo/undocumented/lift-drag/cpp/Lift.h demo/undocumented/lift-drag/cpp/Pressure.h demo/undocumented/lift-drag2/cpp/Functionals.h demo/undocumented/mesh-generation/cpp/main.cpp demo/undocumented/neumann-poisson/cpp/Poisson.h demo/undocumented/nonlinear-poisson/cpp/NonlinearPoisson.h demo/undocumented/nonmatching-interpolation/cpp/P1.h demo/undocumented/nonmatching-interpolation/cpp/P3.h demo/undocumented/nonmatching-projection/cpp/P1_projection.h demo/undocumented/nonmatching-projection/cpp/P3.h demo/undocumented/periodic/cpp/Poisson.h demo/undocumented/plot/cpp/main.cpp demo/undocumented/poisson1D/cpp/Poisson.h demo/undocumented/reaction-diffusion/cpp/ReactionDiffusion.h demo/undocumented/restriction/cpp/Poisson.h demo/undocumented/singular/cpp/Poisson.h demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.h demo/undocumented/stokes-stabilized/cpp/Stokes.h demo/undocumented/stokes-taylor-hood/cpp/Stokes.h demo/undocumented/sym-dirichlet-bc/cpp/Poisson.h demo/undocumented/time-series/cpp/main.cpp demo/undocumented/waveguide/cpp/Forms.h demo/undocumented/waveguide/cpp/main.cpp dolfin/adaptivity/AdaptiveLinearVariationalSolver.cpp dolfin/adaptivity/AdaptiveLinearVariationalSolver.h dolfin/adaptivity/AdaptiveNonlinearVariationalSolver.cpp dolfin/adaptivity/AdaptiveNonlinearVariationalSolver.h dolfin/adaptivity/ErrorControl.cpp dolfin/adaptivity/Extrapolation.cpp dolfin/adaptivity/GenericAdaptiveVariationalSolver.cpp dolfin/adaptivity/GenericAdaptiveVariationalSolver.h dolfin/adaptivity/GoalFunctional.cpp dolfin/adaptivity/GoalFunctional.h dolfin/adaptivity/LocalAssembler.cpp dolfin/adaptivity/LocalAssembler.h dolfin/adaptivity/TimeSeries.cpp dolfin/adaptivity/TimeSeries.h dolfin/adaptivity/adapt.cpp dolfin/adaptivity/adapt.h dolfin/adaptivity/marking.cpp dolfin/ale/ALE.cpp dolfin/ale/HarmonicSmoothing.cpp dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/common/Array.h dolfin/common/Hierarchical.h dolfin/common/IndexSet.h dolfin/common/RangedIndexSet.h dolfin/common/Set.h dolfin/common/UniqueIdGenerator.cpp dolfin/common/UniqueIdGenerator.h dolfin/common/Variable.h dolfin/common/types.h dolfin/common/utils.cpp dolfin/common/utils.h dolfin/fem/Assembler.cpp dolfin/fem/AssemblerBase.cpp dolfin/fem/AssemblerBase.h dolfin/fem/BasisFunction.h dolfin/fem/BoundaryCondition.h dolfin/fem/DirichletBC.cpp dolfin/fem/DirichletBC.h dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/fem/DofMapBuilder.cpp dolfin/fem/FiniteElement.cpp dolfin/fem/FiniteElement.h dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/GenericDofMap.h dolfin/fem/LinearTimeDependentProblem.cpp dolfin/fem/LinearVariationalProblem.cpp dolfin/fem/NonlinearVariationalProblem.cpp dolfin/fem/NonlinearVariationalSolver.cpp dolfin/fem/NonlinearVariationalSolver.h dolfin/fem/OpenMpAssembler.cpp dolfin/fem/PeriodicBC.cpp dolfin/fem/PointSource.cpp dolfin/fem/SparsityPatternBuilder.cpp dolfin/fem/SymmetricAssembler.cpp dolfin/fem/SystemAssembler.cpp dolfin/fem/UFC.cpp dolfin/fem/UFC.h dolfin/fem/UFCCell.h dolfin/fem/UFCMesh.cpp dolfin/fem/UFCMesh.h dolfin/function/CoefficientAssigner.cpp dolfin/function/CoefficientAssigner.h dolfin/function/Constant.cpp dolfin/function/Constant.h dolfin/function/Expression.cpp dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h dolfin/function/GenericFunction.cpp dolfin/function/GenericFunction.h dolfin/function/SpecialFacetFunction.cpp dolfin/function/SpecialFacetFunction.h dolfin/function/SpecialFunctions.cpp dolfin/function/SubSpace.cpp dolfin/function/SubSpace.h dolfin/generation/BoxMesh.cpp dolfin/generation/BoxMesh.h dolfin/generation/CGALMeshBuilder.h dolfin/generation/CSGCGALMeshGenerator2D.cpp dolfin/generation/CSGCGALMeshGenerator3D.cpp dolfin/generation/CSGGeometries3D.cpp dolfin/generation/CSGGeometries3D.h dolfin/generation/CSGGeometry.h dolfin/generation/CSGMeshGenerator.cpp dolfin/generation/CSGMeshGenerator.h dolfin/generation/CSGOperators.cpp dolfin/generation/CSGOperators.h dolfin/generation/CSGPrimitives2D.cpp dolfin/generation/CSGPrimitives2D.h dolfin/generation/CSGPrimitives3D.cpp dolfin/generation/CSGPrimitives3D.h dolfin/generation/GeometryToCGALConverter.cpp dolfin/generation/GeometryToCGALConverter.h dolfin/generation/Interval.h dolfin/generation/IntervalMesh.cpp dolfin/generation/IntervalMesh.h dolfin/generation/PolygonalMeshGenerator.cpp dolfin/generation/PolyhedralMeshGenerator.cpp dolfin/generation/PolyhedralMeshGenerator.h dolfin/generation/PolyhedronUtils.cpp dolfin/generation/RectangleMesh.cpp dolfin/generation/RectangleMesh.h dolfin/generation/Triangulate.cpp dolfin/generation/Triangulate.h dolfin/generation/UnitCircle.h dolfin/generation/UnitCircleMesh.cpp dolfin/generation/UnitCircleMesh.h dolfin/generation/UnitCube.h dolfin/generation/UnitCubeMesh.cpp dolfin/generation/UnitCubeMesh.h dolfin/generation/UnitInterval.h dolfin/generation/UnitIntervalMesh.cpp dolfin/generation/UnitIntervalMesh.h dolfin/generation/UnitSquare.h dolfin/generation/UnitSquareMesh.cpp dolfin/generation/UnitSquareMesh.h dolfin/generation/cgal_csg3d.h dolfin/generation/self_intersect.h dolfin/graph/GraphBuilder.cpp dolfin/graph/GraphBuilder.h dolfin/intersection/IntersectionOperator.h dolfin/io/BinaryFile.cpp dolfin/io/BinaryFile.h dolfin/io/Encoder.h dolfin/io/GenericFile.cpp dolfin/io/GenericFile.h dolfin/io/HDF5File.cpp dolfin/io/HDF5File.h dolfin/io/HDF5Interface.cpp dolfin/io/HDF5Interface.h dolfin/io/RAWFile.cpp dolfin/io/SAX2AttributeParser.h dolfin/io/VTKFile.cpp dolfin/io/VTKFile.h dolfin/io/VTKWriter.cpp dolfin/io/VTKWriter.h dolfin/io/XDMFFile.cpp dolfin/io/XDMFFile.h dolfin/io/XMLArray.h dolfin/io/XMLFile.h dolfin/io/XMLFunctionData.cpp dolfin/io/XMLLocalMeshSAX.cpp dolfin/io/XMLLocalMeshSAX.h dolfin/io/XMLMesh.cpp dolfin/io/XMLMeshFunction.h dolfin/io/XMLMeshValueCollection.h dolfin/io/XMLParameters.cpp dolfin/io/XMLVector.cpp dolfin/io/XYZFile.cpp dolfin/la/BlockMatrix.cpp dolfin/la/BlockMatrix.h dolfin/la/BlockVector.cpp dolfin/la/BlockVector.h dolfin/la/CholmodCholeskySolver.cpp dolfin/la/CholmodCholeskySolver.h dolfin/la/CoordinateMatrix.h dolfin/la/DefaultFactory.cpp dolfin/la/DefaultFactory.h dolfin/la/EpetraFactory.cpp dolfin/la/EpetraFactory.h dolfin/la/EpetraKrylovSolver.cpp dolfin/la/EpetraKrylovSolver.h dolfin/la/EpetraLUSolver.cpp dolfin/la/EpetraLUSolver.h dolfin/la/EpetraMatrix.cpp dolfin/la/EpetraMatrix.h dolfin/la/EpetraVector.cpp dolfin/la/GenericLUSolver.h dolfin/la/GenericLinearAlgebraFactory.h dolfin/la/GenericLinearOperator.h dolfin/la/GenericLinearSolver.h dolfin/la/GenericMatrix.cpp dolfin/la/GenericMatrix.h dolfin/la/GenericSparsityPattern.h dolfin/la/GenericTensor.h dolfin/la/GenericVector.h dolfin/la/KrylovSolver.cpp dolfin/la/KrylovSolver.h dolfin/la/LUSolver.cpp dolfin/la/LUSolver.h dolfin/la/LinearOperator.h dolfin/la/LinearSolver.cpp dolfin/la/LinearSolver.h dolfin/la/MUMPSLUSolver.cpp dolfin/la/MUMPSLUSolver.h dolfin/la/Matrix.h dolfin/la/PETScBaseMatrix.cpp dolfin/la/PETScBaseMatrix.h dolfin/la/PETScCuspFactory.cpp dolfin/la/PETScCuspFactory.h dolfin/la/PETScFactory.cpp dolfin/la/PETScFactory.h dolfin/la/PETScKrylovSolver.cpp dolfin/la/PETScKrylovSolver.h dolfin/la/PETScLUSolver.cpp dolfin/la/PETScLUSolver.h dolfin/la/PETScLinearOperator.cpp dolfin/la/PETScLinearOperator.h dolfin/la/PETScMatrix.h dolfin/la/PETScPreconditioner.cpp dolfin/la/PETScVector.cpp dolfin/la/PaStiXLUSolver.cpp dolfin/la/PaStiXLUSolver.h dolfin/la/SLEPcEigenSolver.cpp dolfin/la/SLEPcEigenSolver.h dolfin/la/STLFactory.h dolfin/la/STLFactoryCSC.h dolfin/la/STLMatrix.cpp dolfin/la/STLMatrix.h dolfin/la/Scalar.h dolfin/la/SparsityPattern.cpp dolfin/la/SparsityPattern.h dolfin/la/TensorLayout.cpp dolfin/la/TensorLayout.h dolfin/la/TensorProductMatrix.cpp dolfin/la/TensorProductMatrix.h dolfin/la/TensorProductVector.cpp dolfin/la/TensorProductVector.h dolfin/la/TrilinosPreconditioner.cpp dolfin/la/UmfpackLUSolver.cpp dolfin/la/UmfpackLUSolver.h dolfin/la/solve.cpp dolfin/la/solve.h dolfin/la/uBLASFactory.h dolfin/la/uBLASILUPreconditioner.cpp dolfin/la/uBLASILUPreconditioner.h dolfin/la/uBLASKrylovSolver.cpp dolfin/la/uBLASKrylovSolver.h dolfin/la/uBLASLinearOperator.cpp dolfin/la/uBLASLinearOperator.h dolfin/la/uBLASMatrix.h dolfin/log/LogStream.cpp dolfin/log/LogStream.h dolfin/log/Logger.cpp dolfin/log/Logger.h dolfin/log/Progress.h dolfin/log/Table.cpp dolfin/log/Table.h dolfin/math/Legendre.cpp dolfin/math/Legendre.h dolfin/math/basic.cpp dolfin/math/basic.h dolfin/mesh/BoundaryComputation.cpp dolfin/mesh/Cell.h dolfin/mesh/CellType.cpp dolfin/mesh/CellType.h dolfin/mesh/DynamicMeshEditor.cpp dolfin/mesh/DynamicMeshEditor.h dolfin/mesh/Edge.cpp dolfin/mesh/Edge.h dolfin/mesh/Face.cpp dolfin/mesh/Face.h dolfin/mesh/Facet.cpp dolfin/mesh/Facet.h dolfin/mesh/FacetCell.cpp dolfin/mesh/IntervalCell.cpp dolfin/mesh/IntervalCell.h dolfin/mesh/LocalMeshData.cpp dolfin/mesh/LocalMeshData.h dolfin/mesh/LocalMeshValueCollection.h dolfin/mesh/Mesh.cpp dolfin/mesh/Mesh.h dolfin/mesh/MeshConnectivity.cpp dolfin/mesh/MeshConnectivity.h dolfin/mesh/MeshData.cpp dolfin/mesh/MeshData.h dolfin/mesh/MeshDistributed.cpp dolfin/mesh/MeshDistributed.h dolfin/mesh/MeshDomains.cpp dolfin/mesh/MeshDomains.h dolfin/mesh/MeshEditor.cpp dolfin/mesh/MeshEditor.h dolfin/mesh/MeshEntity.cpp dolfin/mesh/MeshEntity.h dolfin/mesh/MeshEntityIterator.h dolfin/mesh/MeshEntityIteratorBase.h dolfin/mesh/MeshFunction.cpp dolfin/mesh/MeshFunction.h dolfin/mesh/MeshGeometry.cpp dolfin/mesh/MeshGeometry.h dolfin/mesh/MeshPartitioning.cpp dolfin/mesh/MeshPartitioning.h dolfin/mesh/MeshRenumbering.cpp dolfin/mesh/MeshRenumbering.h dolfin/mesh/MeshSmoothing.cpp dolfin/mesh/MeshSmoothing.h dolfin/mesh/MeshTopology.cpp dolfin/mesh/MeshTopology.h dolfin/mesh/MeshTransformation.cpp dolfin/mesh/MeshTransformation.h dolfin/mesh/MeshValueCollection.h dolfin/mesh/Point.h dolfin/mesh/PointCell.cpp dolfin/mesh/PointCell.h dolfin/mesh/Restriction.cpp dolfin/mesh/Restriction.h dolfin/mesh/SubDomain.cpp dolfin/mesh/SubDomain.h dolfin/mesh/TetrahedronCell.cpp dolfin/mesh/TetrahedronCell.h dolfin/mesh/TopologyComputation.cpp dolfin/mesh/TopologyComputation.h dolfin/mesh/TriangleCell.cpp dolfin/mesh/TriangleCell.h dolfin/mesh/Vertex.h dolfin/nls/NewtonSolver.cpp dolfin/nls/NewtonSolver.h dolfin/nls/PETScSNESSolver.cpp dolfin/nls/PETScSNESSolver.h dolfin/parameter/GlobalParameters.cpp dolfin/parameter/Parameter.cpp dolfin/parameter/Parameter.h dolfin/parameter/Parameters.cpp dolfin/parameter/Parameters.h dolfin/plot/GenericVTKPlottable.h dolfin/plot/VTKPlottableGenericFunction.cpp dolfin/plot/VTKPlottableGenericFunction.h dolfin/plot/VTKPlottableMesh.cpp dolfin/plot/VTKPlottableMesh.h dolfin/plot/VTKPlottableMeshFunction.cpp dolfin/plot/VTKPlotter.cpp dolfin/plot/VTKPlotter.h dolfin/plot/VTKWindowOutputStage.cpp dolfin/plot/VTKWindowOutputStage.h dolfin/quadrature/BarycenterQuadrature.h dolfin/refinement/BisectionRefinement.cpp dolfin/refinement/LocalMeshRefinement.cpp dolfin/refinement/RivaraRefinement.cpp dolfin/refinement/RivaraRefinement.h dolfin/swig/common/post.i dolfin/swig/fem/post.i dolfin/swig/fem/pre.i dolfin/swig/io/pre.i dolfin/swig/log/pre.i dolfin/swig/mesh/pre.i dolfin/swig/parameter/pre.i dolfin/swig/typemaps/numpy.i dolfin/swig/typemaps/std_vector.i site-packages/dolfin/functions/functionspace.py site-packages/dolfin_utils/wrappers/form.py site-packages/dolfin_utils/wrappers/goalfunctional.py test/unit/function/cpp/Projection.h test/unit/intersection/cpp/IntersectionOperator.cpp test/unit/io/cpp/XMLMeshValueCollection.cpp test/unit/la/cpp/LinearOperator.cpp test/unit/la/cpp/forms/ReactionDiffusion.h test/unit/la/cpp/forms/ReactionDiffusionAction.h test/unit/mesh/cpp/MeshValueCollection.cpp test/unit/parameter/cpp/Parameters.cpp test/unit/quadrature/cpp/BaryCenter.cpp The size of the diff (138023 lines) is larger than your specified limit of 500 lines -- lp:dolfin https://code.launchpad.net/~dolfin-core/dolfin/trunk Your team DOLFIN Core Team is subscribed to branch lp:dolfin. To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/trunk/+edit-subscription -- Garth N. Wells Department of Engineering, University of Cambridge http://www.eng.cam.ac.uk/~gnw20 _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : dolfin@lists.launchpad.net Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
