OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove macro EWOMS_GET_PARAM_

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-04-05 10:27:52 +02:00
parent fe06454112
commit 4d2486196f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,6 @@
#define EWOMS_GET_PARAM(TypeTag, ParamType, ParamName) \ #define EWOMS_GET_PARAM(TypeTag, ParamType, ParamName) \
(::Opm::Parameters::get<TypeTag, Properties::ParamName>()) (::Opm::Parameters::get<TypeTag, Properties::ParamName>())
//!\cond SKIP_THIS
#define EWOMS_GET_PARAM_(TypeTag, ParamType, ParamName) \
(::Opm::Parameters::get<TypeTag, Properties::ParamName>(false))
namespace Opm { namespace Opm {
namespace Parameters { namespace Parameters {

4
opm/models/utils/start.hh
View File

@ -150,8 +150,8 @@ static inline int setupParameters_(int argc,
return status; return status;
} }
std::string paramFileName = EWOMS_GET_PARAM_(TypeTag, std::string, ParameterFile); const std::string paramFileName = Parameters::get<TypeTag, Properties::ParameterFile>(false);
if (paramFileName != "") { if (!paramFileName.empty()) {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// add the parameters specified using an .ini file // add the parameters specified using an .ini file
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////