Merge pull request #614 from bwirthl/add-magnet-functions

Add magnet functions to scatra

Author: bwirthl

src/core/utils/src/functions/4C_utils_function.hpp

@@ -15,6 +15,7 @@
 #include "4C_utils_functionvariables.hpp"
 
 #include <memory>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -51,6 +52,23 @@ namespace Core::Utils
      */
     virtual double evaluate(const double* x, double t, std::size_t component) const = 0;
 
+    /*!
+     * @brief Vector-valued evaluation of time and space dependent function
+     *
+     * Evaluate the function at the specified position and point in time and return the vector of
+     * all components.
+     *
+     * @param x the point in 3-dimensional space in which the function will be evaluated
+     * @param t the point in time in which the function will be evaluated
+     * @param values function values
+     */
+    virtual void evaluate_vector(
+        const std::span<const double, 3> x, double t, std::span<double> values) const
+    {
+      for (std::size_t i = 0; i < number_components(); ++i) values[i] = evaluate(x.data(), t, i);
+    }
+
+
     /*!
      * \brief Evaluation of first spatial derivative of time and space dependent function
      *
@@ -64,8 +82,6 @@ namespace Core::Utils
         const double* x, double t, std::size_t component) const
     {
       FOUR_C_THROW("The evaluation of the derivative is not implemented for this function");
-      std::vector<double> emptyvector;
-      return emptyvector;
     };
 
     /*!
@@ -85,8 +101,6 @@ namespace Core::Utils
         const double* x, double t, unsigned deg, std::size_t component) const
     {
       FOUR_C_THROW("The evaluation of the time derivative is not implemented for this function");
-      std::vector<double> emptyvector;
-      return emptyvector;
     };
 
     /// Return number of components of function

src/global_legacy_module/4C_global_legacy_module.cpp

@@ -113,6 +113,7 @@
 #include "4C_red_airways_elementbase.hpp"
 #include "4C_rigidsphere.hpp"
 #include "4C_scatra_ele.hpp"
+#include "4C_scatra_functions.hpp"
 #include "4C_shell7p_ele.hpp"
 #include "4C_shell7p_ele_scatra.hpp"
 #include "4C_shell_kl_nurbs.hpp"
@@ -289,6 +290,7 @@ namespace
     Discret::Utils::add_valid_xfluid_functions(function_manager);
     add_valid_library_functions(function_manager);
     PoroMultiPhaseScaTra::add_valid_poro_functions(function_manager);
+    ScaTra::add_valid_scatra_functions(function_manager);
   }
 
   Core::IO::InputSpec valid_result_lines()