Calculator app improvements

examples/vector_fe/vector_fe_ex6/run.sh

@@ -9,65 +9,65 @@ example_name=vector_fe_ex6
 ### Neumann boundary conditions
 
 options="dim=2 element_type=TRI6 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=TRI7 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=QUAD8 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=QUAD9 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=TRI6 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=TRI7 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=QUAD8 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=QUAD9 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 # Subdividing each hex into 24 tets gets expensive in dbg...
 options="dim=3 element_type=TET14 boundary_condition=neumann grid_size=6"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=3 element_type=HEX27 boundary_condition=neumann"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 ### Dirichlet boundary conditions
 
 options="dim=2 element_type=TRI6 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=TRI7 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=QUAD8 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 element_type=QUAD9 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=TRI6 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=TRI7 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=QUAD8 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=2 order=2 element_type=QUAD9 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 # Subdividing each hex into 24 tets gets expensive in dbg...
 options="dim=3 element_type=TET14 boundary_condition=dirichlet grid_size=6"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"
 
 options="dim=3 element_type=HEX27 boundary_condition=dirichlet"
-run_example_no_extra_options "$example_name" "$options"
+run_example "$example_name" "$options"

examples/vector_fe/vector_fe_ex9/hdg_problem.C

@@ -175,17 +175,17 @@ HDGProblem::vector_volume_jacobian(DenseMatrix<Number> & Jqq, DenseMatrix<Number
     }
 }
 
-RealVectorValue
+NumberVectorValue
 HDGProblem::vel_cross_vel_residual(const std::vector<Number> & u_sol_local,
                                    const std::vector<Number> & v_sol_local,
                                    const unsigned int qp,
                                    const unsigned int vel_component) const
 {
-  const RealVectorValue U(u_sol_local[qp], v_sol_local[qp]);
+  const NumberVectorValue U(u_sol_local[qp], v_sol_local[qp]);
   return U * U(vel_component);
 }
 
-RealVectorValue
+NumberVectorValue
 HDGProblem::vel_cross_vel_jacobian(const std::vector<Number> & u_sol_local,
                                    const std::vector<Number> & v_sol_local,
                                    const unsigned int qp,
@@ -194,8 +194,8 @@ HDGProblem::vel_cross_vel_jacobian(const std::vector<Number> & u_sol_local,
                                    const std::vector<std::vector<Real>> & phi,
                                    const unsigned int j) const
 {
-  const RealVectorValue U(u_sol_local[qp], v_sol_local[qp]);
-  RealVectorValue vector_phi_local;
+  const NumberVectorValue U(u_sol_local[qp], v_sol_local[qp]);
+  NumberVectorValue vector_phi_local;
   vector_phi_local(vel_j_component) = phi[j][qp];
   auto ret = vector_phi_local * U(vel_component);
   if (vel_component == vel_j_component)
@@ -318,11 +318,11 @@ HDGProblem::pressure_volume_jacobian(DenseMatrix<Number> & Jpu,
       for (const auto j : make_range(scalar_n_dofs))
       {
         {
-          const Gradient phi((*scalar_phi)[j][qp], 0);
+          const Gradient phi((*scalar_phi)[j][qp], Number(0));
           Jpu(i, j) -= (*JxW)[qp] * ((*grad_scalar_phi)[i][qp] * phi);
         }
         {
-          const Gradient phi(0, (*scalar_phi)[j][qp]);
+          const Gradient phi(Number(0), (*scalar_phi)[j][qp]);
           Jpv(i, j) -= (*JxW)[qp] * ((*grad_scalar_phi)[i][qp] * phi);
         }
       }
@@ -359,11 +359,11 @@ HDGProblem::pressure_face_jacobian(DenseMatrix<Number> & Jplm_u, DenseMatrix<Num
       for (const auto j : make_range(lm_n_dofs))
       {
         {
-          const Gradient phi((*lm_phi_face)[j][qp], 0);
+          const Gradient phi((*lm_phi_face)[j][qp], Number(0));
           Jplm_u(i, j) += (*JxW_face)[qp] * phi * (*normals)[qp] * (*scalar_phi_face)[i][qp];
         }
         {
-          const Gradient phi(0, (*lm_phi_face)[j][qp]);
+          const Gradient phi(Number(0), (*lm_phi_face)[j][qp]);
           Jplm_v(i, j) += (*JxW_face)[qp] * phi * (*normals)[qp] * (*scalar_phi_face)[i][qp];
         }
       }

examples/vector_fe/vector_fe_ex9/hdg_problem.h

@@ -114,18 +114,18 @@ class HDGProblem : public NonlinearImplicitSystem::ComputeResidual,
 
   void vector_volume_jacobian(DenseMatrix<Number> & Jqq, DenseMatrix<Number> & Jqs);
 
-  RealVectorValue vel_cross_vel_residual(const std::vector<Number> & u_sol_local,
-                                         const std::vector<Number> & v_sol_local,
-                                         const unsigned int qp,
-                                         const unsigned int vel_component) const;
-
-  RealVectorValue vel_cross_vel_jacobian(const std::vector<Number> & u_sol_local,
-                                         const std::vector<Number> & v_sol_local,
-                                         const unsigned int qp,
-                                         const unsigned int vel_component,
-                                         const unsigned int vel_j_component,
-                                         const std::vector<std::vector<Real>> & phi,
-                                         const unsigned int j) const;
+  NumberVectorValue vel_cross_vel_residual(const std::vector<Number> & u_sol_local,
+                                           const std::vector<Number> & v_sol_local,
+                                           const unsigned int qp,
+                                           const unsigned int vel_component) const;
+
+  NumberVectorValue vel_cross_vel_jacobian(const std::vector<Number> & u_sol_local,
+                                           const std::vector<Number> & v_sol_local,
+                                           const unsigned int qp,
+                                           const unsigned int vel_component,
+                                           const unsigned int vel_j_component,
+                                           const std::vector<std::vector<Real>> & phi,
+                                           const unsigned int j) const;
 
   void scalar_volume_residual(const std::vector<Gradient> & vel_gradient,
                               const unsigned int vel_component,

include/Makefile.in

@@ -857,6 +857,7 @@ include_HEADERS = \
         numerics/eigen_preconditioner.h \
         numerics/eigen_sparse_matrix.h \
         numerics/eigen_sparse_vector.h \
+        numerics/fdm_gradient.h \
         numerics/fem_function_base.h \
         numerics/function_base.h \
         numerics/lumped_mass_matrix.h \

include/error_estimation/exact_solution.h

@@ -38,6 +38,7 @@ class EquationSystems;
 class Parameters;
 class Mesh;
 template <typename Output> class FunctionBase;
+template <typename Output> class FEMFunctionBase;
 enum FEMNormType : int;
 
 // Is there any way to simplify this?
@@ -112,13 +113,26 @@ class ExactSolution
    */
   void attach_exact_values (const std::vector<FunctionBase<Number> *> & f);
 
+  /**
+   * Clone and attach arbitrary functors which compute the exact
+   * values of the EquationSystems' solutions at any point.
+   */
+  void attach_exact_values (const std::vector<FEMFunctionBase<Number> *> & f);
+
   /**
    * Clone and attach an arbitrary functor which computes the exact
    * value of the system \p sys_num solution at any point.
    */
   void attach_exact_value (unsigned int sys_num,
                            FunctionBase<Number> * f);
 
+  /**
+   * Clone and attach an arbitrary functor which computes the exact
+   * value of the system \p sys_num solution at any point.
+   */
+  void attach_exact_value (unsigned int sys_num,
+                           FEMFunctionBase<Number> * f);
+
   /**
    * Attach an arbitrary function which computes the exact value of
    * the solution at any point.
@@ -135,13 +149,26 @@ class ExactSolution
    */
   void attach_exact_derivs (const std::vector<FunctionBase<Gradient> *> & g);
 
+  /**
+   * Clone and attach arbitrary functors which compute the exact
+   * gradients of the EquationSystems' solutions at any point.
+   */
+  void attach_exact_derivs (const std::vector<FEMFunctionBase<Gradient> *> & g);
+
   /**
    * Clone and attach an arbitrary functor which computes the exact
    * gradient of the system \p sys_num solution at any point.
    */
   void attach_exact_deriv (unsigned int sys_num,
                            FunctionBase<Gradient> * g);
 
+  /**
+   * Clone and attach an arbitrary functor which computes the exact
+   * gradient of the system \p sys_num solution at any point.
+   */
+  void attach_exact_deriv (unsigned int sys_num,
+                           FEMFunctionBase<Gradient> * g);
+
   /**
    * Attach an arbitrary function which computes the exact gradient of
    * the solution at any point.
@@ -157,6 +184,11 @@ class ExactSolution
    * second derivatives of the EquationSystems' solutions at any point.
    */
   void attach_exact_hessians (std::vector<FunctionBase<Tensor> *> h);
+  /**
+   * Clone and attach arbitrary functors which compute the exact
+   * second derivatives of the EquationSystems' solutions at any point.
+   */
+  void attach_exact_hessians (std::vector<FEMFunctionBase<Tensor> *> h);
 
   /**
    * Clone and attach an arbitrary functor which computes the exact
@@ -165,6 +197,13 @@ class ExactSolution
   void attach_exact_hessian (unsigned int sys_num,
                              FunctionBase<Tensor> * h);
 
+  /**
+   * Clone and attach an arbitrary functor which computes the exact
+   * second derivatives of the system \p sys_num solution at any point.
+   */
+  void attach_exact_hessian (unsigned int sys_num,
+                             FEMFunctionBase<Tensor> * h);
+
   /**
    * Attach an arbitrary function which computes the exact second
    * derivatives of the solution at any point.
@@ -315,19 +354,19 @@ class ExactSolution
    * User-provided functors which compute the exact value of the
    * solution for each system.
    */
-  std::vector<std::unique_ptr<FunctionBase<Number>>> _exact_values;
+  std::vector<std::unique_ptr<FEMFunctionBase<Number>>> _exact_values;
 
   /**
    * User-provided functors which compute the exact derivative of the
    * solution for each system.
    */
-  std::vector<std::unique_ptr<FunctionBase<Gradient>>> _exact_derivs;
+  std::vector<std::unique_ptr<FEMFunctionBase<Gradient>>> _exact_derivs;
 
   /**
    * User-provided functors which compute the exact hessians of the
    * solution for each system.
    */
-  std::vector<std::unique_ptr<FunctionBase<Tensor>>> _exact_hessians;
+  std::vector<std::unique_ptr<FEMFunctionBase<Tensor>>> _exact_hessians;
 
   /**
    * Data structure which stores the errors:

include/include_HEADERS

@@ -257,6 +257,7 @@ include_HEADERS =  \
         numerics/eigen_preconditioner.h \
         numerics/eigen_sparse_matrix.h \
         numerics/eigen_sparse_vector.h \
+        numerics/fdm_gradient.h \
         numerics/fem_function_base.h \
         numerics/function_base.h \
         numerics/lumped_mass_matrix.h \

include/libmesh/Makefile.am

@@ -248,6 +248,7 @@ BUILT_SOURCES = \
         eigen_preconditioner.h \
         eigen_sparse_matrix.h \
         eigen_sparse_vector.h \
+        fdm_gradient.h \
         fem_function_base.h \
         function_base.h \
         laspack_matrix.h \
@@ -1333,6 +1334,9 @@ eigen_sparse_matrix.h: $(top_srcdir)/include/numerics/eigen_sparse_matrix.h
 eigen_sparse_vector.h: $(top_srcdir)/include/numerics/eigen_sparse_vector.h
 	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@
 
+fdm_gradient.h: $(top_srcdir)/include/numerics/fdm_gradient.h
+	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@
+
 fem_function_base.h: $(top_srcdir)/include/numerics/fem_function_base.h
 	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@
 

include/libmesh/Makefile.in

@@ -597,9 +597,9 @@ BUILT_SOURCES = auto_ptr.h dirichlet_boundaries.h dof_map.h \
 	dense_subvector.h dense_vector.h dense_vector_base.h \
 	diagonal_matrix.h distributed_vector.h eigen_core_support.h \
 	eigen_preconditioner.h eigen_sparse_matrix.h \
-	eigen_sparse_vector.h fem_function_base.h function_base.h \
-	laspack_matrix.h laspack_vector.h lumped_mass_matrix.h \
-	numeric_vector.h parsed_fem_function.h \
+	eigen_sparse_vector.h fdm_gradient.h fem_function_base.h \
+	function_base.h laspack_matrix.h laspack_vector.h \
+	lumped_mass_matrix.h numeric_vector.h parsed_fem_function.h \
 	parsed_fem_function_parameter.h parsed_function.h \
 	parsed_function_parameter.h petsc_macro.h petsc_matrix.h \
 	petsc_matrix_base.h petsc_matrix_shell_matrix.h \
@@ -1666,6 +1666,9 @@ eigen_sparse_matrix.h: $(top_srcdir)/include/numerics/eigen_sparse_matrix.h
 eigen_sparse_vector.h: $(top_srcdir)/include/numerics/eigen_sparse_vector.h
 	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@
 
+fdm_gradient.h: $(top_srcdir)/include/numerics/fdm_gradient.h
+	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@
+
 fem_function_base.h: $(top_srcdir)/include/numerics/fem_function_base.h
 	$(AM_V_GEN)rm -f $@ && $(LN_S) -f $< $@