From 065df6a38891a0c94686f85bce7a9a1c1a51b2d6 Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@uio.no>
Date: Fri, 24 Jan 2025 21:29:44 +0100
Subject: [PATCH] [common] Add evalStringExpression to evaluate simple string
math expression with 0 variables
---
dumux/common/functionfromstringexpression.hh | 26 +++++++++++++++++---
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/dumux/common/functionfromstringexpression.hh b/dumux/common/functionfromstringexpression.hh
index f875de467c..805bc1e1ef 100644
--- a/dumux/common/functionfromstringexpression.hh
+++ b/dumux/common/functionfromstringexpression.hh
@@ -91,10 +91,15 @@ private:
template<class RandomAccessContainer>
Scalar evalRandomAcessImpl_(const RandomAccessContainer& params) const
{
- std::lock_guard lock(evalMutex_);
- for (std::size_t i = 0; i < numVars; ++i)
- variables_[i] = params[i];
- return expression_.value();
+ if constexpr (numVars > 0)
+ {
+ std::lock_guard lock(evalMutex_);
+ for (std::size_t i = 0; i < numVars; ++i)
+ variables_[i] = params[i];
+ return expression_.value();
+ }
+ else
+ return expression_.value();
}
template<std::size_t... I>
@@ -154,6 +159,19 @@ private:
mutable std::mutex evalMutex_;
};
+/*!
+ * \ingroup Core
+ * \brief Evaluating simple string math expressions
+ * \tparam Scalar type of expression evaluation result
+ */
+template<class Scalar = double>
+Scalar evalStringExpression(const std::string& expression, int verbosity = 0)
+{
+ FunctionFromStringExpression<0, Scalar> f{ expression, "" };
+ f.setVerbosity(verbosity);
+ return f();
+}
+
} // end namespace Dumux
#endif
--
GitLab