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

fixed: do not use Opm:: prefix when inside namespace Opm

Browse Source
This commit is contained in:
Arne Morten Kvarving
2021-05-05 09:50:05 +02:00
parent 075d9223ce
commit d049cdd59d
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/models/utils/pffgridvector.hh
View File

@@ -96,7 +96,7 @@ public:
// we use 0 as the temporal locality, because it is reasonable to assume that an
// entry will only be accessed once.
Opm::prefetch</*temporalLocality=*/0>(elemData_[elemIdx]);
::Opm::prefetch</*temporalLocality=*/0>(elemData_[elemIdx]);
}
const Data& get(const Element& elem, unsigned localDofIdx) const

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

@@ -296,7 +296,7 @@ static inline int start(int argc, char **argv, bool registerParams=true)
signal(SIGTERM, resetTerminal_);
}
Opm::resetLocale();
resetLocale();
int myRank = 0;
try
@@ -362,20 +362,20 @@ static inline int start(int argc, char **argv, bool registerParams=true)
if (printParams) {
bool printSeparator = false;
if (printParams == 1 || !isatty(fileno(stdout))) {
Opm::Parameters::printValues<TypeTag>();
Parameters::printValues<TypeTag>();
printSeparator = true;
}
else
// always print the list of specified but unused parameters
printSeparator =
printSeparator ||
Opm::Parameters::printUnused<TypeTag>();
Parameters::printUnused<TypeTag>();
if (printSeparator)
std::cout << endParametersSeparator;
}
else
// always print the list of specified but unused parameters
if (Opm::Parameters::printUnused<TypeTag>())
if (Parameters::printUnused<TypeTag>())
std::cout << endParametersSeparator;
}
@@ -383,7 +383,7 @@ static inline int start(int argc, char **argv, bool registerParams=true)
int printProps = EWOMS_GET_PARAM(TypeTag, int, PrintProperties);
if (printProps && myRank == 0) {
if (printProps == 1 || !isatty(fileno(stdout)))
Opm::Properties::printValues<TypeTag>();
Properties::printValues<TypeTag>();
}
// instantiate and run the concrete problem. make sure to