Make fem::Form stateless

cpp/demo/hyperelasticity/main.cpp

@@ -125,9 +125,10 @@ int main(int argc, char* argv[])
     // Define solution function
     auto u = std::make_shared<function::Function<PetscScalar>>(V);
 
-    auto a
-        = fem::create_form<PetscScalar>(create_form_hyperelasticity_J, {V, V});
-    auto L = fem::create_form<PetscScalar>(create_form_hyperelasticity_F, {V});
+    auto a = fem::create_form<PetscScalar>(create_form_hyperelasticity_J,
+                                           {V, V}, {{"u", u}}, {}, {});
+    auto L = fem::create_form<PetscScalar>(create_form_hyperelasticity_F, {V},
+                                           {{"u", u}}, {}, {});
 
     auto u_rotation = std::make_shared<function::Function<PetscScalar>>(V);
     u_rotation->interpolate([](auto& x) {
@@ -165,9 +166,6 @@ int main(int argc, char* argv[])
                           Eigen::RowMajor>::Zero(3, x.cols());
     });
 
-    L->set_coefficients({{"u", u}});
-    a->set_coefficients({{"u", u}});
-
     // Create Dirichlet boundary conditions
     auto u0 = std::make_shared<function::Function<PetscScalar>>(V);
 

cpp/demo/poisson/main.cpp

@@ -134,13 +134,18 @@ int main(int argc, char* argv[])
     //
     // .. code-block:: cpp
 
-    // Define variational forms
-    auto a = fem::create_form<PetscScalar>(create_form_poisson_a, {V, V});
-    auto L = fem::create_form<PetscScalar>(create_form_poisson_L, {V});
+    // Prepare and set Constants for the bilinear form
+    auto kappa = std::make_shared<function::Constant<PetscScalar>>(2.0);
 
     auto f = std::make_shared<function::Function<PetscScalar>>(V);
     auto g = std::make_shared<function::Function<PetscScalar>>(V);
 
+    // Define variational forms
+    auto a = fem::create_form<PetscScalar>(create_form_poisson_a, {V, V}, {},
+                                           {{"kappa", kappa}}, {});
+    auto L = fem::create_form<PetscScalar>(create_form_poisson_L, {V},
+                                           {{"f", f}, {"g", g}}, {}, {});
+
     // Now, the Dirichlet boundary condition (:math:`u = 0`) can be created
     // using the class :cpp:class:`DirichletBC`. A :cpp:class:`DirichletBC`
     // takes two arguments: the value of the boundary condition,
@@ -173,11 +178,6 @@ int main(int argc, char* argv[])
     });
 
     g->interpolate([](auto& x) { return Eigen::sin(5 * x.row(0)); });
-    L->set_coefficients({{"f", f}, {"g", g}});
-
-    // Prepare and set Constants for the bilinear form
-    auto kappa = std::make_shared<function::Constant<PetscScalar>>(2.0);
-    a->set_constants({{"kappa", kappa}});
 
     // Now, we have specified the variational forms and can consider the
     // solution of the variational problem. First, we need to define a

cpp/dolfinx/fem/CMakeLists.txt

@@ -15,8 +15,6 @@ set(HEADERS_fem
   ${CMAKE_CURRENT_SOURCE_DIR}/utils.h
   ${CMAKE_CURRENT_SOURCE_DIR}/FiniteElement.h
   ${CMAKE_CURRENT_SOURCE_DIR}/Form.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/FormCoefficients.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/FormIntegrals.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ReferenceCellGeometry.h
   ${CMAKE_CURRENT_SOURCE_DIR}/SparsityPatternBuilder.h
   PARENT_SCOPE)