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 some Opm:: qualifiers inside Opm namespace

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-05-18 08:35:47 +02:00
parent 5fa02055d4
commit 8c34172ef0
7 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/ebos_altidx.cc
View File

@ -50,7 +50,7 @@ struct FluidSystem<TypeTag, TTag::EbosAltIdxTypeTag>
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
public: public:
typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type; typedef BlackOilFluidSystem<Scalar, EclAlternativeBlackOilIndexTraits> type;
}; };
} // namespace Opm::Properties } // namespace Opm::Properties

16
ebos/ebos_gasoil.cc
View File

@ -50,14 +50,14 @@ private:
using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(), typedef BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
getPropValue<TypeTag, Properties::EnableExtbo>(), getPropValue<TypeTag, Properties::EnableExtbo>(),
getPropValue<TypeTag, Properties::EnablePolymer>(), getPropValue<TypeTag, Properties::EnablePolymer>(),
getPropValue<TypeTag, Properties::EnableEnergy>(), getPropValue<TypeTag, Properties::EnableEnergy>(),
getPropValue<TypeTag, Properties::EnableFoam>(), getPropValue<TypeTag, Properties::EnableFoam>(),
getPropValue<TypeTag, Properties::EnableBrine>(), getPropValue<TypeTag, Properties::EnableBrine>(),
/*PVOffset=*/0, /*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::waterCompIdx> type; /*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
}; };
} // namespace Opm::Properties } // namespace Opm::Properties

8
ebos/ebos_solvent.cc
View File

@ -48,9 +48,9 @@ struct EnableSolvent<TypeTag, TTag::EbosSolventTypeTag> {
namespace Opm { namespace Opm {
void ebosSolventSetDeck(std::unique_ptr<Opm::Deck> deck, void ebosSolventSetDeck(std::unique_ptr<Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext, std::unique_ptr<ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard, std::unique_ptr<ErrorGuard> errorGuard,
double externalSetupTime) double externalSetupTime)
{ {
using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag; using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
@ -65,7 +65,7 @@ void ebosSolventSetDeck(std::unique_ptr<Opm::Deck> deck,
int ebosSolventMain(int argc, char **argv) int ebosSolventMain(int argc, char **argv)
{ {
using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag; using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
return Opm::startEbos<ProblemTypeTag>(argc, argv); return startEbos<ProblemTypeTag>(argc, argv);
} }
} }

6
flow/flow_ebos_blackoil.cpp
View File

@ -45,12 +45,12 @@ void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
Vanguard::setExternalSummaryConfig(std::move(summaryConfig)); Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
} }
std::unique_ptr<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>> std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblem>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles) flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
{ {
// we always want to use the default locale, and thus spare us the trouble // we always want to use the default locale, and thus spare us the trouble
// with incorrect locale settings. // with incorrect locale settings.
Opm::resetLocale(); resetLocale();
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv); Dune::Fem::MPIManager::initialize(argc, argv);
@ -58,7 +58,7 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
Dune::MPIHelper::instance(argc, argv); Dune::MPIHelper::instance(argc, argv);
#endif #endif
return std::make_unique<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>( return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblem>>(
argc, argv, outputCout, outputFiles); argc, argv, outputCout, outputFiles);
} }

5
flow/flow_onephase.cpp
View File

@ -42,15 +42,14 @@ private:
using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>; using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
public: public:
typedef Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(), using type = BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
getPropValue<TypeTag, Properties::EnableExtbo>(), getPropValue<TypeTag, Properties::EnableExtbo>(),
getPropValue<TypeTag, Properties::EnablePolymer>(), getPropValue<TypeTag, Properties::EnablePolymer>(),
getPropValue<TypeTag, Properties::EnableEnergy>(), getPropValue<TypeTag, Properties::EnableEnergy>(),
getPropValue<TypeTag, Properties::EnableFoam>(), getPropValue<TypeTag, Properties::EnableFoam>(),
getPropValue<TypeTag, Properties::EnableBrine>(), getPropValue<TypeTag, Properties::EnableBrine>(),
/*PVOffset=*/0, /*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx> /*enabledCompIdx=*/FluidSystem::waterCompIdx>;
type;
}; };
} // namespace Opm::Properties } // namespace Opm::Properties

4
opm/simulators/utils/ParallelEclipseState.hpp
View File

@ -103,8 +103,8 @@ public:
void deserialize_tran(const std::vector<char>& buffer) override; void deserialize_tran(const std::vector<char>& buffer) override;
protected: protected:
std::map<std::string, Opm::Fieldprops::FieldData<int>> m_intProps; //!< Map of integer properties in process-local compressed indices. std::map<std::string, Fieldprops::FieldData<int>> m_intProps; //!< Map of integer properties in process-local compressed indices.
std::map<std::string, Opm::Fieldprops::FieldData<double>> m_doubleProps; //!< Map of double properties in process-local compressed indices. std::map<std::string, Fieldprops::FieldData<double>> m_doubleProps; //!< Map of double properties in process-local compressed indices.
FieldPropsManager& m_manager; //!< Underlying field property manager (only used on root process). FieldPropsManager& m_manager; //!< Underlying field property manager (only used on root process).
Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> m_comm; //!< Collective communication handler. Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> m_comm; //!< Collective communication handler.
std::function<int(void)> m_activeSize; //!< active size function of the grid std::function<int(void)> m_activeSize; //!< active size function of the grid

6
opm/simulators/utils/ParallelRestart.hpp
View File

@ -348,13 +348,13 @@ ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Opm::time_point) ADD_PACK_PROTOTYPES(time_point)
} // end namespace Mpi } // end namespace Mpi
RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionState, SummaryState& summaryState, RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionState, SummaryState& summaryState,
const std::vector<Opm::RestartKey>& solutionKeys, const std::vector<RestartKey>& solutionKeys,
const std::vector<Opm::RestartKey>& extraKeys, const std::vector<RestartKey>& extraKeys,
Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> comm); Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> comm);
} // end namespace Opm } // end namespace Opm