OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-29 10:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

[parameters] restore full functionality of getting parameters

Browse Source
This commit is contained in:
Bernd Flemisch 2020-05-19 13:52:34 +02:00
parent 4c3bd69687
commit 196e0b9b9b
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,12 +115,12 @@
* \endcode * \endcode
*/ */
#define EWOMS_GET_PARAM(TypeTag, ParamType, ParamName) \ #define EWOMS_GET_PARAM(TypeTag, ParamType, ParamName) \
(::Opm::Parameters::get<TypeTag, ParamType>(#ParamName, \ (::Opm::Parameters::get<TypeTag, ParamType>(#ParamName, #ParamName, \
GET_PROP_VALUE(TypeTag, ParamName))) GET_PROP_VALUE(TypeTag, ParamName)))
//!\cond SKIP_THIS //!\cond SKIP_THIS
#define EWOMS_GET_PARAM_(TypeTag, ParamType, ParamName) \ #define EWOMS_GET_PARAM_(TypeTag, ParamType, ParamName) \
(::Opm::Parameters::get<TypeTag, ParamType>(#ParamName, \ (::Opm::Parameters::get<TypeTag, ParamType>(#ParamName, #ParamName, \
GET_PROP_VALUE(TypeTag, ParamName), \ GET_PROP_VALUE(TypeTag, ParamName), \
/*errorIfNotRegistered=*/false)) /*errorIfNotRegistered=*/false))
@ -180,7 +180,8 @@ const ParamType get(const char *propTagName,
const char *paramName, const char *paramName,
bool errorIfNotRegistered = true); bool errorIfNotRegistered = true);
template <class TypeTag, class ParamType> template <class TypeTag, class ParamType>
const ParamType get(const char *paramName, const ParamType get(const char *propTagName,
const char *paramName,
const ParamType& defaultValue, const ParamType& defaultValue,
bool errorIfNotRegistered = true); bool errorIfNotRegistered = true);
@ -206,7 +207,8 @@ public:
// retrieve the parameter once to make sure that its value does // retrieve the parameter once to make sure that its value does
// not contain a syntax error. // not contain a syntax error.
ParamType __attribute__((unused)) dummy = ParamType __attribute__((unused)) dummy =
get<TypeTag, ParamType>(paramName_.data(), get<TypeTag, ParamType>(/*propTagName=*/paramName_.data(),
paramName_.data(),
defaultValue_, defaultValue_,
/*errorIfNotRegistered=*/true); /*errorIfNotRegistered=*/true);
} }
@ -952,15 +954,16 @@ public:
const char *paramName, const char *paramName,
bool errorIfNotRegistered = true) bool errorIfNotRegistered = true)
{ {
return retrieve_<ParamType>(paramName, getPropValue<TypeTag, PropTag>(), errorIfNotRegistered); return retrieve_<ParamType>(propTagName, paramName, getPropValue<TypeTag, PropTag>(), errorIfNotRegistered);
} }
template <class ParamType> template <class ParamType>
static ParamType get(const char *paramName, static ParamType get(const char *propTagName,
const char *paramName,
const ParamType& defaultValue, const ParamType& defaultValue,
bool errorIfNotRegistered = true) bool errorIfNotRegistered = true)
{ {
return retrieve_<ParamType>(paramName, defaultValue, errorIfNotRegistered); return retrieve_<ParamType>(propTagName, paramName, defaultValue, errorIfNotRegistered);
} }
static void clear() static void clear()
@ -1047,7 +1050,8 @@ private:
} }
template <class ParamType> template <class ParamType>
static ParamType retrieve_(const char *paramName, static ParamType retrieve_(const char OPM_OPTIM_UNUSED *propTagName,
const char *paramName,
const ParamType& defaultValue, const ParamType& defaultValue,
bool errorIfNotRegistered = true) bool errorIfNotRegistered = true)
{ {
@ -1090,9 +1094,9 @@ const ParamType get(const char *propTagName, const char *paramName, bool errorIf
} }
template <class TypeTag, class ParamType> template <class TypeTag, class ParamType>
const ParamType get(const char *paramName, const ParamType& defaultValue, bool errorIfNotRegistered) const ParamType get(const char *propTagName, const char *paramName, const ParamType& defaultValue, bool errorIfNotRegistered)
{ {
return Param<TypeTag>::template get<ParamType>(paramName, defaultValue, errorIfNotRegistered); return Param<TypeTag>::template get<ParamType>(propTagName, paramName, defaultValue, errorIfNotRegistered);
} }
template <class TypeTag, class Container> template <class TypeTag, class Container>