dolfin team mailing list archive

Thread
Date

Re: [Branch ~dolfin-core/dolfin/main] Rev 5552: Merge.

To: DOLFIN Mailing List <dolfin@xxxxxxxxxxxxxxxxxxx>
From: "Marie E. Rognes" <meg@xxxxxxxxx>
Date: Thu, 20 Jan 2011 17:53:11 +0100
In-reply-to: <20110120164330.8828.99337.launchpad@loganberry.canonical.com>
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7

On 01/20/2011 05:43 PM, noreply@xxxxxxxxxxxxx wrote:

Merge authors:
   Marie Rognes (meg-simula)
------------------------------------------------------------
revno: 5552 [merge]
committer: Marie E. Rognes<meg@xxxxxxxxx>
branch nick: dolfin-main
timestamp: Thu 2011-01-20 17:39:13 +0100
message:
   Merge.

Some commit messages went missing in that merge. For those disturbed bythe apparent dramatic changes in the form-files, here's what happened.(The form-files were recompiled b/c the parameter "error_control" wasadded in ffc, thus changing the parameter-list at the top)


------------------------------------------------------------
revno: 5551
committer: Marie E. Rognes <meg@xxxxxxxxx>
branch nick: dolfin
timestamp: Thu 2011-01-20 17:31:17 +0100
message:
  Add code generation for functionals.
------------------------------------------------------------
revno: 5550
committer: Marie E. Rognes <meg@xxxxxxxxx>
branch nick: dolfin
timestamp: Thu 2011-01-20 14:57:02 +0100
message:
  Bug fix for single function space generation.
------------------------------------------------------------
revno: 5549
committer: Marie E. Rognes <meg@xxxxxxxxx>
branch nick: dolfin
timestamp: Thu 2011-01-20 14:09:57 +0100
message:
  Regenerated form-files (added parameter in ffc).
------------------------------------------------------------
revno: 5548
committer: Marie E. Rognes <meg@xxxxxxxxx>
branch nick: dolfin
timestamp: Thu 2011-01-20 14:03:00 +0100
message:
  Allow generation of code for single function space.
----------------------------------------------------------------


--
Marie

modified:
   bench/fem/assembly/cpp/forms/Elasticity3D.h
   bench/fem/assembly/cpp/forms/NSEMomentum3D.h
   bench/fem/assembly/cpp/forms/Poisson2DP1.h
   bench/fem/assembly/cpp/forms/Poisson2DP2.h
   bench/fem/assembly/cpp/forms/Poisson2DP3.h
   bench/fem/assembly/cpp/forms/StabStokes2D.h
   bench/fem/assembly/cpp/forms/THStokes2D.h
   bench/fem/convergence/cpp/forms/Poisson2D_1.h
   bench/fem/convergence/cpp/forms/Poisson2D_2.h
   bench/fem/convergence/cpp/forms/Poisson2D_3.h
   bench/fem/convergence/cpp/forms/Poisson2D_4.h
   bench/fem/convergence/cpp/forms/Poisson2D_5.h
   bench/fem/convergence/cpp/forms/Poisson3D_1.h
   bench/fem/convergence/cpp/forms/Poisson3D_2.h
   bench/fem/convergence/cpp/forms/Poisson3D_3.h
   bench/fem/convergence/cpp/forms/Poisson3D_4.h
   bench/fem/convergence/cpp/forms/Poisson3D_5.h
   bench/fem/multicore/cpp/NavierStokes.h
   bench/fem/multicore/cpp/Poisson.h
   bench/fem/speedup/cpp/Poisson.h
   bench/function/evaluation/cpp/P1.h
   demo/la/eigenvalue/cpp/StiffnessMatrix.h
   demo/pde/biharmonic/cpp/Biharmonic.h
   demo/pde/cahn-hilliard/cpp/CahnHilliard2D.cpp
   demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h
   demo/pde/cahn-hilliard/cpp/CahnHilliard3D.cpp
   demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h
   demo/pde/hyperelasticity/cpp/HyperElasticity.h
   demo/pde/mixed-poisson/cpp/MixedPoisson.h
   demo/pde/navier-stokes/cpp/PressureUpdate.h
   demo/pde/navier-stokes/cpp/TentativeVelocity.h
   demo/pde/navier-stokes/cpp/VelocityUpdate.h
   demo/pde/poisson/cpp/Poisson.h
   demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.h
   demo/undocumented/advection-diffusion/cpp/Velocity.h
   demo/undocumented/assembly/cpp/ReactionDiffusion.h
   demo/undocumented/auto-adaptive-navier-stokes/cpp/AdaptiveNavierStokes.h
   demo/undocumented/auto-adaptive-poisson/cpp/AdaptivePoisson.h
   demo/undocumented/bcs/cpp/Poisson.h
   demo/undocumented/block-matrix/cpp/StiffnessMatrix.h
   demo/undocumented/conditional/cpp/Conditional.h
   demo/undocumented/curl-curl/cpp/CurrentDensity.h
   demo/undocumented/curl-curl/cpp/EddyCurrents.h
   demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.h
   demo/undocumented/dg-advection-diffusion/cpp/Projection.h
   demo/undocumented/dg-advection-diffusion/cpp/Velocity.h
   demo/undocumented/dg-poisson/cpp/Poisson.h
   demo/undocumented/elasticity/cpp/Elasticity.h
   demo/undocumented/elastodynamics/cpp/DG0_eps_xx.h
   demo/undocumented/elastodynamics/cpp/ElastoDynamics.h
   demo/undocumented/equality/cpp/Poisson.h
   demo/undocumented/eval/cpp/Projection.h
   demo/undocumented/extrapolation/cpp/P1.h
   demo/undocumented/extrapolation/cpp/P2.h
   demo/undocumented/functional/cpp/EnergyNorm.h
   demo/undocumented/lift-drag/cpp/Drag.h
   demo/undocumented/lift-drag/cpp/Lift.h
   demo/undocumented/lift-drag/cpp/Pressure.h
   demo/undocumented/neumann-poisson/cpp/Poisson.h
   demo/undocumented/nonlinear-poisson/cpp/NonlinearPoisson.h
   demo/undocumented/nonmatching-interpolation/cpp/P1.h
   demo/undocumented/nonmatching-interpolation/cpp/P3.h
   demo/undocumented/nonmatching-projection/cpp/P1_projection.h
   demo/undocumented/nonmatching-projection/cpp/P3.h
   demo/undocumented/periodic/cpp/Poisson.h
   demo/undocumented/poisson1D/cpp/Poisson.h
   demo/undocumented/reaction-diffusion/cpp/ReactionDiffusion.h
   demo/undocumented/simple/cpp/MassMatrix3D.h
   demo/undocumented/simple/cpp/StiffnessMatrix3D.h
   demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.h
   demo/undocumented/stokes-iterative/cpp/Stokes.h
   demo/undocumented/stokes-iterative/cpp/StokesPreconditioner.h
   demo/undocumented/stokes-stabilized/cpp/Stokes.h
   demo/undocumented/stokes-taylor-hood/cpp/Stokes.h
   demo/undocumented/sym-dirichlet-bc/cpp/Poisson.h
   demo/undocumented/waveguide/cpp/Forms.h
   dolfin/ale/Poisson1D.h
   dolfin/ale/Poisson2D.h
   dolfin/ale/Poisson3D.h
   site-packages/dolfin_utils/new_wrappers/form.py
   site-packages/dolfin_utils/new_wrappers/includes.py
   site-packages/dolfin_utils/new_wrappers/wrappers.py
   test/unit/function/cpp/Projection.h
The size of the diff (45018 lines) is larger than your specified limit of 1000 lines

--
lp:dolfin
https://code.launchpad.net/~dolfin-core/dolfin/main

Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription