[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7464:2e5be7b316d8 tag: tip parent: 7462:08271b9e6527 parent: 7463:611336fe5b27 user:Garth N. Wells gn...@cam.ac.uk date:Mon Nov 16 21:29:51 2009 + description: merge. changeset: 7463:611336fe5b27 parent: 7459:739b7539d6eb user:Garth N. Wells gn...@cam.ac.uk date:Mon Nov 16 21:29:17 2009 + files: demo/function/eval/python/demo.py dolfin/swig/std_vector_typemaps.i description: Smal tidy up. changeset: 7462:08271b9e6527 user:Anders Logg l...@simula.no date:Mon Nov 16 22:24:58 2009 +0100 files: site-packages/dolfin/norm.py description: Allow upper or lowercase when specifying norm type in norm(). -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7441:a80d21459db0 tag: tip parent: 7440:f6935b64eb40 parent: 7439:cd6e4b6b38a9 user:Anders Logg l...@simula.no date:Thu Nov 12 11:18:57 2009 +0100 files: demo/pde/adaptive-poisson/cpp/README demo/pde/adaptive-poisson/python/demo.py description: merge changeset: 7440:f6935b64eb40 parent: 7431:9edad639d7e7 user:Anders Logg l...@simula.no date:Thu Nov 12 11:18:53 2009 +0100 files: dolfin/adaptivity/AdaptiveObjects.cpp dolfin/fem/BoundaryCondition.h dolfin/fem/DirichletBC.h sandbox/misc/cpp/SConstruct sandbox/misc/cpp/main.cpp description: Implement refinement of boundary conditions (untested). changeset: 7439:cd6e4b6b38a9 user:Johannes Ring joha...@simula.no date:Thu Nov 12 09:08:13 2009 +0100 files: scons/simula-scons/simula_scons/pkgconfiggenerators/cholmod.py description: Try to fix problems with CHOLMOD pkg-config generator (add -lamd -lcamd -lcolamd -lccolamd to libs, still problems to detect if METIS is needed). -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Sat, Nov 07, 2009 at 10:13:25AM +0100, Anders Logg wrote: On Sat, Nov 07, 2009 at 07:38:25AM +, Garth N. Wells wrote: Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 10:46:40PM +, Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. We need to sort out the two constructors DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, Mesh dolfin_mesh); DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, const Mesh dolfin_mesh); on the Python side since I recall that SWIG doesn't distinguish between the two. I can't remember how we did this. Did we just tell SWIG to ignore one of the two? I don't see that we have made any distinction before (grepping for DofMap in the SWIG files). Do you see any problems as a result of the change to the constructors? SWIG warning messages that one hides the other. Has anyone tried fixing this? I had a quick go but didn't succeed. Not yet. But I will have a look. Should be fixed now. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Sat, Nov 07, 2009 at 07:38:25AM +, Garth N. Wells wrote: Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 10:46:40PM +, Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. We need to sort out the two constructors DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, Mesh dolfin_mesh); DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, const Mesh dolfin_mesh); on the Python side since I recall that SWIG doesn't distinguish between the two. I can't remember how we did this. Did we just tell SWIG to ignore one of the two? I don't see that we have made any distinction before (grepping for DofMap in the SWIG files). Do you see any problems as a result of the change to the constructors? SWIG warning messages that one hides the other. Has anyone tried fixing this? I had a quick go but didn't succeed. Not yet. But I will have a look. -- Anders Garth Garth Garth This changeset includes a change to the DOLFIN wrapper code as a result of new signatures for the DofMap constructors. As a result, code generated with -l dolfin must be recompiled. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 10:46:40PM +, Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. We need to sort out the two constructors DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, Mesh dolfin_mesh); DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, const Mesh dolfin_mesh); on the Python side since I recall that SWIG doesn't distinguish between the two. I can't remember how we did this. Did we just tell SWIG to ignore one of the two? I don't see that we have made any distinction before (grepping for DofMap in the SWIG files). Do you see any problems as a result of the change to the constructors? SWIG warning messages that one hides the other. Has anyone tried fixing this? I had a quick go but didn't succeed. Garth Garth -- Anders Garth This changeset includes a change to the DOLFIN wrapper code as a result of new signatures for the DofMap constructors. As a result, code generated with -l dolfin must be recompiled. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7422:dcafd0654a8a tag: tip parent: 7421:45550c2a40bc parent: 7420:14af83c949c5 user:Anders Logg l...@simula.no date:Thu Nov 05 21:31:17 2009 +0100 description: merge changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 files: 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/Poisson2D_1.h bench/fem/convergence/Poisson2D_2.h bench/fem/convergence/Poisson2D_3.h bench/fem/convergence/Poisson2D_4.h bench/fem/convergence/Poisson2D_5.h bench/fem/convergence/Poisson3D_1.h bench/fem/convergence/Poisson3D_2.h bench/fem/convergence/Poisson3D_3.h bench/fem/convergence/Poisson3D_4.h bench/fem/convergence/Poisson3D_5.h bench/fem/speedup/Poisson.h bench/la/sparse-matrix/Poisson.h bench/la/sparse-matrix/VectorPoisson.h demo/fem/assembly/cpp/ReactionDiffusion.h demo/function/eval/cpp/Projection.h demo/function/nonmatching-interpolation/cpp/P1.h demo/function/nonmatching-interpolation/cpp/P3.h demo/function/nonmatching-projection/cpp/P1_projection.h demo/function/nonmatching-projection/cpp/P3.h demo/pde/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/advection-diffusion/cpp/Velocity.h demo/pde/bcs/cpp/Poisson.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/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/dg/advection-diffusion/cpp/Projection.h demo/pde/dg/advection-diffusion/cpp/Velocity.h demo/pde/dg/biharmonic/cpp/Biharmonic.h demo/pde/dg/poisson/cpp/Poisson.h demo/pde/elasticity/cpp/Elasticity.h demo/pde/elastodynamics/cpp/DG0_eps_xx.h demo/pde/elastodynamics/cpp/ElastoDynamics.h demo/pde/equality/cpp/Poisson.h demo/pde/functional/cpp/EnergyNorm.h demo/pde/hyperelasticity/cpp/HyperElasticity.h demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/Pressure.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/mixed-poisson/cpp/P1Projection.h demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h demo/pde/periodic/cpp/Poisson.h demo/pde/poisson/cpp/Poisson.h demo/pde/poisson1D/cpp/Poisson.h demo/pde/simple/cpp/ReactionDiffusion.h demo/pde/stokes/stabilized/cpp/Stokes.h demo/pde/stokes/taylor-hood/cpp/Stokes.h demo/pde/sym-dirichlet-bc/cpp/Poisson.h demo/pde/waveguide/cpp/Forms.h dolfin/adaptivity/Adaptive.cpp dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.cpp dolfin/mf/ffc-forms/ConvectionMatrix2D.h dolfin/mf/ffc-forms/ConvectionMatrix3D.h dolfin/mf/ffc-forms/LoadVector2D.h dolfin/mf/ffc-forms/LoadVector3D.h dolfin/mf/ffc-forms/MassMatrix2D.h dolfin/mf/ffc-forms/MassMatrix3D.h dolfin/mf/ffc-forms/StiffnessMatrix2D.h dolfin/mf/ffc-forms/StiffnessMatrix3D.h sandbox/passembly-bench-vec/PoissonP1.h sandbox/passembly-bench-vec/PoissonP2.h sandbox/passembly/Poisson2DP1.h sandbox/passembly/Poisson2DP2.h sandbox/passembly/Poisson2DP3.h sandbox/passembly/Poisson3DP1.h sandbox/passembly/Poisson3DP2.h sandbox/passembly/Poisson3DP3.h sandbox/pdof_map/Poisson.h site-packages/dolfin_utils/wrappers/functionspace.py test/unit/function/cpp/Projection.h description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. changeset: 7420:14af83c949c5 parent: 7418:ad0b6cadbbeb parent: 7419:b63ce3773a32 user:Anders Logg l...@simula.no date:Thu Nov 05 16:16:21 2009 +0100 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. This changeset includes a change to the DOLFIN wrapper code as a result of new signatures for the DofMap constructors. As a result, code generated with -l dolfin must be recompiled. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. We need to sort out the two constructors DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, Mesh dolfin_mesh); DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, const Mesh dolfin_mesh); on the Python side since I recall that SWIG doesn't distinguish between the two. I can't remember how we did this. Did we just tell SWIG to ignore one of the two? Garth This changeset includes a change to the DOLFIN wrapper code as a result of new signatures for the DofMap constructors. As a result, code generated with -l dolfin must be recompiled. -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev -- Dr Garth N Wells Department of Engineering University of Cambridge Trumpington Street Cambridge CB2 1PZ United Kingdom tel. +44 1223 3 32743 e-mail gn...@cam.ac.uk http://www.eng.cam.ac.uk/~gnw20/ ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Thu, Nov 05, 2009 at 10:46:40PM +, Garth N. Wells wrote: Anders Logg wrote: On Thu, Nov 05, 2009 at 09:31:34PM +0100, DOLFIN wrote: changeset: 7421:45550c2a40bc parent: 7417:be579bc40bf9 user:Anders Logg l...@simula.no date:Thu Nov 05 21:29:09 2009 +0100 description: Remove Mesh member from DofMap class. This will hopefully reduce some headaches related to adaptive refinement of functions and function spaces. At the least, it's a simplification. We need to sort out the two constructors DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, Mesh dolfin_mesh); DofMap(boost::shared_ptrufc::dof_map ufc_dofmap, const Mesh dolfin_mesh); on the Python side since I recall that SWIG doesn't distinguish between the two. I can't remember how we did this. Did we just tell SWIG to ignore one of the two? I don't see that we have made any distinction before (grepping for DofMap in the SWIG files). Do you see any problems as a result of the change to the constructors? SWIG warning messages that one hides the other. Garth -- Anders Garth This changeset includes a change to the DOLFIN wrapper code as a result of new signatures for the DofMap constructors. As a result, code generated with -l dolfin must be recompiled. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7415:e308d1e684ac tag: tip parent: 7414:c1a3ff5966a3 parent: 7413:4a1d877ec9a4 user:Anders Logg l...@simula.no date:Wed Nov 04 11:46:20 2009 +0100 description: merge changeset: 7414:c1a3ff5966a3 parent: 7412:a34b1f81d1d2 user:Anders Logg l...@simula.no date:Wed Nov 04 11:46:13 2009 +0100 files: dolfin/adaptivity/Adaptive.cpp dolfin/adaptivity/Adaptive.h dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/fem/DofMapBuilder.cpp dolfin/fem/DofMapBuilder.h dolfin/fem/FiniteElement.cpp dolfin/fem/FiniteElement.h dolfin/function/Function.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h dolfin/mesh/Mesh.cpp dolfin/mesh/Mesh.h dolfin/scons.cfg description: Initial work on automatic data transfer to refined function spaces and meshes. Untested and in need of more work but I made some edits to DofMap and other classes in the process so I might as well push now. changeset: 7413:4a1d877ec9a4 user:Garth N. Wells gn...@cam.ac.uk date:Wed Nov 04 10:07:45 2009 + files: dolfin/fem/Assembler.cpp dolfin/mesh/Facet.h description: First simple steps towards parallel assembly of interior facets. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7417:be579bc40bf9 tag: tip parent: 7415:e308d1e684ac parent: 7416:7c37a25f2382 user:Garth N. Wells gn...@cam.ac.uk date:Wed Nov 04 10:53:11 2009 + description: merge. changeset: 7416:7c37a25f2382 parent: 7413:4a1d877ec9a4 user:Garth N. Wells gn...@cam.ac.uk date:Wed Nov 04 10:52:55 2009 + files: dolfin/fem/Assembler.cpp dolfin/mesh/BoundaryComputation.cpp dolfin/mesh/BoundaryComputation.h dolfin/mesh/Facet.h description: Let Facet determine whether or not it is an interior facet. changeset: 7415:e308d1e684ac parent: 7414:c1a3ff5966a3 parent: 7413:4a1d877ec9a4 user:Anders Logg l...@simula.no date:Wed Nov 04 11:46:20 2009 +0100 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Sun, Sep 27, 2009 at 09:02:50PM +0200, Johan Hake wrote: On Saturday 26 September 2009 23:19:23 Anders Logg wrote: On Sat, Sep 26, 2009 at 04:16:49PM +0200, Johan Hake wrote: On Saturday 26 September 2009 00:07:46 Anders Logg wrote: On Fri, Sep 25, 2009 at 11:56:03PM +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: 7147:2f99c8fb3a96 tag: tip parent: 7146:1d18d2b95462 parent: 7145:3f905e727c11 user:Anders Logg l...@simula.no date:Fri Sep 25 23:56:04 2009 +0200 description: merge changeset: 7146:1d18d2b95462 parent: 7143:98d357740635 user:Anders Logg l...@simula.no date:Fri Sep 25 23:55:55 2009 +0200 files: dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add update() function to FunctionSpace and DofMap for use in adaptive mesh refinement. I've added a first iteration of a functionality we need to do adaptivity. When a mesh is refined, we can't reassemble the forms since the FunctionSpace does not know the mesh has changed. It is now possible to update the FunctionSpace (actually the DofMap) by calling FunctionSpace::update. Example: from dolfin import * mesh = UnitSquare(3, 3) V = FunctionSpace(mesh, CG, 3) print V.dim() 100 mesh.refine() No cells marked for refinement, assuming uniform mesh refinement. print V.dim() 100 V.update() print V.dim() 361 I'm not sure what the right way to handle this is. Perhaps we should have FunctionSpace::refine which calls refine on the mesh and then calls update. This will then only work for one FunctionSpace. Other FunctionSpaces defined on the same Mesh would not be updated. Would it be possible to store all FunctionSpaces associated with a Mesh in a vectorFunctionSpace* in the Mesh? Then let Mesh::refine iterate over the FunctionSpaces and call the FunctionSpace::update. This could be handle by adding something like: mesh-register(*this); in the constructor of FunctionSpace and mesh-deregister(*this); in the destructor of FunctionSpace. That could be an option. There might be some issues with constness etc and we've made mistakes before when trying to be clever, but we could try... :-) What is the policy of constness for the Mesh class. I see that there exists a const and a non-const constructor in for example the FunctionSpace and DofMap. It is not explicit for me when I construct a FunctionSpace using a const Mesh and when I am not. We would then need to have mesh::refine -- FunctionSpace::update -- DofMap::update -- Function::interpolate etc for all functions So a FunctionSpace would also need to have some functionality for registering Functions. I've implemented this. Everything should be in place but it currently breaks (I haven't put a lot of effort into debugging yet). Garth, take a look and see if it makes sense (FunctionSpace::refine). Perhaps you can spot something. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7368:6eb93c584e5f tag: tip parent: 7367:6e74f7e8f2d3 parent: 7365:613df8d6ac58 user:Anders Logg l...@simula.no date:Mon Oct 12 19:06:27 2009 +0200 description: merge changeset: 7367:6e74f7e8f2d3 parent: 7366:3e276455d175 parent: 7364:c6e899926e68 user:Anders Logg l...@simula.no date:Mon Oct 12 19:06:02 2009 +0200 description: merge changeset: 7366:3e276455d175 parent: 7362:71eee0a885f8 user:Marie E. Rognes (m...@simula.no) date:Mon Oct 12 20:07:27 2009 +0200 files: dolfin/la/SLEPcEigenSolver.cpp dolfin/la/SLEPcEigenSolver.h description: Added specification of spectral transforms to SLEPcEigenSolver -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7359:16dc783f081e tag: tip parent: 7358:75fda48ce832 parent: 7357:497ddf689d37 user:Garth N. Wells gn...@cam.ac.uk date:Sat Oct 10 23:38:01 2009 +0100 description: merge. changeset: 7358:75fda48ce832 parent: 7356:19817cd38161 user:Garth N. Wells gn...@cam.ac.uk date:Sat Oct 10 23:37:26 2009 +0100 files: demo/function/nonmatching-projection/cpp/P1_projection.h demo/function/nonmatching-projection/cpp/P1_projection.ufl demo/function/nonmatching-projection/cpp/P3.h demo/function/nonmatching-projection/cpp/P3.ufl demo/function/nonmatching-projection/cpp/SConstruct demo/function/nonmatching-projection/cpp/main.cpp demo/function/nonmatching-projection/python/demo.py dolfin/io/VTKFile.cpp description: Add L2 projection on non-matching meshes demo. changeset: 7357:497ddf689d37 user:Anders Logg l...@simula.no date:Sun Oct 11 00:22:49 2009 +0200 files: dolfin/function/Data.cpp dolfin/function/Data.h dolfin/function/Expression.cpp dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/GenericFunction.cpp dolfin/function/GenericFunction.h description: Cleanups, formatting fixes and consistency editing in Function classes. Awaiting buildbots and then making a release. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7350:b3bf6573ef66 tag: tip parent: 7349:8cbd4ea96145 parent: 7347:da8f4f79fdef user:Johan Hake h...@simula.no date:Fri Oct 09 12:58:01 2009 +0200 description: merge changeset: 7349:8cbd4ea96145 user:Johan Hake h...@simula.no date:Fri Oct 09 12:57:40 2009 +0200 files: dolfin/swig/la_pre.i dolfin/swig/mesh_post.i dolfin/swig/mesh_pre.i description: Cleanup in SWIG interface files - removed MeshFunction.fill, use set_all instead. changeset: 7348:9649e6706fc4 parent: 7345:77361b46fb4e user:Johan Hake h...@simula.no date:Fri Oct 09 11:28:03 2009 +0200 files: demo/la/eigensolver/python/demo.py dolfin/la/SLEPcEigenSolver.cpp dolfin/la/SLEPcEigenSolver.h dolfin/swig/la_post.i dolfin/swig/la_pre.i description: Fix in SLEPcEigenSolver.get_eigenpair. - Added a check for size of passed PETScVector - Mapped the function to Python so one now can lr, lc, r_vec, c_vec = esolver.get_eigenpair(i) if one want to reuse the return vector use: lr, lc, r_vec, c_vec = esolver.get_eigenpair(i, r_vec, c_vec) -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7353:de91f730b924 tag: tip parent: 7352:67dd72489209 parent: 7351:3dd1c05eaa99 user:Anders Logg l...@simula.no date:Fri Oct 09 13:39:07 2009 +0200 description: merge changeset: 7352:67dd72489209 parent: 7344:3a8cc7b29268 user:Anders Logg l...@simula.no date:Fri Oct 09 13:38:59 2009 +0200 files: dolfin/io/XMLParameters.cpp dolfin/parameter/Parameters.cpp description: Bug fix for input/output for real/double-valued parameters. changeset: 7351:3dd1c05eaa99 user:Johan Hake h...@simula.no date:Fri Oct 09 13:18:00 2009 +0200 files: dolfin/swig/la_post.i site-packages/dolfin/assemble.py description: Fix some regression bugs from latest commit -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7337:bb1225f12876 tag: tip parent: 7336:9014fe39dc76 parent: 7335:8d290e6e40f9 user:Anders Logg l...@simula.no date:Thu Oct 08 20:00:06 2009 +0200 description: merge changeset: 7336:9014fe39dc76 parent: 7334:805a1015ff57 user:Anders Logg l...@simula.no date:Thu Oct 08 19:59:49 2009 +0200 files: dolfin/fem/AssemblerTools.cpp description: Remove try/catch in AssemblerTools and issue error instead (warning did not trigger exception). changeset: 7335:8d290e6e40f9 user:Garth N. Wells gn...@cam.ac.uk date:Thu Oct 08 17:56:54 2009 +0100 files: demo/la/eigensolver/cpp/main.cpp demo/la/eigensolver/python/demo.py description: Compute largest eigenvalues in demo. Much faster. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7307:2258a26ca604 tag: tip parent: 7305:4e59b6754bd4 parent: 7306:be02a17175b9 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 12:21:08 2009 +0100 description: merge. changeset: 7306:be02a17175b9 parent: 7304:492c4bcec3ab user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 12:20:34 2009 +0100 files: dolfin/function/Data.cpp description: Fix small bug in Data::update. changeset: 7305:4e59b6754bd4 user:Johan Hake h...@simula.no date:Wed Oct 07 13:04:19 2009 +0200 files: dolfin/swig/typemaps.i description: Added an out typemap for std::pairuint,bool so the result from NewtonSolver::solve is wrapped to Python -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7312:bb303eab3514 tag: tip parent: 7311:c7395c564dae parent: 7308:1b80ae7f6ea1 user:Johan Hake h...@simula.no date:Wed Oct 07 13:27:53 2009 +0200 description: merge changeset: 7311:c7395c564dae user:Johan Hake h...@simula.no date:Wed Oct 07 13:27:25 2009 +0200 files: test/regression/test.py description: Remove curl-curl from Python demos when running regression tests - it takes ages to finish... changeset: 7310:c6102dabc4eb user:Johan Hake h...@simula.no date:Wed Oct 07 13:26:42 2009 +0200 files: dolfin/swig/ignores.i dolfin/swig/renames.i description: Remove superflouus files -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7315:74965e149aed tag: tip parent: 7313:87dbc0a93da0 parent: 7314:3d8e221b5cc8 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:57:09 2009 +0100 description: merge. changeset: 7314:3d8e221b5cc8 parent: 7307:2258a26ca604 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:56:41 2009 +0100 files: demo/function/nonmatching-interpolation/cpp/P3.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.h description: Temporary fix in Function::eval(double* values, const Data data) const for non-matching meshes. changeset: 7313:87dbc0a93da0 user:Johan Hake h...@simula.no date:Wed Oct 07 14:29:02 2009 +0200 files: dolfin/swig/common_pre.i description: Add a missing file -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7318:258fefefaa0c tag: tip parent: 7317:af71eb42426c parent: 7315:74965e149aed user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 18:35:31 2009 +0100 files: dolfin/swig/ignores.i dolfin/swig/renames.i description: merge. changeset: 7317:af71eb42426c user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 18:35:18 2009 +0100 files: dolfin/swig/common_pre.i description: merge. changeset: 7316:3fe6c017 parent: 7314:3d8e221b5cc8 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 18:33:55 2009 +0100 files: demo/function/nonmatching-interpolation/cpp/P3.h dolfin/function/Data.cpp dolfin/function/Data.h dolfin/function/Expression.cpp dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/GenericFunction.cpp dolfin/function/GenericFunction.h description: Fix Function for interpolating on non-matching meshes. Bit of a hack, but I don't know how to do it better without a change to UFC. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7321:3cc2850b6673 tag: tip parent: 7320:950034f2a2ee parent: 7319:1278d2a6cdb4 user:Johan Hake h...@simula.no date:Wed Oct 07 20:46:58 2009 +0200 description: merge changeset: 7320:950034f2a2ee parent: 7318:258fefefaa0c user:Johan Hake h...@simula.no date:Wed Oct 07 20:45:48 2009 +0200 files: dolfin/swig/directors.i dolfin/swig/docstrings.i dolfin/swig/dolfin.i dolfin/swig/function_post.i dolfin/swig/function_pre.i dolfin/swig/generate.py dolfin/swig/headers.i dolfin/swig/kernel_modules.i dolfin/swig/la_pre.i dolfin/swig/mesh_post.i dolfin/swig/mesh_pre.i dolfin/swig/ode_pre.i description: Fix bug with director typemaps when GMP is disabled. - Moved all director stuff out to the different modules specific interface files - Renamed headers.i to kernel_modules.i changeset: 7319:1278d2a6cdb4 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 19:43:35 2009 +0100 files: dolfin/swig/directors.i description: Disable ODE in Python for now. This is so I can compile the Python interface. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge.
On Wed, Oct 07, 2009 at 05:57:14PM +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: 7315:74965e149aed tag: tip parent: 7313:87dbc0a93da0 parent: 7314:3d8e221b5cc8 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:57:09 2009 +0100 description: merge. changeset: 7314:3d8e221b5cc8 parent: 7307:2258a26ca604 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:56:41 2009 +0100 files: demo/function/nonmatching-interpolation/cpp/P3.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.h description: Temporary fix in Function::eval(double* values, const Data data) const for non-matching meshes. I found a new fix that I think is simpler. It is also consistent with the previous functionality of has_foo in FunctionSpace. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge.
Anders Logg wrote: On Wed, Oct 07, 2009 at 05:57:14PM +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: 7315:74965e149aed tag: tip parent: 7313:87dbc0a93da0 parent: 7314:3d8e221b5cc8 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:57:09 2009 +0100 description: merge. changeset: 7314:3d8e221b5cc8 parent: 7307:2258a26ca604 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:56:41 2009 +0100 files: demo/function/nonmatching-interpolation/cpp/P3.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.h description: Temporary fix in Function::eval(double* values, const Data data) const for non-matching meshes. I found a new fix that I think is simpler. It is also consistent with the previous functionality of has_foo in FunctionSpace. OK. Did you undo the changes that I made? Garth -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge.
On Wed, Oct 07, 2009 at 09:00:54PM +0100, Garth N. Wells wrote: Anders Logg wrote: On Wed, Oct 07, 2009 at 05:57:14PM +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: 7315:74965e149aed tag: tip parent: 7313:87dbc0a93da0 parent: 7314:3d8e221b5cc8 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:57:09 2009 +0100 description: merge. changeset: 7314:3d8e221b5cc8 parent: 7307:2258a26ca604 user:Garth N. Wells gn...@cam.ac.uk date:Wed Oct 07 16:56:41 2009 +0100 files: demo/function/nonmatching-interpolation/cpp/P3.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.h description: Temporary fix in Function::eval(double* values, const Data data) const for non-matching meshes. I found a new fix that I think is simpler. It is also consistent with the previous functionality of has_foo in FunctionSpace. OK. Did you undo the changes that I made? Yes, done now. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7273:8e585111ca80 tag: tip parent: 7272:a253ff3c3fe1 parent: 7271:1d889cf3b5b1 user:Garth N. Wells gn...@cam.ac.uk date:Tue Oct 06 11:09:27 2009 +0100 description: merge. changeset: 7272:a253ff3c3fe1 parent: 7270:2ab66b92be80 user:Garth N. Wells gn...@cam.ac.uk date:Tue Oct 06 11:09:12 2009 +0100 files: dolfin/function/Function.cpp description: Add a gather() call in Function. changeset: 7271:1d889cf3b5b1 user:Garth N. Wells gn...@cam.ac.uk date:Tue Oct 06 10:56:42 2009 +0100 files: SConstruct description: Add extra debug option. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7276:9c11cb5fde78 tag: tip parent: 7275:a165fa7ed868 parent: 7273:8e585111ca80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:47:04 2009 +0200 description: merge changeset: 7275:a165fa7ed868 user:Johan Hake h...@simula.no date:Tue Oct 06 14:46:54 2009 +0200 files: demo/pde/poisson/python/demo.py dolfin/swig/function_pre.i dolfin/swig/std_vector_typemaps.i site-packages/dolfin/__init__.py site-packages/dolfin/constant.py site-packages/dolfin/expression.py site-packages/dolfin/form.py site-packages/dolfin/function.py site-packages/dolfin/variationalproblem.py test/unit/function/python/test.py description: Function in PyDOLFIN is now up and running - Poisson demo works :) - function unittest passes changeset: 7274:4692cbc3104f parent: 7270:2ab66b92be80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:44:11 2009 +0200 files: dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/SystemAssembler.h dolfin/fem/VariationalProblem.cpp dolfin/fem/VariationalProblem.h dolfin/fem/assemble.cpp dolfin/fem/assemble.h description: Changed constness when passing of pointer arguments using std::vector - We now use const std::vectorconst Foo* for all input arguments -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
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: 7276:9c11cb5fde78 tag: tip parent: 7275:a165fa7ed868 parent: 7273:8e585111ca80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:47:04 2009 +0200 description: merge changeset: 7275:a165fa7ed868 user:Johan Hake h...@simula.no date:Tue Oct 06 14:46:54 2009 +0200 files: demo/pde/poisson/python/demo.py dolfin/swig/function_pre.i dolfin/swig/std_vector_typemaps.i site-packages/dolfin/__init__.py site-packages/dolfin/constant.py site-packages/dolfin/expression.py site-packages/dolfin/form.py site-packages/dolfin/function.py site-packages/dolfin/variationalproblem.py test/unit/function/python/test.py description: Function in PyDOLFIN is now up and running - Poisson demo works :) - function unittest passes What would/will we do without you? Garth changeset: 7274:4692cbc3104f parent: 7270:2ab66b92be80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:44:11 2009 +0200 files: dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/SystemAssembler.h dolfin/fem/VariationalProblem.cpp dolfin/fem/VariationalProblem.h dolfin/fem/assemble.cpp dolfin/fem/assemble.h description: Changed constness when passing of pointer arguments using std::vector - We now use const std::vectorconst Foo* for all input arguments -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tuesday 06 October 2009 14:48:22 Garth N. Wells wrote: 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: 7276:9c11cb5fde78 tag: tip parent: 7275:a165fa7ed868 parent: 7273:8e585111ca80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:47:04 2009 +0200 description: merge changeset: 7275:a165fa7ed868 user:Johan Hake h...@simula.no date:Tue Oct 06 14:46:54 2009 +0200 files: demo/pde/poisson/python/demo.py dolfin/swig/function_pre.i dolfin/swig/std_vector_typemaps.i site-packages/dolfin/__init__.py site-packages/dolfin/constant.py site-packages/dolfin/expression.py site-packages/dolfin/form.py site-packages/dolfin/function.py site-packages/dolfin/variationalproblem.py test/unit/function/python/test.py description: Function in PyDOLFIN is now up and running - Poisson demo works :) - function unittest passes What would/will we do without you? :) Johan Garth changeset: 7274:4692cbc3104f parent: 7270:2ab66b92be80 user:Johan Hake h...@simula.no date:Tue Oct 06 14:44:11 2009 +0200 files: dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/SystemAssembler.h dolfin/fem/VariationalProblem.cpp dolfin/fem/VariationalProblem.h dolfin/fem/assemble.cpp dolfin/fem/assemble.h description: Changed constness when passing of pointer arguments using std::vector - We now use const std::vectorconst Foo* for all input arguments -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7282:0a8d0b1cf65e tag: tip parent: 7281:8307074bf218 parent: 7279:40136f15a545 user:Anders Logg l...@simula.no date:Tue Oct 06 17:50:38 2009 +0200 description: merge changeset: 7281:8307074bf218 user:Anders Logg l...@simula.no date:Tue Oct 06 17:50:32 2009 +0200 files: demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/main.cpp site-packages/dolfin_utils/wrappers/form.py description: Fix missing mesh problem for functionals. Mesh must now be given to constructor of functionals. See lift-drag demo for an example. changeset: 7280:cc2964c1e14c parent: 7278:780a3239b833 user:Anders Logg l...@simula.no date:Tue Oct 06 17:37:58 2009 +0200 files: demo/pde/lift-drag/python/demo.py dolfin/fem/Form.cpp dolfin/fem/Form.h description: Add set_mesh function in Form to handle problem with missing mesh for functionals. Still need to update code generation to call this function. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7291:3c0b9887ce08 tag: tip parent: 7290:258349fc53fb parent: 7289:a2f99a1c0df7 user:Anders Logg l...@simula.no date:Tue Oct 06 22:31:03 2009 +0200 description: merge changeset: 7290:258349fc53fb parent: 7285:779104526d8e user:Anders Logg l...@simula.no date:Tue Oct 06 22:30:57 2009 +0200 files: dolfin/common/utils.cpp dolfin/common/utils.h dolfin/fem/FiniteElement.cpp dolfin/fem/FiniteElement.h dolfin/function/Function.cpp dolfin/function/FunctionSpace.cpp description: Bug fix for FunctionSpace::has_element and add hash() functions: 1. has_element compares FiniteElement::hash instead of pointers 2. has_element still compares Mesh pointers 3. Added new dolfin::hash function in utils.h, just calling Boost 4. Added new FiniteElement::hash function, returning precomputed hash (unsigned int) from signature changeset: 7289:a2f99a1c0df7 user:Johan Hake h...@simula.no date:Tue Oct 06 21:31:45 2009 +0200 files: demo/function/nonmatching-interpolation/python/demo.py demo/pde/cahn-hilliard/python/demo.py site-packages/dolfin/norm.py description: Fix for norm in Python. - If taking norm of Expression a mesh need to be passed. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7293:ea7d0b5a6d14 tag: tip parent: 7291:3c0b9887ce08 parent: 7292:23457f2d4905 user:Garth N. Wells gn...@cam.ac.uk date:Tue Oct 06 21:32:48 2009 +0100 description: merge. changeset: 7292:23457f2d4905 parent: 7285:779104526d8e user:Garth N. Wells gn...@cam.ac.uk date:Tue Oct 06 20:35:28 2009 +0100 files: demo/pde/elasticity/cpp/main.cpp demo/pde/elastodynamics/cpp/main.cpp demo/pde/equality/cpp/main.cpp demo/pde/hyperelasticity/cpp/main.cpp demo/pde/stokes/taylor-hood/cpp/main.cpp dolfin/nls/NewtonSolver.cpp dolfin/nls/NewtonSolver.h description: Return std::pairuint, bool from NewtonSolver::solve(..) changeset: 7291:3c0b9887ce08 parent: 7290:258349fc53fb parent: 7289:a2f99a1c0df7 user:Anders Logg l...@simula.no date:Tue Oct 06 22:31:03 2009 +0200 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7261:11556677d685 tag: tip parent: 7260:d7972be9ba63 parent: 7259:e3cd76bb8c22 user:Anders Logg l...@simula.no date:Mon Oct 05 15:51:03 2009 +0200 description: merge changeset: 7260:d7972be9ba63 parent: 7258:46aa2b88bc86 user:Anders Logg l...@simula.no date:Mon Oct 05 15:50:56 2009 +0200 files: dolfin/function/Constant.cpp dolfin/function/Expression.cpp dolfin/function/Expression.h description: Make value_shape protected in Expression. Makes it possible to subclass tensor-valued expressions and set value_shape in the constructor. Difficult otherwise to do it between the ':' and the '{' in the initializer list. changeset: 7259:e3cd76bb8c22 user:Garth N. Wells gn...@cam.ac.uk date:Mon Oct 05 14:47:44 2009 +0100 files: demo/pde/cahn-hilliard/cpp/main.cpp demo/pde/dg/advection-diffusion/cpp/main.cpp demo/pde/dg/poisson/cpp/main.cpp dolfin/function/Function.h dolfin/function/SpecialFunctions.cpp description: Some demo updates. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7264:02a4579fc511 tag: tip parent: 7263:b2d3bb4b06c2 parent: 7262:42896d013e78 user:Garth N. Wells gn...@cam.ac.uk date:Mon Oct 05 16:38:13 2009 +0100 description: merge. changeset: 7263:b2d3bb4b06c2 parent: 7261:11556677d685 user:Garth N. Wells gn...@cam.ac.uk date:Mon Oct 05 16:37:58 2009 +0100 files: demo/pde/advection-diffusion/cpp/main.cpp demo/pde/bcs/cpp/main.cpp demo/pde/curl-curl/cpp/main.cpp demo/pde/dg/biharmonic/cpp/main.cpp demo/pde/elasticity/cpp/main.cpp demo/pde/elastodynamics/cpp/main.cpp demo/pde/equality/cpp/main.cpp demo/pde/hyperelasticity/cpp/main.cpp demo/pde/periodic/cpp/main.cpp demo/pde/poisson1D/cpp/main.cpp demo/pde/simple/cpp/main.cpp demo/pde/stokes/stabilized/cpp/main.cpp demo/pde/stokes/taylor-hood/cpp/main.cpp demo/pde/sym-dirichlet-bc/cpp/main.cpp description: Fix some demos. changeset: 7262:42896d013e78 user:Anders Logg l...@simula.no date:Mon Oct 05 15:54:22 2009 +0200 files: dolfin/function/Constant.cpp dolfin/function/Constant.h dolfin/function/Expression.cpp dolfin/function/Expression.h description: Pass by value in Constant and Expression constructors. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7220:5f9eedc7b683 tag: tip parent: 7218:7a2fa042054d parent: 7219:0ccbd01e617b user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 09:33:14 2009 +0100 description: merge. changeset: 7219:0ccbd01e617b parent: 7216:ac0dca11fdfd user:Garth N. Wells gn...@cam.ac.uk date:Thu Oct 01 20:53:53 2009 +0100 files: dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Remove Scratch from FunctionSpace. changeset: 7218:7a2fa042054d user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 07:55:56 2009 +0100 files: demo/pde/dg/poisson/cpp/Poisson.h demo/pde/dg/poisson/cpp/main.cpp dolfin/fem/UFC.cpp description: Fix bug in UFC.cpp. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7226:43ecb3ff97dd tag: tip parent: 7225:99940e93b793 parent: 7223:2c3c98599b4b user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:01:44 2009 +0100 description: merge. changeset: 7225:99940e93b793 parent: 7224:24d8fdaff279 parent: 7222:8d7cad30178d user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:01:05 2009 +0100 description: merge. changeset: 7224:24d8fdaff279 parent: 7220:5f9eedc7b683 user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:00:52 2009 +0100 files: dolfin/mesh/Cell.cpp dolfin/mesh/Cell.h description: const fix in Cell. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] Merge Function::interpolate functions.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7227:8d6ecb476550 tag: tip user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:55:15 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: Merge Function::interpolate functions. One had a bug which is now removed. changeset: 7226:43ecb3ff97dd parent: 7225:99940e93b793 parent: 7223:2c3c98599b4b user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:01:44 2009 +0100 description: merge. changeset: 7225:99940e93b793 parent: 7224:24d8fdaff279 parent: 7222:8d7cad30178d user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 16:01:05 2009 +0100 description: merge. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7234:87176dd9a549 tag: tip parent: 7232:21b2e0b5e1b2 parent: 7233:b62ea1e92f8a user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 22:04:57 2009 +0100 files: dolfin/function/Function.cpp description: merge. changeset: 7233:b62ea1e92f8a parent: 7229:3caafa2be94c user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 22:04:17 2009 +0100 files: dolfin/function/Function.cpp description: Fix assertion error in Function constructor. changeset: 7232:21b2e0b5e1b2 user:Anders Logg l...@simula.no date:Fri Oct 02 22:55:52 2009 +0200 files: dolfin/function/Function.cpp description: Remove assert(V) in Function constructors. Has no effect since we call FunctionSpace::element before anyway. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7236:5941b467c600 tag: tip parent: 7235:bb9b3006a13b parent: 7234:87176dd9a549 user:Anders Logg l...@simula.no date:Fri Oct 02 23:18:15 2009 +0200 files: dolfin/function/Function.cpp description: merge changeset: 7235:bb9b3006a13b parent: 7232:21b2e0b5e1b2 user:Anders Logg l...@simula.no date:Fri Oct 02 23:16:53 2009 +0200 files: dolfin/function/Function.cpp description: Minor cleanups and fixes in Function.cpp changeset: 7234:87176dd9a549 parent: 7232:21b2e0b5e1b2 parent: 7233:b62ea1e92f8a user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 22:04:57 2009 +0100 files: dolfin/function/Function.cpp description: merge. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7239:e79fe69273f4 tag: tip parent: 7238:044c7ff76ce8 parent: 7237:cb8eb3076efa user:Anders Logg l...@simula.no date:Fri Oct 02 23:42:28 2009 +0200 files: dolfin/function/Function.cpp description: merge changeset: 7238:044c7ff76ce8 parent: 7236:5941b467c600 user:Anders Logg l...@simula.no date:Fri Oct 02 23:42:16 2009 +0200 files: dolfin/function/Function.cpp dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add check in Function::restrict() for element belonging to the same function space. else {} not implemented. changeset: 7237:cb8eb3076efa user:Garth N. Wells gn...@cam.ac.uk date:Fri Oct 02 22:33:50 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: Rename Scratch - GatherScratch. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7211:bc8351fff1bc tag: tip parent: 7210:7338dfeb0767 parent: 7209:684cc19eb88e user:Garth N. Wells gn...@cam.ac.uk date:Thu Oct 01 15:54:47 2009 +0100 files: dolfin/function/UFCFunction.cpp dolfin/function/UFCFunction.h description: merge. changeset: 7210:7338dfeb0767 parent: 7207:4091d99bf41e user:Garth N. Wells gn...@cam.ac.uk date:Thu Oct 01 15:50:24 2009 +0100 files: dolfin/io/VTKFile.cpp dolfin/io/VTKFile.h description: Add support for writing MeshFunctionbool to VTK files. changeset: 7209:684cc19eb88e user:Anders Logg l...@simula.no date:Thu Oct 01 11:53:09 2009 +0200 files: dolfin/fem/UFCCell.h description: Add assertion in UFCCell::update() after fix for GCC 4.4.1 -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Tue, Sep 29, 2009 at 10:37:51PM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Will CoefficientSet come back? I was using it, but I forgot the important reason why. If I do Form* a = new Poisson::BilinearForm(V, V); I can't do a-g g; but I could do Form* a = new Poisson::BilinearForm(V, V, coefficient_set); I can of course use dynamic cast and then attach functions. We could easily add functionality for doing a-set_coefficient(g, g); Would that be enough? That's half the story. The other half is cases with a lot of coefficients (10) and where the bilinear and linear forms have these coefficients in common. CoefficientSet reduces by half the number of lines of code. There is probably a simply approach without much extra code generation but I haven't given it much thought yet. Garth This would be a simple function implemented in the C++ Form class. It's better if we can avoid generating code if something can be implemented directly in the C++ class. -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Johan Hake wrote: On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? We can from the function space. Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Doesn't this defeat the purpose of having 'Expression' (i.e. no function space)? Could we just pass the cell type? Garth Then it would be clear that f is not a function in V, but V is only some additional information about how f should be used in forms. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. Nice! This also removes one of the too many interpolate() functions which is good. Ok. Johan ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wednesday 30 September 2009 09:12:46 Garth N. Wells wrote: Johan Hake wrote: On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? We can from the function space. Yes, but when the user does not pass the space we cannot. Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Doesn't this defeat the purpose of having 'Expression' (i.e. no function space)? Could we just pass the cell type? Not sure the cell type would fit all purposes. When we compile an Expression using the extended syntax where the user define the whole C++ code, we cannot automatically extract the value rank. We also need to pass the ufl.FiniteElement in some way so the ufl.Function can be initialized correctly. This so we can define forms using the newly created Expression (i.e. ufl.Function). This was previously done by using the ufl.element passed by the FunctionSpace. On a side note: Should we consider changing the name of ufl.Function to ufl.Coefficient? I do not think the name is used in UFL now. Johan Garth Then it would be clear that f is not a function in V, but V is only some additional information about how f should be used in forms. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. Nice! This also removes one of the too many interpolate() functions which is good. Ok. Johan ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? Garth -- Anders Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? I guess we could interpolate an Expression in an FE space inside DirichletBC, but this might get a bit expensive for nonlinear problems. Garth Garth -- Anders Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wednesday 30 September 2009 09:58:01 Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? Yes, isn't this natural? It is at least nice to have the possibility to call eval on a Function using interpolating. I suppose it is enough to only provide the simple eval(value,x) function? Johan Garth -- Anders Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Johan Hake wrote: On Wednesday 30 September 2009 09:58:01 Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? Yes, isn't this natural? It is at least nice to have the possibility to call eval on a Function using interpolating. I suppose it is enough to only provide the simple eval(value,x) function? Anders is one step ahead of us - he added the class Coefficient which has: virtual void eval(double* values, const double* x) const; virtual void eval(double* values, const Data data) const; virtual void restrict(double* w, const FiniteElement element, const Cell dolfin_cell, const ufc::cell ufc_cell, int local_facet) const; virtual void evaluate(double* values, const double* coordinates, const ufc::cell cell) const; Garth Johan Garth -- Anders Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wed, Sep 30, 2009 at 09:31:01AM +0200, Johan Hake wrote: On Wednesday 30 September 2009 09:12:46 Garth N. Wells wrote: Johan Hake wrote: On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? We can from the function space. Yes, but when the user does not pass the space we cannot. Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Doesn't this defeat the purpose of having 'Expression' (i.e. no function space)? Could we just pass the cell type? Not sure the cell type would fit all purposes. When we compile an Expression using the extended syntax where the user define the whole C++ code, we cannot automatically extract the value rank. We also need to pass the ufl.FiniteElement in some way so the ufl.Function can be initialized correctly. This so we can define forms using the newly created Expression (i.e. ufl.Function). This was previously done by using the ufl.element passed by the FunctionSpace. What we need is the UFL FiniteElement. This can be extracted from any of the following: 1. The shape and the expression (if we assume piecewise linears) 2. A UFL FiniteElement 3. A FunctionSpace Perhaps we should allow all three? The basic usage would be f = Expression(sin(x[0]), triangle) It might also be possible to leave the shape as undefined and then automatically set the shape during assembly. On a side note: Should we consider changing the name of ufl.Function to ufl.Coefficient? I do not think the name is used in UFL now. Yes, that seems like a good idea. Any objections from Martin? -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wed, Sep 30, 2009 at 08:58:01AM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? We could add eval() to the Coefficient interface. Both Expression and Function already have an eval() function. -- Anders Garth Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wed, Sep 30, 2009 at 08:10:11AM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:37:51PM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Will CoefficientSet come back? I was using it, but I forgot the important reason why. If I do Form* a = new Poisson::BilinearForm(V, V); I can't do a-g g; but I could do Form* a = new Poisson::BilinearForm(V, V, coefficient_set); I can of course use dynamic cast and then attach functions. We could easily add functionality for doing a-set_coefficient(g, g); Would that be enough? That's half the story. The other half is cases with a lot of coefficients (10) and where the bilinear and linear forms have these coefficients in common. CoefficientSet reduces by half the number of lines of code. There is probably a simply approach without much extra code generation but I haven't given it much thought yet. It should not be much work to reimplement CoefficientSet directly in DOLFIN (without any need for generating the code for it). I'll put in on the stack. -- Anders Garth This would be a simple function implemented in the C++ Form class. It's better if we can avoid generating code if something can be implemented directly in the C++ class. ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wed, Sep 30, 2009 at 11:23:21AM +0200, Anders Logg wrote: On Wed, Sep 30, 2009 at 08:58:01AM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. Any thoughts on how to deal with Dirichlet bcs? Constant works because it is a subclass of Function. Do we need a common base class for Function and Expression which has an eval function? We could add eval() to the Coefficient interface. Both Expression and Function already have an eval() function. Stupid comment. This is already there. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wednesday 30 September 2009 11:22:14 Anders Logg wrote: On Wed, Sep 30, 2009 at 09:31:01AM +0200, Johan Hake wrote: On Wednesday 30 September 2009 09:12:46 Garth N. Wells wrote: Johan Hake wrote: On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? We can from the function space. Yes, but when the user does not pass the space we cannot. Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Doesn't this defeat the purpose of having 'Expression' (i.e. no function space)? Could we just pass the cell type? Not sure the cell type would fit all purposes. When we compile an Expression using the extended syntax where the user define the whole C++ code, we cannot automatically extract the value rank. We also need to pass the ufl.FiniteElement in some way so the ufl.Function can be initialized correctly. This so we can define forms using the newly created Expression (i.e. ufl.Function). This was previously done by using the ufl.element passed by the FunctionSpace. What we need is the UFL FiniteElement. This can be extracted from any of the following: 1. The shape and the expression (if we assume piecewise linears) 2. A UFL FiniteElement 3. A FunctionSpace I think the 2. and 3. is enough. The first might just confuse the user. Passing one an element or functionspace as a kwarg might ease any confusion about not being a finite element function. I have started on the Python side but nothing is near to finish. I will keep on working on this, but not until after the weekend. Sorry for that, but real life interfere. In the meantime I see that the special functions (or should we call them special expressions now?) also need some care. Johan Perhaps we should allow all three? The basic usage would be f = Expression(sin(x[0]), triangle) It might also be possible to leave the shape as undefined and then automatically set the shape during assembly. On a side note: Should we consider changing the name of ufl.Function to
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7196:6c29bb702d76 tag: tip parent: 7191:d2c68d6f1512 parent: 7195:e5867523e21a user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:47:03 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: merge. changeset: 7195:e5867523e21a user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:43:50 2009 +0100 files: dolfin/fem/VariationalProblem.cpp dolfin/function/Function.cpp dolfin/function/Function.h description: Remove Function::has_function_space(). changeset: 7194:212b08c1d6f3 user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:37:56 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: Remove Function::Function(). A source of much evil. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7198:81457d2576ff tag: tip parent: 7197:79b59ccfbfd3 parent: 7196:6c29bb702d76 user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:50:25 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: merge changeset: 7197:79b59ccfbfd3 parent: 7195:e5867523e21a user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:50:09 2009 +0100 files: demo/pde/poisson/cpp/main.cpp dolfin/function/Function.cpp dolfin/function/Function.h description: Some small fixed in Function and get Poisson working. changeset: 7196:6c29bb702d76 parent: 7191:d2c68d6f1512 parent: 7195:e5867523e21a user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 30 18:47:03 2009 +0100 files: dolfin/function/Function.cpp dolfin/function/Function.h description: merge. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Wed, Sep 30, 2009 at 03:55:22PM +0200, Johan Hake wrote: On Wednesday 30 September 2009 11:22:14 Anders Logg wrote: On Wed, Sep 30, 2009 at 09:31:01AM +0200, Johan Hake wrote: On Wednesday 30 September 2009 09:12:46 Garth N. Wells wrote: Johan Hake wrote: On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? We can from the function space. Yes, but when the user does not pass the space we cannot. Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Doesn't this defeat the purpose of having 'Expression' (i.e. no function space)? Could we just pass the cell type? Not sure the cell type would fit all purposes. When we compile an Expression using the extended syntax where the user define the whole C++ code, we cannot automatically extract the value rank. We also need to pass the ufl.FiniteElement in some way so the ufl.Function can be initialized correctly. This so we can define forms using the newly created Expression (i.e. ufl.Function). This was previously done by using the ufl.element passed by the FunctionSpace. What we need is the UFL FiniteElement. This can be extracted from any of the following: 1. The shape and the expression (if we assume piecewise linears) 2. A UFL FiniteElement 3. A FunctionSpace I think the 2. and 3. is enough. The first might just confuse the user. Passing one an element or functionspace as a kwarg might ease any confusion about not being a finite element function. Agree. I have started on the Python side but nothing is near to finish. I will keep on working on this, but not until after the weekend. Sorry for that, but real life interfere. ok. In the meantime I see that the special functions (or should we call them special expressions now?) also need some care. Looks like Garth has fixed this. -- Anders Johan Perhaps we should allow all three? The basic usage would be f =
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7176:6572fe2cde36 tag: tip parent: 7175:1cbf255997db parent: 7173:fd4071fe9460 user:Anders Logg l...@simula.no date:Tue Sep 29 21:45:40 2009 +0200 files: demo/mesh/built-in/cpp/README dolfin/fem/SystemAssembler.cpp description: merge changeset: 7175:1cbf255997db user:Anders Logg l...@simula.no date:Tue Sep 29 21:42:24 2009 +0200 files: dolfin/function/Coefficient.cpp description: Remove Coefficient.cpp, no longer needed changeset: 7174:48ed697d94eb parent: 7170:2d5fadf5b282 user:Anders Logg l...@simula.no date:Tue Sep 29 21:41:14 2009 +0200 files: 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/Poisson2D_1.h bench/fem/convergence/Poisson2D_2.h bench/fem/convergence/Poisson2D_3.h bench/fem/convergence/Poisson2D_4.h bench/fem/convergence/Poisson2D_5.h bench/fem/convergence/Poisson3D_1.h bench/fem/convergence/Poisson3D_2.h bench/fem/convergence/Poisson3D_3.h bench/fem/convergence/Poisson3D_4.h bench/fem/convergence/Poisson3D_5.h bench/fem/speedup/Poisson.h bench/la/sparse-matrix/Poisson.h bench/la/sparse-matrix/VectorPoisson.h demo/fem/assembly/cpp/ReactionDiffusion.h demo/function/eval/cpp/Projection.h demo/function/nonmatching-interpolation/cpp/P1.h demo/function/nonmatching-interpolation/cpp/P3.h demo/pde/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/advection-diffusion/cpp/Velocity.h demo/pde/bcs/cpp/Poisson.h demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h demo/pde/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/dg/advection-diffusion/cpp/Projection.h demo/pde/dg/advection-diffusion/cpp/Velocity.h demo/pde/dg/biharmonic/cpp/Biharmonic.h demo/pde/dg/poisson/cpp/Poisson.h demo/pde/elasticity/cpp/Elasticity.h demo/pde/elastodynamics/cpp/DG0_eps_xx.h demo/pde/elastodynamics/cpp/ElastoDynamics.h demo/pde/equality/cpp/Poisson.h demo/pde/functional/cpp/EnergyNorm.h demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/Pressure.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/mixed-poisson/cpp/P1Projection.h demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h demo/pde/periodic/cpp/Poisson.h demo/pde/poisson/cpp/Poisson.h demo/pde/poisson/cpp/main.cpp demo/pde/poisson1D/cpp/Poisson.h demo/pde/simple/cpp/ReactionDiffusion.h demo/pde/stokes/stabilized/cpp/Stokes.h demo/pde/stokes/taylor-hood/cpp/Stokes.h demo/pde/sym-dirichlet-bc/cpp/Poisson.h demo/pde/waveguide/cpp/Forms.h dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/fem/Assembler.cpp dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/UFC.cpp dolfin/fem/UFC.h dolfin/function/Coefficient.h dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/NewCoefficient.h dolfin/function/dolfin_function.h dolfin/mf/ffc-forms/ConvectionMatrix2D.h dolfin/mf/ffc-forms/ConvectionMatrix3D.h dolfin/mf/ffc-forms/LoadVector2D.h dolfin/mf/ffc-forms/LoadVector3D.h dolfin/mf/ffc-forms/MassMatrix2D.h dolfin/mf/ffc-forms/MassMatrix3D.h dolfin/mf/ffc-forms/StiffnessMatrix2D.h dolfin/mf/ffc-forms/StiffnessMatrix3D.h sandbox/passembly-bench-vec/PoissonP1.h sandbox/passembly-bench-vec/PoissonP2.h sandbox/passembly/Poisson2DP1.h sandbox/passembly/Poisson2DP2.h sandbox/passembly/Poisson2DP3.h sandbox/passembly/Poisson3DP1.h sandbox/passembly/Poisson3DP2.h sandbox/passembly/Poisson3DP3.h sandbox/pdof_map/Poisson.h site-packages/dolfin_utils/wrappers/coefficient.py site-packages/dolfin_utils/wrappers/coefficient_set.py site-packages/dolfin_utils/wrappers/form.py site-packages/dolfin_utils/wrappers/functionspace.py site-packages/dolfin_utils/wrappers/wrappers.py test/unit/function/cpp/Projection.h description: BIG changes to Function interface. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
I'm looking forward to seeing the new code. Is all the old functionality still in place? Garth 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: 7176:6572fe2cde36 tag: tip parent: 7175:1cbf255997db parent: 7173:fd4071fe9460 user:Anders Logg l...@simula.no date:Tue Sep 29 21:45:40 2009 +0200 files: demo/mesh/built-in/cpp/README dolfin/fem/SystemAssembler.cpp description: merge changeset: 7175:1cbf255997db user:Anders Logg l...@simula.no date:Tue Sep 29 21:42:24 2009 +0200 files: dolfin/function/Coefficient.cpp description: Remove Coefficient.cpp, no longer needed changeset: 7174:48ed697d94eb parent: 7170:2d5fadf5b282 user:Anders Logg l...@simula.no date:Tue Sep 29 21:41:14 2009 +0200 files: 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/Poisson2D_1.h bench/fem/convergence/Poisson2D_2.h bench/fem/convergence/Poisson2D_3.h bench/fem/convergence/Poisson2D_4.h bench/fem/convergence/Poisson2D_5.h bench/fem/convergence/Poisson3D_1.h bench/fem/convergence/Poisson3D_2.h bench/fem/convergence/Poisson3D_3.h bench/fem/convergence/Poisson3D_4.h bench/fem/convergence/Poisson3D_5.h bench/fem/speedup/Poisson.h bench/la/sparse-matrix/Poisson.h bench/la/sparse-matrix/VectorPoisson.h demo/fem/assembly/cpp/ReactionDiffusion.h demo/function/eval/cpp/Projection.h demo/function/nonmatching-interpolation/cpp/P1.h demo/function/nonmatching-interpolation/cpp/P3.h demo/pde/advection-diffusion/cpp/Ad vectionDiffusion.h demo/pde/advection-diffusion/cpp/Velocity.h demo/pde/bcs/cpp/Poisson.h demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h demo/pde/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/dg/advection-diffusion/cpp/Projection.h demo/pde/dg/advection-diffusion/cpp/Velocity.h demo/pde/dg/biharmonic/cpp/Biharmonic.h demo/pde/dg/poisson/cpp/Poisson.h demo/pde/elasticity/cpp/Elasticity.h demo/pde/elastodynamics/cpp/DG0_eps_xx.h demo/pde/elastodynamics/cpp/ElastoDynamics.h demo/pde/equality/cpp/Poisson.h demo/pde/functional/cpp/EnergyNorm.h demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/Pressure.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/mixed-poisson/cpp/P1Projection.h demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h demo/pde/periodic/cpp/Poisson.h demo/pde/poisson/cpp/Poisson.h demo/pde/poisson/cpp/mai n.cpp demo/pde/poisson1D/cpp/Poisson.h demo/pde/simple/cpp/ReactionDiffusion.h demo/pde/stokes/stabilized/cpp/Stokes.h demo/pde/stokes/taylor-hood/cpp/Stokes.h demo/pde/sym-dirichlet-bc/cpp/Poisson.h demo/pde/waveguide/cpp/Forms.h dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/fem/Assembler.cpp dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/UFC.cpp dolfin/fem/UFC.h dolfin/function/Coefficient.h dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/NewCoefficient.h dolfin/function/dolfin_function.h dolfin/mf/ffc-forms/ConvectionMatrix2D.h dolfin/mf/ffc-forms/ConvectionMatrix3D.h dolfin/mf/ffc-forms/LoadVector2D.h dolfin/mf/ffc-forms/LoadVector3D.h dolfin/mf/ffc-forms/MassMatrix2D.h dolfin/mf/ffc-forms/MassMatrix3D.h dolfin/mf/ffc-forms/StiffnessMatrix2D.h dolfin/mf/ffc-forms/StiffnessMatrix3D.h sandbox/passembly-bench-vec/PoissonP1.h sandbox/passembly-bench-vec/PoissonP 2.h sandbox/passembly/Poisson2DP1.h sandbox/passembly/Poisson2DP2.h sandbox/passembly/Poisson2DP3.h sandbox/passembly/Poisson3DP1.h sandbox/passembly/Poisson3DP2.h sandbox/passembly/Poisson3DP3.h sandbox/pdof_map/Poisson.h site-packages/dolfin_utils/wrappers/coefficient.py site-packages/dolfin_utils/wrappers/coefficient_set.py site-packages/dolfin_utils/wrappers/form.py site-packages/dolfin_utils/wrappers/functionspace.py site-packages/dolfin_utils/wrappers/wrappers.py test/unit/function/cpp/Projection.h description: BIG changes to Function interface. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Did you forget to add CoefficientAssigner.h? Garth 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: 7176:6572fe2cde36 tag: tip parent: 7175:1cbf255997db parent: 7173:fd4071fe9460 user:Anders Logg l...@simula.no date:Tue Sep 29 21:45:40 2009 +0200 files: demo/mesh/built-in/cpp/README dolfin/fem/SystemAssembler.cpp description: merge changeset: 7175:1cbf255997db user:Anders Logg l...@simula.no date:Tue Sep 29 21:42:24 2009 +0200 files: dolfin/function/Coefficient.cpp description: Remove Coefficient.cpp, no longer needed changeset: 7174:48ed697d94eb parent: 7170:2d5fadf5b282 user:Anders Logg l...@simula.no date:Tue Sep 29 21:41:14 2009 +0200 files: 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/Poisson2D_1.h bench/fem/convergence/Poisson2D_2.h bench/fem/convergence/Poisson2D_3.h bench/fem/convergence/Poisson2D_4.h bench/fem/convergence/Poisson2D_5.h bench/fem/convergence/Poisson3D_1.h bench/fem/convergence/Poisson3D_2.h bench/fem/convergence/Poisson3D_3.h bench/fem/convergence/Poisson3D_4.h bench/fem/convergence/Poisson3D_5.h bench/fem/speedup/Poisson.h bench/la/sparse-matrix/Poisson.h bench/la/sparse-matrix/VectorPoisson.h demo/fem/assembly/cpp/ReactionDiffusion.h demo/function/eval/cpp/Projection.h demo/function/nonmatching-interpolation/cpp/P1.h demo/function/nonmatching-interpolation/cpp/P3.h demo/pde/advection-diffusion/cpp/Ad vectionDiffusion.h demo/pde/advection-diffusion/cpp/Velocity.h demo/pde/bcs/cpp/Poisson.h demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h demo/pde/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/dg/advection-diffusion/cpp/Projection.h demo/pde/dg/advection-diffusion/cpp/Velocity.h demo/pde/dg/biharmonic/cpp/Biharmonic.h demo/pde/dg/poisson/cpp/Poisson.h demo/pde/elasticity/cpp/Elasticity.h demo/pde/elastodynamics/cpp/DG0_eps_xx.h demo/pde/elastodynamics/cpp/ElastoDynamics.h demo/pde/equality/cpp/Poisson.h demo/pde/functional/cpp/EnergyNorm.h demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/Pressure.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/mixed-poisson/cpp/P1Projection.h demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h demo/pde/periodic/cpp/Poisson.h demo/pde/poisson/cpp/Poisson.h demo/pde/poisson/cpp/mai n.cpp demo/pde/poisson1D/cpp/Poisson.h demo/pde/simple/cpp/ReactionDiffusion.h demo/pde/stokes/stabilized/cpp/Stokes.h demo/pde/stokes/taylor-hood/cpp/Stokes.h demo/pde/sym-dirichlet-bc/cpp/Poisson.h demo/pde/waveguide/cpp/Forms.h dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/fem/Assembler.cpp dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/UFC.cpp dolfin/fem/UFC.h dolfin/function/Coefficient.h dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/NewCoefficient.h dolfin/function/dolfin_function.h dolfin/mf/ffc-forms/ConvectionMatrix2D.h dolfin/mf/ffc-forms/ConvectionMatrix3D.h dolfin/mf/ffc-forms/LoadVector2D.h dolfin/mf/ffc-forms/LoadVector3D.h dolfin/mf/ffc-forms/MassMatrix2D.h dolfin/mf/ffc-forms/MassMatrix3D.h dolfin/mf/ffc-forms/StiffnessMatrix2D.h dolfin/mf/ffc-forms/StiffnessMatrix3D.h sandbox/passembly-bench-vec/PoissonP1.h sandbox/passembly-bench-vec/PoissonP 2.h sandbox/passembly/Poisson2DP1.h sandbox/passembly/Poisson2DP2.h sandbox/passembly/Poisson2DP3.h sandbox/passembly/Poisson3DP1.h sandbox/passembly/Poisson3DP2.h sandbox/passembly/Poisson3DP3.h sandbox/pdof_map/Poisson.h site-packages/dolfin_utils/wrappers/coefficient.py site-packages/dolfin_utils/wrappers/coefficient_set.py site-packages/dolfin_utils/wrappers/form.py site-packages/dolfin_utils/wrappers/functionspace.py site-packages/dolfin_utils/wrappers/wrappers.py test/unit/function/cpp/Projection.h description: BIG changes to Function interface. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Yes, fixed now. -- Anders On Tue, Sep 29, 2009 at 09:01:57PM +0100, Garth N. Wells wrote: Did you forget to add CoefficientAssigner.h? Garth 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: 7176:6572fe2cde36 tag: tip parent: 7175:1cbf255997db parent: 7173:fd4071fe9460 user:Anders Logg l...@simula.no date:Tue Sep 29 21:45:40 2009 +0200 files: demo/mesh/built-in/cpp/README dolfin/fem/SystemAssembler.cpp description: merge changeset: 7175:1cbf255997db user:Anders Logg l...@simula.no date:Tue Sep 29 21:42:24 2009 +0200 files: dolfin/function/Coefficient.cpp description: Remove Coefficient.cpp, no longer needed changeset: 7174:48ed697d94eb parent: 7170:2d5fadf5b282 user:Anders Logg l...@simula.no date:Tue Sep 29 21:41:14 2009 +0200 files: 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/Poisson2D_1.h bench/fem/convergence/Poisson2D_2.h bench/fem/convergence/Poisson2D_3.h bench/fem/convergence/Poisson2D_4.h bench/fem/convergence/Poisson2D_5.h bench/fem/convergence/Poisson3D_1.h bench/fem/convergence/Poisson3D_2.h bench/fem/convergence/Poisson3D_3.h bench/fem/convergence/Poisson3D_4.h bench/fem/convergence/Poisson3D_5.h bench/fem/speedup/Poisson.h bench/la/sparse-matrix/Poisson.h bench/la/sparse-matrix/VectorPoisson.h demo/fem/assembly/cpp/ReactionDiffusion.h demo/function/eval/cpp/Projection.h demo/function/nonmatching-interpolation/cpp/P1.h demo/function/nonmatching-interpolation/cpp/P3.h demo/pde/advection-diffusion/cpp/Ad vectionDiffusion.h demo/pde/advection-diffusion/cpp/Velocity.h demo/pde/bcs/cpp/Poisson.h demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h demo/pde/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h demo/pde/dg/advection-diffusion/cpp/Projection.h demo/pde/dg/advection-diffusion/cpp/Velocity.h demo/pde/dg/biharmonic/cpp/Biharmonic.h demo/pde/dg/poisson/cpp/Poisson.h demo/pde/elasticity/cpp/Elasticity.h demo/pde/elastodynamics/cpp/DG0_eps_xx.h demo/pde/elastodynamics/cpp/ElastoDynamics.h demo/pde/equality/cpp/Poisson.h demo/pde/functional/cpp/EnergyNorm.h demo/pde/lift-drag/cpp/Drag.h demo/pde/lift-drag/cpp/Lift.h demo/pde/lift-drag/cpp/Pressure.h demo/pde/mixed-poisson/cpp/MixedPoisson.h demo/pde/mixed-poisson/cpp/P1Projection.h demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h demo/pde/periodic/cpp/Poisson.h demo/pde/poisson/cpp/Poisson.h demo/pde/poisson/cpp/mai n.cpp demo/pde/poisson1D/cpp/Poisson.h demo/pde/simple/cpp/ReactionDiffusion.h demo/pde/stokes/stabilized/cpp/Stokes.h demo/pde/stokes/taylor-hood/cpp/Stokes.h demo/pde/sym-dirichlet-bc/cpp/Poisson.h demo/pde/waveguide/cpp/Forms.h dolfin/ale/Poisson1D.h dolfin/ale/Poisson2D.h dolfin/ale/Poisson3D.h dolfin/fem/Assembler.cpp dolfin/fem/Form.cpp dolfin/fem/Form.h dolfin/fem/SystemAssembler.cpp dolfin/fem/UFC.cpp dolfin/fem/UFC.h dolfin/function/Coefficient.h dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/NewCoefficient.h dolfin/function/dolfin_function.h dolfin/mf/ffc-forms/ConvectionMatrix2D.h dolfin/mf/ffc-forms/ConvectionMatrix3D.h dolfin/mf/ffc-forms/LoadVector2D.h dolfin/mf/ffc-forms/LoadVector3D.h dolfin/mf/ffc-forms/MassMatrix2D.h dolfin/mf/ffc-forms/MassMatrix3D.h dolfin/mf/ffc-forms/StiffnessMatrix2D.h dolfin/mf/ffc-forms/StiffnessMatrix3D.h sandbox/passembly-bench-vec/PoissonP1.h sandbox/passembly-bench-vec/PoissonP 2.h sandbox/passembly/Poisson2DP1.h sandbox/passembly/Poisson2DP2.h sandbox/passembly/Poisson2DP3.h sandbox/passembly/Poisson3DP1.h sandbox/passembly/Poisson3DP2.h sandbox/passembly/Poisson3DP3.h sandbox/pdof_map/Poisson.h site-packages/dolfin_utils/wrappers/coefficient.py site-packages/dolfin_utils/wrappers/coefficient_set.py site-packages/dolfin_utils/wrappers/form.py site-packages/dolfin_utils/wrappers/functionspace.py site-packages/dolfin_utils/wrappers/wrappers.py test/unit/function/cpp/Projection.h description: BIG changes to Function interface. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 10:10:54PM +0200, Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. UFCFunction can also be removed when the Function class has been cleaned up. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. Nice! 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I hope I can fix this tomorrow. Should actually make things easier (but cleanup also takes time...). We should for example be able to skip the DiscreteFunction class now. Johan ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) Then it would be clear that f is not a function in V, but V is only some additional information about how f should be used in forms. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. Nice! This also removes one of the too many interpolate() functions which is good. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I hope I can fix this tomorrow. Should actually make things easier (but cleanup also takes time...). We should for example be able to skip the DiscreteFunction class now. Sounds very good! -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev -- Dr Garth N Wells Department of Engineering University of Cambridge Trumpington Street Cambridge CB2 1PZ United Kingdom tel. +44 1223 3 32743 e-mail gn...@cam.ac.uk http://www.eng.cam.ac.uk/~gnw20/ ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Will CoefficientSet come back? I was using it, but I forgot the important reason why. If I do Form* a = new Poisson::BilinearForm(V, V); I can't do a-g g; but I could do Form* a = new Poisson::BilinearForm(V, V, coefficient_set); I can of course use dynamic cast and then attach functions. Garth Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. Should we have the functions void Function::interpolate(const Expression expression) const Function Function::operator= (const Expression expression) to interpolate an expression in a FE space? Garth 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. -- Anders ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 10:00:59PM +0100, Garth N. Wells wrote: 2. Use the Expression class in demos where appropriate (just need to change the class name, everything else is the same). Haven't you already done this everywhere? No, just in the Poisson demo. I'll fix the others later. -- Anders Garth 3. Fix Python interface. I won't be touching it until tomorrow afternoon so feel free to poke around. signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 10:37:51PM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Will CoefficientSet come back? I was using it, but I forgot the important reason why. If I do Form* a = new Poisson::BilinearForm(V, V); I can't do a-g g; but I could do Form* a = new Poisson::BilinearForm(V, V, coefficient_set); I can of course use dynamic cast and then attach functions. We could easily add functionality for doing a-set_coefficient(g, g); Would that be enough? This would be a simple function implemented in the C++ Form class. It's better if we can avoid generating code if something can be implemented directly in the C++ class. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tue, Sep 29, 2009 at 11:05:55PM +0100, Garth N. Wells wrote: Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. 4. An Expression *never* has a FunctionSpace and *never* has a vector. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. 8. Some checks have been removed in Assembler since a Coefficient does not (if it is an Expression) have a FunctionSpace so we can't check value_rank etc. Things that need to be done now: 1. Clean up Function. Should we have the functions void Function::interpolate(const Expression expression) const Function Function::operator= (const Expression expression) to interpolate an expression in a FE space? Yes, and these should replace the old u.interpolate() function. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Tuesday 29 September 2009 22:39:02 Anders Logg wrote: On Tue, Sep 29, 2009 at 10:29:14PM +0200, Johan Hake wrote: On Tuesday 29 September 2009 22:10:54 Anders Logg wrote: On Tue, Sep 29, 2009 at 08:55:03PM +0100, Garth N. Wells wrote: I'm looking forward to seeing the new code. Is all the old functionality still in place? Yes and no. Everything except the generated CoefficientSet stuff should still work in the C++ interface, but the Python interface won't work until the corresponding changes have been made on the Python side. Here's some more information about the changes: 1. Subclassing Function and overloading eval() has been replaced by the Expression subclass which works in the same way with eval(). 2. All the old functionality/logic of the Function class is still in place but it can now be cleaned up and simplified. 3. A Function will now *always* have a FunctionSpace and *always* have a vector. Good! 4. An Expression *never* has a FunctionSpace and *never* has a vector. Also good! Should we consider (re-)adding a value_rank and dimension method to the expression class? Yes, perhaps. But it's very convenient not having to specify it. We could make it optional. Ok. No big dealt for me. In Python we can solve this for Expressions anyway. Also what would the preferred solution be for a Python expression. It should not have a FunctionSpace but we need a FunctionSpace to initialize the ufl.Function. Or rather the ufl.FiniteElement that comes with the FunctionSpace. I see two alternatives: 1) Instantiate an Expression with a FunctionSpace, then let the FunctionSpace reside in the Python layer. The ufl.FiniteElement is used to instantiate the ufl.Function. 2) Instantiate an Expression with a ufl.FiniteElement. The problem with this is that we have not exposed the ufl.FiniteElement in the PyDOLFIN interface previously. But the confusion with an expression having a FunctionSpace is partly avoided. In both cases I could add checks for rank and dimensions in the Python layer if we decides to not require it for the C++ interface. I think we discussed the possibility of detecting the value dimension from the expression Yes, but a user can initialize an Expression with the wrong FunctionSpace/FiniteElement compared to what the expression looks like. and automatically using piecewise linears if not otherwise specified. The function space could be an optional argument: f = Expression(sin(x[0]), V=V) We cannot automatically figure out the topological dimension, can we? Should we require that an Expression is instantiated using just a ufl.FiniteElement? In this way it would be clear that the Expression is not defined in a FunctionSpace? It would then look like: f = Expression(V.ufl_element(),sin(x[0])) or something. Then it would be clear that f is not a function in V, but V is only some additional information about how f should be used in forms. 5. FunctionSpaces are not attached to coefficients when doing a.f = f. 6. The DOLFIN wrappers have been simplified and now rely on the new very simple CoefficientAssigner class. 7. The assembler works through the common base class Coefficient, in particular the restrict() function for restricting to a local element. Nice! This also removes one of the too many interpolate() functions which is good. Ok. Johan ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7164:6482cbd2a528 tag: tip parent: 7162:baca83735c7d parent: 7163:4c4707968286 user:Anders Logg l...@simula.no date:Mon Sep 28 14:21:49 2009 +0200 description: merge changeset: 7163:4c4707968286 parent: 7160:f8796326b8dc user:Anders Logg l...@simula.no date:Mon Sep 28 14:21:23 2009 +0200 files: dolfin/la/PETScLUSolver.cpp description: Use MUMPS if available when running in serial. changeset: 7162:baca83735c7d user:Johannes Ring joha...@simula.no date:Mon Sep 28 12:13:15 2009 +0200 files: scons/simula-scons/simula_scons/pkgconfig.py description: Use absolute path in generator for dolfin.pc. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7167:34da073abd64 tag: tip parent: 7166:0f161c40b9f7 parent: 7165:fad807e8a3e0 user:Anders Logg l...@simula.no date:Mon Sep 28 14:25:43 2009 +0200 description: merge changeset: 7166:0f161c40b9f7 parent: 7163:4c4707968286 user:Anders Logg l...@simula.no date:Mon Sep 28 14:25:32 2009 +0200 files: dolfin/fem/UFC.cpp dolfin/function/Data.cpp dolfin/function/Data.h dolfin/function/Expression.cpp dolfin/function/Expression.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/NewCoefficient.h dolfin/function/UFCFunction.cpp dolfin/function/UFCFunction.h description: Initial work on new Function design. Added class Expression to replace user-defined functions and base class NewCoefficient that will be the base class of both Expression and Function. changeset: 7165:fad807e8a3e0 user:Anders Logg l...@simula.no date:Mon Sep 28 14:24:13 2009 +0200 files: ChangeLog description: Update ChangeLog -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Saturday 26 September 2009 23:19:23 Anders Logg wrote: On Sat, Sep 26, 2009 at 04:16:49PM +0200, Johan Hake wrote: On Saturday 26 September 2009 00:07:46 Anders Logg wrote: On Fri, Sep 25, 2009 at 11:56:03PM +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: 7147:2f99c8fb3a96 tag: tip parent: 7146:1d18d2b95462 parent: 7145:3f905e727c11 user:Anders Logg l...@simula.no date:Fri Sep 25 23:56:04 2009 +0200 description: merge changeset: 7146:1d18d2b95462 parent: 7143:98d357740635 user:Anders Logg l...@simula.no date:Fri Sep 25 23:55:55 2009 +0200 files: dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add update() function to FunctionSpace and DofMap for use in adaptive mesh refinement. I've added a first iteration of a functionality we need to do adaptivity. When a mesh is refined, we can't reassemble the forms since the FunctionSpace does not know the mesh has changed. It is now possible to update the FunctionSpace (actually the DofMap) by calling FunctionSpace::update. Example: from dolfin import * mesh = UnitSquare(3, 3) V = FunctionSpace(mesh, CG, 3) print V.dim() 100 mesh.refine() No cells marked for refinement, assuming uniform mesh refinement. print V.dim() 100 V.update() print V.dim() 361 I'm not sure what the right way to handle this is. Perhaps we should have FunctionSpace::refine which calls refine on the mesh and then calls update. This will then only work for one FunctionSpace. Other FunctionSpaces defined on the same Mesh would not be updated. Would it be possible to store all FunctionSpaces associated with a Mesh in a vectorFunctionSpace* in the Mesh? Then let Mesh::refine iterate over the FunctionSpaces and call the FunctionSpace::update. This could be handle by adding something like: mesh-register(*this); in the constructor of FunctionSpace and mesh-deregister(*this); in the destructor of FunctionSpace. That could be an option. There might be some issues with constness etc and we've made mistakes before when trying to be clever, but we could try... :-) What is the policy of constness for the Mesh class. I see that there exists a const and a non-const constructor in for example the FunctionSpace and DofMap. It is not explicit for me when I construct a FunctionSpace using a const Mesh and when I am not. We would then need to have mesh::refine -- FunctionSpace::update -- DofMap::update -- Function::interpolate etc for all functions So a FunctionSpace would also need to have some functionality for registering Functions. Yes. We also have the problem of updating MeshFunctions. I understand that there is a mechanism for updating MeshFunctions that resides in the MeshData? I guess it would just create a lot of spaghetti code to add some automatic update for any arbitrary MeshFunction over a particular Mesh. Then there's also the question about what to do with all the Functions on the space that we update/refine. They no longer make any sense on the new mesh. An option would be for a FunctionSpace to store a list of all Functions in the space and automatically project/interpolate them to the refined space when we call FunctionSpace::refine. This would be nice. But is it possible? Do we not need both meshes to interpolate between them? Yes, we would so the above would need to be more complicated. We could have the mesh store a copy of itself before refining. Or we could store the whole hierarchy of meshes when refining. We have had this before. If I remember correctly, a Mesh used to store a pointer to a MeshHierarchy so that one could do mesh.parent(), mesh.child() etc. We could also have MeshFunctions in the data section of a Mesh that stored parents of vertices etc to speed up interpolation between meshes. Ok. Johan ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Sat, Sep 26, 2009 at 04:16:49PM +0200, Johan Hake wrote: On Saturday 26 September 2009 00:07:46 Anders Logg wrote: On Fri, Sep 25, 2009 at 11:56:03PM +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: 7147:2f99c8fb3a96 tag: tip parent: 7146:1d18d2b95462 parent: 7145:3f905e727c11 user:Anders Logg l...@simula.no date:Fri Sep 25 23:56:04 2009 +0200 description: merge changeset: 7146:1d18d2b95462 parent: 7143:98d357740635 user:Anders Logg l...@simula.no date:Fri Sep 25 23:55:55 2009 +0200 files: dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add update() function to FunctionSpace and DofMap for use in adaptive mesh refinement. I've added a first iteration of a functionality we need to do adaptivity. When a mesh is refined, we can't reassemble the forms since the FunctionSpace does not know the mesh has changed. It is now possible to update the FunctionSpace (actually the DofMap) by calling FunctionSpace::update. Example: from dolfin import * mesh = UnitSquare(3, 3) V = FunctionSpace(mesh, CG, 3) print V.dim() 100 mesh.refine() No cells marked for refinement, assuming uniform mesh refinement. print V.dim() 100 V.update() print V.dim() 361 I'm not sure what the right way to handle this is. Perhaps we should have FunctionSpace::refine which calls refine on the mesh and then calls update. This will then only work for one FunctionSpace. Other FunctionSpaces defined on the same Mesh would not be updated. Would it be possible to store all FunctionSpaces associated with a Mesh in a vectorFunctionSpace* in the Mesh? Then let Mesh::refine iterate over the FunctionSpaces and call the FunctionSpace::update. This could be handle by adding something like: mesh-register(*this); in the constructor of FunctionSpace and mesh-deregister(*this); in the destructor of FunctionSpace. That could be an option. There might be some issues with constness etc and we've made mistakes before when trying to be clever, but we could try... :-) We would then need to have mesh::refine -- FunctionSpace::update -- DofMap::update -- Function::interpolate etc for all functions So a FunctionSpace would also need to have some functionality for registering Functions. Then there's also the question about what to do with all the Functions on the space that we update/refine. They no longer make any sense on the new mesh. An option would be for a FunctionSpace to store a list of all Functions in the space and automatically project/interpolate them to the refined space when we call FunctionSpace::refine. This would be nice. But is it possible? Do we not need both meshes to interpolate between them? Yes, we would so the above would need to be more complicated. We could have the mesh store a copy of itself before refining. Or we could store the whole hierarchy of meshes when refining. We have had this before. If I remember correctly, a Mesh used to store a pointer to a MeshHierarchy so that one could do mesh.parent(), mesh.child() etc. We could also have MeshFunctions in the data section of a Mesh that stored parents of vertices etc to speed up interpolation between meshes. -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7147:2f99c8fb3a96 tag: tip parent: 7146:1d18d2b95462 parent: 7145:3f905e727c11 user:Anders Logg l...@simula.no date:Fri Sep 25 23:56:04 2009 +0200 description: merge changeset: 7146:1d18d2b95462 parent: 7143:98d357740635 user:Anders Logg l...@simula.no date:Fri Sep 25 23:55:55 2009 +0200 files: dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add update() function to FunctionSpace and DofMap for use in adaptive mesh refinement. changeset: 7145:3f905e727c11 user:Garth N. Wells gn...@cam.ac.uk date:Fri Sep 25 16:18:13 2009 +0100 files: ChangeLog SConstruct dolfin/scons.cfg site-packages/dolfin/__init__.py description: Update version number. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Fri, Sep 25, 2009 at 11:56:03PM +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: 7147:2f99c8fb3a96 tag: tip parent: 7146:1d18d2b95462 parent: 7145:3f905e727c11 user:Anders Logg l...@simula.no date:Fri Sep 25 23:56:04 2009 +0200 description: merge changeset: 7146:1d18d2b95462 parent: 7143:98d357740635 user:Anders Logg l...@simula.no date:Fri Sep 25 23:55:55 2009 +0200 files: dolfin/fem/DofMap.cpp dolfin/fem/DofMap.h dolfin/function/FunctionSpace.cpp dolfin/function/FunctionSpace.h description: Add update() function to FunctionSpace and DofMap for use in adaptive mesh refinement. I've added a first iteration of a functionality we need to do adaptivity. When a mesh is refined, we can't reassemble the forms since the FunctionSpace does not know the mesh has changed. It is now possible to update the FunctionSpace (actually the DofMap) by calling FunctionSpace::update. Example: from dolfin import * mesh = UnitSquare(3, 3) V = FunctionSpace(mesh, CG, 3) print V.dim() 100 mesh.refine() No cells marked for refinement, assuming uniform mesh refinement. print V.dim() 100 V.update() print V.dim() 361 I'm not sure what the right way to handle this is. Perhaps we should have FunctionSpace::refine which calls refine on the mesh and then calls update. Then there's also the question about what to do with all the Functions on the space that we update/refine. They no longer make any sense on the new mesh. An option would be for a FunctionSpace to store a list of all Functions in the space and automatically project/interpolate them to the refined space when we call FunctionSpace::refine. Any thoughts? -- Anders signature.asc Description: Digital signature ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7137:051c991c6db3 tag: tip parent: 7136:4548405820ac parent: 7135:2a3ce4823f4e user:Anders Logg l...@simula.no date:Tue Sep 22 18:39:03 2009 +0200 description: merge changeset: 7136:4548405820ac parent: 7133:5498ce4cf5fb user:Anders Logg l...@simula.no date:Tue Sep 22 18:23:15 2009 +0200 files: test/system/parallel-assembly-solve/test.py description: Add suggestions for improvement to speedup benchmark (not implemented yet). changeset: 7135:2a3ce4823f4e user:Garth N. Wells gn...@cam.ac.uk date:Tue Sep 22 17:09:27 2009 +0100 files: dolfin/function/Constant.cpp dolfin/function/Constant.h dolfin/la/PETScVector.cpp description: Fix bug reported by Patrick Riesen. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Mon, Sep 21, 2009 at 9:04 AM, DOLFIN dol...@fenics.org wrote: One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7097:a31591593d64 tag: tip parent: 7096:fb5b9fee5891 parent: 7094:b2840ed51061 user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:03:58 2009 +0200 description: merge changeset: 7096:fb5b9fee5891 user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:03:48 2009 +0200 files: dolfin/io/XMLVectorMapping.cpp dolfin/io/XMLVectorMapping.h description: Initial work on the storage of vector mappings, needed to persitently store meshfunctions of arbitrary topological dimension to file. changeset: 7095:22a058393a75 parent: 7093:609865e1a22b user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:02:34 2009 +0200 files: site-packages/dolfin/plot.py description: Add more verbose information about what goes wrong when failing to import Viper This syntax is not supported by Python 2.5. See http://fenics.org:8080/builders/dolfin-linux64-exp/builds/778/steps/dolfin%20check/logs/demo.log for details. Johannes ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
On Monday 21 September 2009 11:40:58 Johannes Ring wrote: On Mon, Sep 21, 2009 at 9:04 AM, DOLFIN dol...@fenics.org wrote: One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7097:a31591593d64 tag: tip parent: 7096:fb5b9fee5891 parent: 7094:b2840ed51061 user:Ola Skavhaug skavh...@simula.no date:Mon Sep 21 09:03:58 2009 +0200 description: merge changeset: 7096:fb5b9fee5891 user:Ola Skavhaug skavh...@simula.no date:Mon Sep 21 09:03:48 2009 +0200 files: dolfin/io/XMLVectorMapping.cpp dolfin/io/XMLVectorMapping.h description: Initial work on the storage of vector mappings, needed to persitently store meshfunctions of arbitrary topological dimension to file. changeset: 7095:22a058393a75 parent: 7093:609865e1a22b user:Ola Skavhaug skavh...@simula.no date:Mon Sep 21 09:02:34 2009 +0200 files: site-packages/dolfin/plot.py description: Add more verbose information about what goes wrong when failing to import Viper This syntax is not supported by Python 2.5. See http://fenics.org:8080/builders/dolfin-linux64-exp/builds/778/steps/dolfin% 20check/logs/demo.log for details. Should be fixed now Johan Johannes ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
Re: [DOLFIN-dev] [HG DOLFIN] merge
I'm shocked ;) Ola On Mon, Sep 21, 2009 at 11:40 AM, Johannes Ring joha...@simula.no wrote: On Mon, Sep 21, 2009 at 9:04 AM, DOLFIN dol...@fenics.org wrote: One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7097:a31591593d64 tag: tip parent: 7096:fb5b9fee5891 parent: 7094:b2840ed51061 user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:03:58 2009 +0200 description: merge changeset: 7096:fb5b9fee5891 user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:03:48 2009 +0200 files: dolfin/io/XMLVectorMapping.cpp dolfin/io/XMLVectorMapping.h description: Initial work on the storage of vector mappings, needed to persitently store meshfunctions of arbitrary topological dimension to file. changeset: 7095:22a058393a75 parent: 7093:609865e1a22b user: Ola Skavhaug skavh...@simula.no date: Mon Sep 21 09:02:34 2009 +0200 files: site-packages/dolfin/plot.py description: Add more verbose information about what goes wrong when failing to import Viper This syntax is not supported by Python 2.5. See http://fenics.org:8080/builders/dolfin-linux64-exp/builds/778/steps/dolfin%20check/logs/demo.log for details. Johannes ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev -- Ola Skavhaug ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7104:41bf954d935f tag: tip parent: 7101:80617eeb8049 parent: 7103:a3d2666fbff1 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 13:00:30 2009 +0100 description: merge. changeset: 7103:a3d2666fbff1 parent: 7102:a774fba6f622 parent: 7099:d7b06adcb19b user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 13:00:05 2009 +0100 description: merge. changeset: 7102:a774fba6f622 parent: 7097:a31591593d64 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 12:59:49 2009 +0100 files: dolfin/plot/plot.cpp description: Revert plot.cpp to changeset 6969. Poisson demo works again in parallel on Jaunty. No idea why. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7111:ecfb53c48ec0 tag: tip parent: 7110:6888dd746e55 parent: 7109:ff5428df76dc user:Anders Logg l...@simula.no date:Mon Sep 21 15:26:17 2009 +0200 files: bench/fem/speedup/commit-bench description: merge changeset: 7110:6888dd746e55 parent: 7098:1c6eb6119002 user:Anders Logg l...@simula.no date:Mon Sep 21 15:26:09 2009 +0200 files: site-packages/dolfin/norm.py description: Change dot -- inner in norm.py changeset: 7109:ff5428df76dc parent: 7108:cffc37185789 parent: 7106:744caaf6a795 user:l...@bigblue.simula.no date:Mon Sep 21 15:26:01 2009 +0200 description: merg -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7113:2a02a3712706 tag: tip parent: 7112:27d21cbfd410 parent: 7111:ecfb53c48ec0 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 14:32:26 2009 +0100 files: bench/fem/speedup/commit-bench description: merge. changeset: 7112:27d21cbfd410 parent: 7106:744caaf6a795 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 14:32:06 2009 +0100 files: dolfin/io/XMLFunctionPlotData.cpp dolfin/plot/FunctionPlotData.cpp dolfin/plot/FunctionPlotData.h description: Fixes for FunctionPlotData + SWIG. changeset: 7111:ecfb53c48ec0 parent: 7110:6888dd746e55 parent: 7109:ff5428df76dc user:Anders Logg l...@simula.no date:Mon Sep 21 15:26:17 2009 +0200 files: bench/fem/speedup/commit-bench description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7119:681d1c032e56 tag: tip parent: 7117:2c6cbf98930d parent: 7118:9d6cec4122cc user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 19:15:25 2009 +0100 description: merge. changeset: 7118:9d6cec4122cc parent: 7113:2a02a3712706 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 19:15:02 2009 +0100 files: dolfin/la/DefaultFactory.cpp dolfin/la/DefaultFactory.h dolfin/la/EpetraFactory.cpp dolfin/la/EpetraFactory.h dolfin/la/LinearAlgebraFactory.h dolfin/la/MTL4Factory.h dolfin/la/STLFactory.h dolfin/la/uBLASFactory.h dolfin/plot/FunctionPlotData.cpp dolfin/plot/FunctionPlotData.h description: Fix bug in FunctionPlotData. demo/poisson/dg/cpp runs, but with the familar bug of a mesh plot but no contours, and no warning or error messages. changeset: 7117:2c6cbf98930d parent: 7116:8ea29254e0aa parent: 7115:497754f70bde user:Anders Logg l...@simula.no date:Mon Sep 21 19:29:21 2009 +0200 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7121:f0f1b49bb36c tag: tip parent: 7120:44085dbb4007 parent: 7119:681d1c032e56 user:Anders Logg l...@simula.no date:Mon Sep 21 21:08:47 2009 +0200 description: merge changeset: 7120:44085dbb4007 parent: 7115:497754f70bde user:Anders Logg l...@simula.no date:Mon Sep 21 21:08:26 2009 +0200 files: ChangeLog description: Update ChangeLog changeset: 7119:681d1c032e56 parent: 7117:2c6cbf98930d parent: 7118:9d6cec4122cc user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 21 19:15:25 2009 +0100 description: merge. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7123:53b4e5aabf81 tag: tip parent: 7122:4c66fb7573ab parent: 7121:f0f1b49bb36c user:Anders Logg l...@simula.no date:Mon Sep 21 21:25:29 2009 +0200 description: merge changeset: 7122:4c66fb7573ab parent: 7117:2c6cbf98930d user:Anders Logg l...@simula.no date:Mon Sep 21 21:14:31 2009 +0200 files: bench/fem/speedup/analyse-bench bench/fem/speedup/bench bench/fem/speedup/bench.log bench/fem/speedup/submit-bench description: Run parallel speedup benchmark changeset: 7121:f0f1b49bb36c parent: 7120:44085dbb4007 parent: 7119:681d1c032e56 user:Anders Logg l...@simula.no date:Mon Sep 21 21:08:47 2009 +0200 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7125:c4bda7b4cefc tag: tip parent: 7124:938f18f9d347 parent: 7123:53b4e5aabf81 user:Anders Logg l...@simula.no date:Mon Sep 21 21:55:04 2009 +0200 description: merge changeset: 7124:938f18f9d347 parent: 7121:f0f1b49bb36c user:Anders Logg l...@simula.no date:Mon Sep 21 21:54:49 2009 +0200 files: dolfin/mesh/SubDomain.cpp description: Add progress bar for computing subdomain markers. changeset: 7123:53b4e5aabf81 parent: 7122:4c66fb7573ab parent: 7121:f0f1b49bb36c user:Anders Logg l...@simula.no date:Mon Sep 21 21:25:29 2009 +0200 description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7086:dd057d0fbd6d78ac39793ffaad4ad4a1fa55c818 tag: tip parent: 7085:6763c4e08ff397c2ee1df2d5bcc50dba88368f78 parent: 7083:4ca0c0d5756985f51aff53b1670846cea0d14db4 user:Johan Hake h...@simula.no date:Thu Sep 17 10:14:30 2009 +0200 files: description: merge changeset: 7085:6763c4e08ff397c2ee1df2d5bcc50dba88368f78 user:Johan Hake h...@simula.no date:Thu Sep 17 10:14:10 2009 +0200 files: bench/bench bench/fem/speedup/bench bench/ode/reaction/benchutil.py misc/utils/convert/dolfin-convert misc/utils/swig/dolfin-swig site-packages/dolfin/ale.py site-packages/dolfin/meshconvert.py site-packages/dolfin/utils.py site-packages/dolfin_utils/commands.py test/regression/test.py test/system/parallel-assembly-solve/test.py test/unit/test.py description: Removed utils.py - ale related function moved to ale.py - our own versions of getoutput, getstatusoutput are moved to dolfin_utils.commands changeset: 7084:4583d83371efebbb5751f4d323c654bfe00b63d1 parent: 7073:9a4a270d205ef8dc132452137ed2cbf841fde389 user:Johan Hake h...@simula.no date:Thu Sep 17 10:10:31 2009 +0200 files: bench/fem/speedup/analyse-bench bench/fem/speedup/commit-bench description: Added a commit and analyse script for parrallell benchmarks -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7075:790c32e67ef85a84b27627aa73bf745ef1e1f76a tag: tip parent: 7074:0cc2d43dec19ba4b94a9aa1f9bae44b033936d56 parent: 7073:9a4a270d205ef8dc132452137ed2cbf841fde389 user:Anders Logg l...@simula.no date:Wed Sep 16 17:46:05 2009 +0200 files: description: merge changeset: 7074:0cc2d43dec19ba4b94a9aa1f9bae44b033936d56 parent: 7072:2f798b54370a2b6b3bbe312ee990cc7cc1bef411 user:Anders Logg l...@simula.no date:Wed Sep 16 17:39:37 2009 +0200 files: demo/pde/curl-curl/cpp/CurrentDensity.h demo/pde/curl-curl/cpp/CurrentDensity.ufl demo/pde/curl-curl/cpp/EddyCurrents.h demo/pde/curl-curl/cpp/EddyCurrents.ufl demo/pde/curl-curl/python/demo.py demo/pde/waveguide/cpp/Forms.h demo/pde/waveguide/cpp/Forms.ufl demo/pde/waveguide/python/demo.py description: Fixes for changed meaning of q for Nedelec elements. changeset: 7073:9a4a270d205ef8dc132452137ed2cbf841fde389 user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 16 00:32:06 2009 +0200 files: demo/pde/dg/poisson/python/demo.py description: Clean up Poisson DG demo. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7077:9e49f05d146d68dc5b19ef6d27bc075e3774748b tag: tip parent: 7076:37ead61734ce1584a4d5088f9fe755df70bc00f5 parent: 7075:790c32e67ef85a84b27627aa73bf745ef1e1f76a user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 16 18:05:14 2009 +0200 files: description: merge. changeset: 7076:37ead61734ce1584a4d5088f9fe755df70bc00f5 parent: 7073:9a4a270d205ef8dc132452137ed2cbf841fde389 user:Garth N. Wells gn...@cam.ac.uk date:Wed Sep 16 18:04:22 2009 +0200 files: TODO description: Clean out TODO file. changeset: 7075:790c32e67ef85a84b27627aa73bf745ef1e1f76a parent: 7074:0cc2d43dec19ba4b94a9aa1f9bae44b033936d56 parent: 7073:9a4a270d205ef8dc132452137ed2cbf841fde389 user:Anders Logg l...@simula.no date:Wed Sep 16 17:46:05 2009 +0200 files: description: merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge.
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7058:4553aaf5756d6a47712957c40743aaf79baa08f8 tag: tip parent: 7056:da219c9632a6fb6f80baaea307f0bb67b7128e9a parent: 7057:5fabb42bbbc25c6afb8193ca473ed0d4908e2e83 user:Garth N. Wells gn...@cam.ac.uk date:Tue Sep 15 09:19:36 2009 +0200 files: description: merge. changeset: 7057:5fabb42bbbc25c6afb8193ca473ed0d4908e2e83 parent: 7055:05bd91229f79581062201c7c8d60360c41a2fa6e user:Garth N. Wells gn...@cam.ac.uk date:Tue Sep 15 09:18:48 2009 +0200 files: demo/pde/dg/poisson/python/demo.py demo/pde/mixed-poisson/cpp/main.cpp dolfin/fem/DofMap.cpp dolfin/function/Function.cpp description: Bug fix in DofMap. changeset: 7056:da219c9632a6fb6f80baaea307f0bb67b7128e9a user:Johan Hake h...@simula.no date:Tue Sep 15 09:13:21 2009 +0200 files: test/memory/dolfin_valgrind.supp description: Remove explicit dolfin names in suppression file as these where previously CamelCaps. - ~10% less complaints. Still a lot to suppress. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7063:39463579c3b97aa00487a7d2020ea02b679563a9 tag: tip parent: 7062:015243d40d77bae02ea29bb3a88231c85bc5d4e1 parent: 7061:958c2917b0138be62bae5b8cbf6f35d38e90863b user:Anders Logg l...@simula.no date:Tue Sep 15 10:57:22 2009 +0200 files: description: merge changeset: 7062:015243d40d77bae02ea29bb3a88231c85bc5d4e1 parent: 7060:6f313a641de7b0f25de4e96af84cb299e2939d29 user:Anders Logg l...@simula.no date:Tue Sep 15 10:55:13 2009 +0200 files: demo/function/nonmatching-interpolation/python/demo.py dolfin/function/Data.cpp dolfin/function/Data.h dolfin/function/Function.cpp dolfin/function/Function.h dolfin/function/UFCFunction.cpp description: Revert optimization to UFCFunction.cpp (not storing _ufc_cell). The problem was that the cell might originate from another mesh and so was not valid. We could consider storing the mesh also and check that as well but the Function class is up for redesign (simplification) anyway so it can wait until then. changeset: 7061:958c2917b0138be62bae5b8cbf6f35d38e90863b user:Garth N. Wells gn...@cam.ac.uk date:Tue Sep 15 09:45:47 2009 +0200 files: demo/pde/mixed-poisson/cpp/main.cpp dolfin/plot/plot.cpp description: Remove error when plotting from C++ in parallel. It's not fatal, so there is no need to exit the program. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7044:387c7119a5b6a4a5728a890326e058fff3536f60 tag: tip parent: 7043:ecb12af5a733cc49e3bfec1992f8da925d2a5451 parent: 7040:d698356007c1de7e0fea0cf16eee6d26aad6d1a0 user:Anders Logg l...@simula.no date:Mon Sep 14 17:50:05 2009 +0200 files: description: merge changeset: 7043:ecb12af5a733cc49e3bfec1992f8da925d2a5451 user:Anders Logg l...@simula.no date:Mon Sep 14 17:49:46 2009 +0200 files: dolfin/la/PETScLUSolver.cpp test/regression/test.py description: Handle exit status 10 (graceful exit when failing) in test script. changeset: 7042:481787462d07373638df801cba2f89e5e9be1bae user:Anders Logg l...@simula.no date:Mon Sep 14 12:19:37 2009 +0200 files: test/regression/test.py description: Remove ./ for path to Python demos in regression test script. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7047:f3ba477878c59f2a7310decd2412d370549a7869 tag: tip parent: 7046:7ab626bd7c440b6333e9928a0a8353070a10970d parent: 7045:ebff8a21e849a10292a90bab43ec48e234c5b7d5 user:Anders Logg l...@simula.no date:Mon Sep 14 20:53:24 2009 +0200 files: description: merge changeset: 7046:7ab626bd7c440b6333e9928a0a8353070a10970d parent: 7044:387c7119a5b6a4a5728a890326e058fff3536f60 user:Anders Logg l...@simula.no date:Mon Sep 14 20:53:13 2009 +0200 files: test/regression/test.py description: Bug fix in regression test script changeset: 7045:ebff8a21e849a10292a90bab43ec48e234c5b7d5 user:Garth N. Wells gn...@cam.ac.uk date:Mon Sep 14 19:25:35 2009 +0200 files: demo/pde/dg/poisson/python/demo.py description: Add test for new facet normal computation. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7037:564dae730b5acde686a55a966bd06c776ddbdeec tag: tip parent: 7036:b765908fded8a7f16658706d6b26fbc9948fdbe8 parent: 7035:d8b1050058858c58c5fc31bb064524daf5daa1ef user:Johan Hake h...@simula.no date:Sun Sep 13 18:27:12 2009 +0200 files: description: merge changeset: 7036:b765908fded8a7f16658706d6b26fbc9948fdbe8 parent: 7034:e27650e061b3a4cf4cb2738914c435b5724ea93a user:Johan Hake h...@simula.no date:Sun Sep 13 18:26:44 2009 +0200 files: dolfin/swig/Indices.i dolfin/swig/la_get_set_items.i dolfin/swig/typemaps.i description: Fix for index access in PyDOLFIN for 64 bit machines - la unit test on 'potassium' should pass now changeset: 7035:d8b1050058858c58c5fc31bb064524daf5daa1ef user:Garth N. Wells gn...@cam.ac.uk date:Fri Sep 11 19:48:51 2009 +0200 files: dolfin/mesh/Point.cpp dolfin/mesh/Point.h description: Add std::ostream operator to Point.h -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7028:8736d83198dbee3ba1da654e411b91d50ab9b930 tag: tip parent: 7027:e885fe29bed59e36fdf1fd008ecbd52bc1360f1a parent: 7025:b017449dd3dd2383e60c9d779909ecc9cac00375 user:Ola Skavhaug skavh...@simula.no date:Fri Sep 11 11:29:03 2009 +0200 files: demo/ode/lorenz/cpp/solution_dual.py dolfin/mesh/LocalMeshData.h dolfin/swig/common_pre.i test/unit/meshconvert/cpp/test description: merge changeset: 7027:e885fe29bed59e36fdf1fd008ecbd52bc1360f1a user:Ola Skavhaug skavh...@simula.no date:Fri Sep 11 11:28:01 2009 +0200 files: dolfin/io/XMLLocalMeshData.cpp dolfin/mesh/LocalMeshData.cpp dolfin/mesh/LocalMeshData.h dolfin/mesh/MeshPartitioning.cpp description: Use global cell numbers when constructing global entity indices. This should fix MeshFunctions over cells. changeset: 7026:c2c60103fbf541a7702b88cb056419a728c476d5 parent: 6977:3d54df3ed64ee441001571f125cd7eae95b235f3 user:Ola Skavhaug skavh...@simula.no date:Wed Sep 09 11:35:39 2009 +0200 files: dolfin/io/XMLMeshFunction.cpp dolfin/mesh/MeshPartitioning.cpp dolfin/mesh/MeshPartitioning.h description: Pave the way for meshfunctions of of more topological dimension. Failing for now since the global indices of topological entities of dimension 1,..,d-1 are not persistently stored on file. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7034:e27650e061b3a4cf4cb2738914c435b5724ea93a tag: tip parent: 7033:b6b0555dbe2653dc2454dd78e0d89b7bcf6f0fc0 parent: 7031:46d56fa658023f4ff2dfbdcf0b92a78370f0893e user:Johan Hake h...@simula.no date:Fri Sep 11 18:25:43 2009 +0200 files: description: merge changeset: 7033:b6b0555dbe2653dc2454dd78e0d89b7bcf6f0fc0 user:Johan Hake h...@simula.no date:Fri Sep 11 18:25:32 2009 +0200 files: site-packages/dolfin/compile_functions.py description: A try to fix a subtle bug in compile_functions on mac. changeset: 7032:6a68ccdc2f60cfb487284727c601b4327f69c0e8 parent: 7030:a73e866fd6e36e7005ecb4bfb92a8c04d81fcc1b user:Johan Hake h...@simula.no date:Fri Sep 11 18:23:35 2009 +0200 files: dolfin/swig/parameter_post.i dolfin/swig/parameter_pre.i description: Fix broken parameter demo -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7016:72693308c94da3d7d31fa5a2d4518eee40447256 tag: tip parent: 7015:1c976e2f74c5cc1f2e7665ec76396a96d9774ccb parent: 7014:efad3098d2e0d377d48bd444bfa4cc25b838cdba user:Anders Logg l...@simula.no date:Thu Sep 10 17:05:50 2009 +0200 files: dolfin/ode/ODE.cpp dolfin/ode/ODECollection.h description: merge changeset: 7015:1c976e2f74c5cc1f2e7665ec76396a96d9774ccb parent: 7010:4521dc01a47a1b9c149ca544eb409698562f977d user:Anders Logg l...@simula.no date:Thu Sep 10 17:05:45 2009 +0200 files: dolfin/log/log.cpp dolfin/log/log.h dolfin/ode/ODE.cpp dolfin/ode/ODECollection.h description: Add error message about ODE solvers not working in parallel changeset: 7014:efad3098d2e0d377d48bd444bfa4cc25b838cdba parent: 7013:b5f4ba28f9b2815ec49808e0fd01866894613fb4 parent: 7007:9a9bd044e3a1df93c708448858492c0b7c01fa68 user:Benjamin Kehlet benja...@ifi.uio.no date:Thu Sep 10 14:09:25 2009 +0200 files: description: Merge -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev
[DOLFIN-dev] [HG DOLFIN] merge
One or more new changesets pushed to the primary dolfin repository. A short summary of the last three changesets is included below. changeset: 7020:3d3b5908442d6622a7e5613342ad25ffb19b18ad tag: tip parent: 7018:f75d6602b08cc2b110f0b44a931e7783e94d442f parent: 7019:511a9143162ec86a3facd5b567a105ad72660a69 user:Anders Logg l...@simula.no date:Fri Sep 11 07:52:15 2009 +0200 files: description: merge changeset: 7019:511a9143162ec86a3facd5b567a105ad72660a69 parent: 7017:e04347d24f3f0d45dd3f806bb7028ce87771ebd0 user:Benjamin Kehlet benja...@ifi.uio.no date:Thu Sep 10 20:27:22 2009 +0200 files: demo/ode/courtemanche/cpp/main.cpp description: Adjust initial time step. Demo now works. changeset: 7018:f75d6602b08cc2b110f0b44a931e7783e94d442f user:Anders Logg l...@simula.no date:Thu Sep 10 22:29:42 2009 +0200 files: dolfin/plot/plot.cpp description: Disable plotting in parallel from C++. -- For more details, visit http://www.fenics.org/hg/dolfin ___ DOLFIN-dev mailing list DOLFIN-dev@fenics.org http://www.fenics.org/mailman/listinfo/dolfin-dev