(a) specifying element range in project_solution as well (b) add a test to project solution onto specific elements

Author: ChengHauYang

include/systems/system.h

@@ -515,19 +515,25 @@ class System : public ReferenceCountedObject<System>,
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    */
   void project_solution (FunctionBase<Number> * f,
-                         FunctionBase<Gradient> * g = nullptr) const;
+                         FunctionBase<Gradient> * g = nullptr,
+                         std::optional<ConstElemRange> active_local_range = std::nullopt) const;
 
   /**
    * Projects arbitrary functions onto the current solution.
    * The function value \p f and its gradient \p g are
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    */
   void project_solution (FEMFunctionBase<Number> * f,
-                         FEMFunctionBase<Gradient> * g = nullptr) const;
+                         FEMFunctionBase<Gradient> * g = nullptr,
+                         std::optional<ConstElemRange> active_local_range = std::nullopt) const;
 
   /**
    * Projects arbitrary functions onto the current solution.
@@ -546,7 +552,8 @@ class System : public ReferenceCountedObject<System>,
                                               const std::string & unknown_name);
   void project_solution (ValueFunctionPointer fptr,
                          GradientFunctionPointer gptr,
-                         const Parameters & parameters) const;
+                         const Parameters & parameters,
+                         std::optional<ConstElemRange> active_local_range = std::nullopt) const;
 
   /**
    * Projects arbitrary functions onto a vector of degree of freedom
@@ -555,6 +562,8 @@ class System : public ReferenceCountedObject<System>,
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    *
    * Constrain the new vector using the requested adjoint rather than
    * primal constraints if is_adjoint is non-negative.
@@ -572,6 +581,8 @@ class System : public ReferenceCountedObject<System>,
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    *
    * Constrain the new vector using the requested adjoint rather than
    * primal constraints if is_adjoint is non-negative.
@@ -589,6 +600,8 @@ class System : public ReferenceCountedObject<System>,
    * represented by function pointers.
    * A gradient \p gptr is only required/used for projecting onto
    * finite element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    *
    * Constrain the new vector using the requested adjoint rather than
    * primal constraints if is_adjoint is non-negative.
@@ -611,11 +624,14 @@ class System : public ReferenceCountedObject<System>,
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    */
   void boundary_project_solution (const std::set<boundary_id_type> & b,
                                   const std::vector<unsigned int> & variables,
                                   FunctionBase<Number> * f,
-                                  FunctionBase<Gradient> * g = nullptr);
+                                  FunctionBase<Gradient> * g = nullptr,
+                                  std::optional<ConstElemRange> active_local_range = std::nullopt);
 
   /**
    * Projects arbitrary boundary functions onto a vector of degree of
@@ -628,12 +644,15 @@ class System : public ReferenceCountedObject<System>,
    * represented by function pointers.
    * A gradient \p gptr is only required/used for projecting onto
    * finite element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    */
   void boundary_project_solution (const std::set<boundary_id_type> & b,
                                   const std::vector<unsigned int> & variables,
                                   ValueFunctionPointer fptr,
                                   GradientFunctionPointer gptr,
-                                  const Parameters & parameters);
+                                  const Parameters & parameters,
+                                  std::optional<ConstElemRange> active_local_range = std::nullopt);
 
   /**
    * Projects arbitrary boundary functions onto a vector of degree of
@@ -646,6 +665,8 @@ class System : public ReferenceCountedObject<System>,
    * user-provided cloneable functors.
    * A gradient \p g is only required/used for projecting onto finite
    * element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    *
    * Constrain the new vector using the requested adjoint rather than
    * primal constraints if is_adjoint is non-negative.
@@ -669,6 +690,8 @@ class System : public ReferenceCountedObject<System>,
    * represented by function pointers.
    * A gradient \p gptr is only required/used for projecting onto
    * finite element spaces with continuous derivatives.
+   * elem_range \p active_local_range, if provided, indicates the range of elements
+   * over which to perform the projection.
    *
    * Constrain the new vector using the requested adjoint rather than
    * primal constraints if is_adjoint is non-negative.

src/systems/system_projection.C

@@ -1031,11 +1031,12 @@ void System::projection_matrix (SparseMatrix<Number> & proj_mat) const
  */
 void System::project_solution (ValueFunctionPointer fptr,
                                GradientFunctionPointer gptr,
-                               const Parameters & function_parameters) const
+                               const Parameters & function_parameters,
+                               std::optional<ConstElemRange> active_local_range) const
 {
   WrappedFunction<Number> f(*this, fptr, &function_parameters);
   WrappedFunction<Gradient> g(*this, gptr, &function_parameters);
-  this->project_solution(&f, &g);
+  this->project_solution(&f, &g, active_local_range);
 }
 
 
@@ -1044,9 +1045,10 @@ void System::project_solution (ValueFunctionPointer fptr,
  * projections and nodal interpolations on each element.
  */
 void System::project_solution (FunctionBase<Number> * f,
-                               FunctionBase<Gradient> * g) const
+                               FunctionBase<Gradient> * g,
+                               std::optional<ConstElemRange> active_local_range) const
 {
-  this->project_vector(*solution, f, g);
+  this->project_vector(*solution, f, g, /*is_adjoint=*/-1, active_local_range);
 
   solution->localize(*current_local_solution, _dof_map->get_send_list());
 }
@@ -1057,9 +1059,10 @@ void System::project_solution (FunctionBase<Number> * f,
  * projections and nodal interpolations on each element.
  */
 void System::project_solution (FEMFunctionBase<Number> * f,
-                               FEMFunctionBase<Gradient> * g) const
+                               FEMFunctionBase<Gradient> * g,
+                               std::optional<ConstElemRange> active_local_range) const
 {
-  this->project_vector(*solution, f, g);
+  this->project_vector(*solution, f, g, /*is_adjoint=*/-1, active_local_range);
 
   solution->localize(*current_local_solution, _dof_map->get_send_list());
 }
@@ -1248,11 +1251,13 @@ void System::boundary_project_solution (const std::set<boundary_id_type> & b,
                                         const std::vector<unsigned int> & variables,
                                         ValueFunctionPointer fptr,
                                         GradientFunctionPointer gptr,
-                                        const Parameters & function_parameters)
+                                        const Parameters & function_parameters,
+                                        std::optional<ConstElemRange> active_local_range)
+
 {
   WrappedFunction<Number> f(*this, fptr, &function_parameters);
   WrappedFunction<Gradient> g(*this, gptr, &function_parameters);
-  this->boundary_project_solution(b, variables, &f, &g);
+  this->boundary_project_solution(b, variables, &f, &g, active_local_range);
 }
 
 
@@ -1264,9 +1269,10 @@ void System::boundary_project_solution (const std::set<boundary_id_type> & b,
 void System::boundary_project_solution (const std::set<boundary_id_type> & b,
                                         const std::vector<unsigned int> & variables,
                                         FunctionBase<Number> * f,
-                                        FunctionBase<Gradient> * g)
+                                        FunctionBase<Gradient> * g,
+                                        std::optional<ConstElemRange> active_local_range)
 {
-  this->boundary_project_vector(b, variables, *solution, f, g);
+  this->boundary_project_vector(b, variables, *solution, f, g, -1 /*is_adjoint*/, active_local_range);
 
   solution->localize(*current_local_solution);
 }

tests/Makefile.am

@@ -94,6 +94,7 @@ unit_tests_sources = \
   mesh/write_nodeset_data.C \
   mesh/write_edgeset_data.C \
   mesh/write_vec_and_scalar.C \
+  mesh/project_solution_test.C \
   numerics/composite_function_test.C \
   numerics/coupling_matrix_test.C \
   numerics/distributed_vector_test.C \