OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/models/discretization/ecfv/ecfvdiscretization.hh
View File

@ -59,7 +59,7 @@ private:
using GridView = GetPropType<TypeTag, Properties::GridView>;
public:
using type = Opm::EcfvStencil<Scalar, GridView>;
using type = EcfvStencil<Scalar, GridView>;
};
//! Mapper for the degrees of freedoms.
@ -68,18 +68,18 @@ struct DofMapper<TypeTag, TTag::EcfvDiscretization> { using type = GetPropType<T
//! The concrete class which manages the spatial discretization
template<class TypeTag>
struct Discretization<TypeTag, TTag::EcfvDiscretization> { using type = Opm::EcfvDiscretization<TypeTag>; };
struct Discretization<TypeTag, TTag::EcfvDiscretization> { using type = EcfvDiscretization<TypeTag>; };
//! The base class for the output modules (decides whether to write
//! element or vertex based fields)
template<class TypeTag>
struct DiscBaseOutputModule<TypeTag, TTag::EcfvDiscretization>
{ using type = Opm::EcfvBaseOutputModule<TypeTag>; };
{ using type = EcfvBaseOutputModule<TypeTag>; };
//! The class to create grid communication handles
template<class TypeTag>
struct GridCommHandleFactory<TypeTag, TTag::EcfvDiscretization>
{ using type = Opm::EcfvGridCommHandleFactory<TypeTag>; };
{ using type = EcfvGridCommHandleFactory<TypeTag>; };
#if HAVE_DUNE_FEM
//! Set the DiscreteFunctionSpace
@ -107,7 +107,7 @@ struct BorderListCreator<TypeTag, TTag::EcfvDiscretization>
using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
using GridView = GetPropType<TypeTag, Properties::GridView>;
public:
using type = Opm::Linear::ElementBorderListFromGrid<GridView, ElementMapper>;
using type = Linear::ElementBorderListFromGrid<GridView, ElementMapper>;
};
//! For the element centered finite volume method, ghost and overlap elements must be

4
opm/models/discretization/ecfv/ecfvstencil.hh
View File

@ -206,8 +206,8 @@ public:
{ return area_; }
private:
Opm::ConditionalStorage<needIntegrationPos, GlobalPosition> integrationPos_;
Opm::ConditionalStorage<needNormal, WorldVector> normal_;
ConditionalStorage<needIntegrationPos, GlobalPosition> integrationPos_;
ConditionalStorage<needNormal, WorldVector> normal_;
Scalar area_;
unsigned short exteriorIdx_;

14
opm/models/io/vtkmultiwriter.hh
View File

@ -88,7 +88,7 @@ class VtkMultiWriter : public BaseOutputWriter
// determine name to write into the multi-file for the
// current time step
// The file names in the pvd file are relative, the path should therefore be stripped.
const Opm::filesystem::path fullPath{fileName};
const filesystem::path fullPath{fileName};
const std::string localFileName = fullPath.filename();
multiWriter_.multiFile_.precision(16);
multiWriter_.multiFile_ << " <DataSet timestep=\"" << multiWriter_.curTime_ << "\" file=\""
@ -239,7 +239,7 @@ public:
{
sanitizeScalarBuffer_(buf);
using VtkFn = Opm::VtkScalarFunction<GridView, VertexMapper>;
using VtkFn = VtkScalarFunction<GridView, VertexMapper>;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
vertexMapper_,
@ -267,7 +267,7 @@ public:
{
sanitizeScalarBuffer_(buf);
using VtkFn = Opm::VtkScalarFunction<GridView, ElementMapper>;
using VtkFn = VtkScalarFunction<GridView, ElementMapper>;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
elementMapper_,
@ -296,7 +296,7 @@ public:
{
sanitizeVectorBuffer_(buf);
using VtkFn = Opm::VtkVectorFunction<GridView, VertexMapper>;
using VtkFn = VtkVectorFunction<GridView, VertexMapper>;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
vertexMapper_,
@ -310,7 +310,7 @@ public:
*/
void attachTensorVertexData(TensorBuffer& buf, std::string name)
{
using VtkFn = Opm::VtkTensorFunction<GridView, VertexMapper>;
using VtkFn = VtkTensorFunction<GridView, VertexMapper>;
for (unsigned colIdx = 0; colIdx < buf[0].N(); ++colIdx) {
std::ostringstream oss;
@ -345,7 +345,7 @@ public:
{
sanitizeVectorBuffer_(buf);
using VtkFn = Opm::VtkVectorFunction<GridView, ElementMapper>;
using VtkFn = VtkVectorFunction<GridView, ElementMapper>;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
elementMapper_,
@ -359,7 +359,7 @@ public:
*/
void attachTensorElementData(TensorBuffer& buf, std::string name)
{
using VtkFn = Opm::VtkTensorFunction<GridView, ElementMapper>;
using VtkFn = VtkTensorFunction<GridView, ElementMapper>;
for (unsigned colIdx = 0; colIdx < buf[0].N(); ++colIdx) {
std::ostringstream oss;

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