dolfin team mailing list archive

[Anders Logg <logg@xxxxxxxxx>]

Don't forget to run

  utils/copy_demos.sh

in fenics-doc after changes to demos in DOLFIN.

--
Anders

--- Begin Message ---

• To: Anders Logg <logg@xxxxxxxxx>
• From: noreply@xxxxxxxxxxxxx
• Date: Wed, 01 Sep 2010 17:20:39 -0000
• Delivery-date: Wed, 01 Sep 2010 19:20:42 +0200
• Reply-to: noreply@xxxxxxxxxxxxx
• Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 5148
committer: Garth N. Wells <gnw20@xxxxxxxxx>
branch nick: dolfin-all
timestamp: Wed 2010-09-01 18:13:12 +0100
message:
  Small demo formatting tweaks for doc.
modified:
  cmake/modules/FindGMP.cmake
  demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl
  demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl


--
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

=== modified file 'cmake/modules/FindGMP.cmake'
--- cmake/modules/FindGMP.cmake	2010-08-29 21:48:39 +0000
+++ cmake/modules/FindGMP.cmake	2010-09-01 17:13:12 +0000
@@ -27,7 +27,9 @@
   DOC "The GMP libraries"
   )
 
+mark_as_advanced(GMP_INCLUDE_DIRS GMP_LIBRARIES)
+
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIRS GMP_LIBRARIES)
-
-mark_as_advanced(GMP_INCLUDE_DIRS GMP_LIBRARIES)
+find_package_handle_standard_args(GMP DEFAULT_MSG GMP_INCLUDE_DIRS GMP_LIBRARIES)
+
+

=== modified file 'demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl'
--- demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl	2010-08-31 23:18:49 +0000
+++ demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl	2010-09-01 17:13:12 +0000
@@ -12,8 +12,8 @@
 P1 = FiniteElement("Lagrange", "triangle", 1)
 ME = P1*P1
 
-q, v  = TestFunctions(ME)
-du    = TrialFunction(ME)
+q, v = TestFunctions(ME)
+du   = TrialFunction(ME)
 
 u   = Coefficient(ME)  # current solution
 u0  = Coefficient(ME)  # solution from previous converged step
@@ -27,14 +27,14 @@
 dt       = Constant(triangle) # time step
 theta    = Constant(triangle) # time stepping parameter
 
+# mu_(n+theta)
+mu_mid = (1-theta)*mu0 + theta*mu
+
 # Compute the chemical potential df/dc
 c    = variable(c)
 f    = 100*c**2*(1-c)**2
 dfdc = diff(f, c)
 
-# mu^(n+theta)
-mu_mid = (1-theta)*mu0 + theta*mu
-
 L0 = q*c*dx  - q*c0*dx   + dt*dot(grad(q), grad(mu_mid))*dx
 L1 = v*mu*dx - v*dfdc*dx - lmbda*dot(grad(v), grad(c))*dx
 L = L0 + L1

=== modified file 'demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl'
--- demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl	2010-08-31 23:18:49 +0000
+++ demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl	2010-09-01 17:13:12 +0000
@@ -12,8 +12,8 @@
 P1 = FiniteElement("Lagrange", "tetrahedron", 1)
 ME = P1*P1
 
-q, v  = TestFunctions(ME)
-du    = TrialFunction(ME)
+q, v = TestFunctions(ME)
+du   = TrialFunction(ME)
 
 u   = Coefficient(ME)  # current solution
 u0  = Coefficient(ME)  # solution from previous converged step
@@ -27,14 +27,14 @@
 dt       = Constant(tetrahedron) # time step
 theta    = Constant(tetrahedron) # time stepping parameter
 
+# mu_(n+theta)
+mu_mid = (1-theta)*mu0 + theta*mu
+
 # Compute the chemical potential df/dc
 c = variable(c)
 f    = 100*c**2*(1-c)**2
 dfdc = diff(f, c)
 
-# mu^(n+theta)
-mu_mid = (1-theta)*mu0 + theta*mu
-
 L0 = q*c*dx  - q*c0*dx   + dt*dot(grad(q), grad(mu_mid))*dx
 L1 = v*mu*dx - v*dfdc*dx - lmbda*dot(grad(v), grad(c))*dx
 L = L0 + L1

--- End Message ---