OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #894 from akva2/parameters_isset_struct

Browse Source 
Parameters::isSet: pass parameter struct instead of stringified
This commit is contained in:
Bård Skaflestad 2024-04-15 11:14:35 +02:00 committed by GitHub
commit f105a3a446
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
opm/models/utils/parametersystem.hh
View File

@ -880,15 +880,18 @@ public:
*
* If the parameter in question has not been registered, this throws an exception.
*/
template <class ParamType>
static bool isSet(const char* paramName,
bool errorIfNotRegistered = true)
template <template<class,class> class Param>
static bool isSet(bool errorIfNotRegistered = true)
{
const std::string paramName = getPropName<TypeTag,Param>();
#ifndef NDEBUG
// make sure that the parameter is used consistently. since
// this is potentially quite expensive, it is only done if
// debugging code is not explicitly turned off.
const auto defaultValue = getPropValue<TypeTag,Param>();
using ParamType = std::conditional_t<std::is_same_v<decltype(defaultValue),
const char* const>, std::string,
std::remove_const_t<decltype(defaultValue)>>;
check_(Dune::className<ParamType>(), paramName);
#endif
@ -902,13 +905,10 @@ public:
+" without prior registration is not allowed.");
}
std::string canonicalName(paramName);
// check whether the parameter is in the parameter tree
return ParamsMeta::tree().hasKey(canonicalName);
return ParamsMeta::tree().hasKey(paramName);
}
private:
struct Blubb
{
@ -1033,11 +1033,10 @@ void reset()
return Param<TypeTag>::clear();
}
template <class TypeTag, class ParamType>
bool isSet(const char* paramName, bool errorIfNotRegistered = true)
template <class TypeTag, template<class, class> class Property>
bool isSet(bool errorIfNotRegistered = true)
{
return Param<TypeTag>::template isSet<ParamType>(paramName,
errorIfNotRegistered);
return Param<TypeTag>::template isSet<Property>(errorIfNotRegistered);
}
/*!