From 8c34172ef055c8cf1490f5af6f4743f439ef32de Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 18 May 2021 08:35:47 +0200
Subject: [PATCH] remove some Opm:: qualifiers inside Opm namespace

---
 ebos/ebos_altidx.cc                           |  2 +-
 ebos/ebos_gasoil.cc                           | 16 ++++++++--------
 ebos/ebos_solvent.cc                          |  8 ++++----
 flow/flow_ebos_blackoil.cpp                   |  6 +++---
 flow/flow_onephase.cpp                        |  5 ++---
 opm/simulators/utils/ParallelEclipseState.hpp |  4 ++--
 opm/simulators/utils/ParallelRestart.hpp      |  6 +++---
 7 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ebos/ebos_altidx.cc b/ebos/ebos_altidx.cc
index e6d0e3aa5..5c715791a 100644
--- a/ebos/ebos_altidx.cc
+++ b/ebos/ebos_altidx.cc
@@ -50,7 +50,7 @@ struct FluidSystem<TypeTag, TTag::EbosAltIdxTypeTag>
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type;
+    typedef BlackOilFluidSystem<Scalar, EclAlternativeBlackOilIndexTraits> type;
 };
 
 } // namespace Opm::Properties
diff --git a/ebos/ebos_gasoil.cc b/ebos/ebos_gasoil.cc
index b4d383559..41fd44bda 100644
--- a/ebos/ebos_gasoil.cc
+++ b/ebos/ebos_gasoil.cc
@@ -50,14 +50,14 @@ private:
     using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
 
 public:
-    typedef Opm::BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
-                                         getPropValue<TypeTag, Properties::EnableExtbo>(),
-                                         getPropValue<TypeTag, Properties::EnablePolymer>(),
-                                         getPropValue<TypeTag, Properties::EnableEnergy>(),
-                                         getPropValue<TypeTag, Properties::EnableFoam>(),
-                                         getPropValue<TypeTag, Properties::EnableBrine>(),
-                                         /*PVOffset=*/0,
-                                         /*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
+    typedef BlackOilTwoPhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
+                                    getPropValue<TypeTag, Properties::EnableExtbo>(),
+                                    getPropValue<TypeTag, Properties::EnablePolymer>(),
+                                    getPropValue<TypeTag, Properties::EnableEnergy>(),
+                                    getPropValue<TypeTag, Properties::EnableFoam>(),
+                                    getPropValue<TypeTag, Properties::EnableBrine>(),
+                                    /*PVOffset=*/0,
+                                    /*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
 };
 
 } // namespace Opm::Properties
diff --git a/ebos/ebos_solvent.cc b/ebos/ebos_solvent.cc
index 55c5bd45d..4d7f6c1af 100644
--- a/ebos/ebos_solvent.cc
+++ b/ebos/ebos_solvent.cc
@@ -48,9 +48,9 @@ struct EnableSolvent<TypeTag, TTag::EbosSolventTypeTag> {
 
 namespace Opm {
 
-void ebosSolventSetDeck(std::unique_ptr<Opm::Deck> deck,
-                        std::unique_ptr<Opm::ParseContext> parseContext,
-                        std::unique_ptr<Opm::ErrorGuard> errorGuard,
+void ebosSolventSetDeck(std::unique_ptr<Deck> deck,
+                        std::unique_ptr<ParseContext> parseContext,
+                        std::unique_ptr<ErrorGuard> errorGuard,
                         double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
@@ -65,7 +65,7 @@ void ebosSolventSetDeck(std::unique_ptr<Opm::Deck> deck,
 int ebosSolventMain(int argc, char **argv)
 {
     using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
-    return Opm::startEbos<ProblemTypeTag>(argc, argv);
+    return startEbos<ProblemTypeTag>(argc, argv);
 }
 
 }
diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp
index 2544305f5..95a216f35 100644
--- a/flow/flow_ebos_blackoil.cpp
+++ b/flow/flow_ebos_blackoil.cpp
@@ -45,12 +45,12 @@ void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
     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)
 {
     // we always want to use the default locale, and thus spare us the trouble
     // with incorrect locale settings.
-    Opm::resetLocale();
+    resetLocale();
 
 #if HAVE_DUNE_FEM
     Dune::Fem::MPIManager::initialize(argc, argv);
@@ -58,7 +58,7 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
     Dune::MPIHelper::instance(argc, argv);
 #endif
 
-    return std::make_unique<Opm::FlowMainEbos<Properties::TTag::EclFlowProblem>>(
+    return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblem>>(
         argc, argv, outputCout, outputFiles);
 }
 
diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp
index 3832d7c9e..9f8f7f1b1 100644
--- a/flow/flow_onephase.cpp
+++ b/flow/flow_onephase.cpp
@@ -42,15 +42,14 @@ private:
     using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
-    typedef Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
+    using type = BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
                                          getPropValue<TypeTag, Properties::EnableExtbo>(),
                                          getPropValue<TypeTag, Properties::EnablePolymer>(),
                                          getPropValue<TypeTag, Properties::EnableEnergy>(),
                                          getPropValue<TypeTag, Properties::EnableFoam>(),
                                          getPropValue<TypeTag, Properties::EnableBrine>(),
                                          /*PVOffset=*/0,
-                                         /*enebledCompIdx=*/FluidSystem::waterCompIdx>
-        type;
+                                         /*enabledCompIdx=*/FluidSystem::waterCompIdx>;
 };
 
 } // namespace Opm::Properties
diff --git a/opm/simulators/utils/ParallelEclipseState.hpp b/opm/simulators/utils/ParallelEclipseState.hpp
index e0f4ffe40..de8d8c540 100644
--- a/opm/simulators/utils/ParallelEclipseState.hpp
+++ b/opm/simulators/utils/ParallelEclipseState.hpp
@@ -103,8 +103,8 @@ public:
 
     void deserialize_tran(const std::vector<char>& buffer) override;
 protected:
-    std::map<std::string, Opm::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<int>> m_intProps; //!< Map of integer 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).
     Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> m_comm; //!< Collective communication handler.
     std::function<int(void)> m_activeSize; //!< active size function of the grid
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 4fa07bee4..492155782 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -348,13 +348,13 @@ ADD_PACK_PROTOTYPES(data::WellRates)
 ADD_PACK_PROTOTYPES(RestartKey)
 ADD_PACK_PROTOTYPES(RestartValue)
 ADD_PACK_PROTOTYPES(std::string)
-ADD_PACK_PROTOTYPES(Opm::time_point)
+ADD_PACK_PROTOTYPES(time_point)
 
 } // end namespace Mpi
 
 RestartValue loadParallelRestart(const EclipseIO* eclIO, Action::State& actionState, SummaryState& summaryState,
-                                 const std::vector<Opm::RestartKey>& solutionKeys,
-                                 const std::vector<Opm::RestartKey>& extraKeys,
+                                 const std::vector<RestartKey>& solutionKeys,
+                                 const std::vector<RestartKey>& extraKeys,
                                  Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> comm);
 
 } // end namespace Opm