From e2913a178cd15296fec2d5a53786780f8a5010da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 24 Feb 2014 15:55:14 +0100 Subject: [PATCH] Capitalize nested namespace names. equil -> Equil miscibility -> Miscibility --- opm/core/simulator/initStateEquil.hpp | 16 ++++++++-------- opm/core/simulator/initStateEquil_impl.hpp | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp index fd1c6721a..1f6f11c5d 100644 --- a/opm/core/simulator/initStateEquil.hpp +++ b/opm/core/simulator/initStateEquil.hpp @@ -49,7 +49,7 @@ namespace Opm * This namespace is intentionally nested to avoid name clashes * with other parts of OPM. */ - namespace equil { + namespace Equil { template class DensityCalculator; @@ -116,7 +116,7 @@ namespace Opm * Types and routines relating to phase mixing in * equilibration calculations. */ - namespace miscibility { + namespace Miscibility { /** * Type that implements "no phase mixing" policy. */ @@ -258,7 +258,7 @@ namespace Opm return A_[np*opos + gpos] / A_[np*opos + opos]; } }; - } // namespace miscibility + } // namespace Miscibility @@ -336,8 +336,8 @@ namespace Opm * depth and (gas) pressure @c press. */ template + class RS = Miscibility::NoMixing, + class RV = Miscibility::NoMixing> class EquilReg { public: /** @@ -825,7 +825,7 @@ namespace Opm const UnstructuredGrid& G , const double grav) { - typedef miscibility::NoMixing NoMix; + typedef Miscibility::NoMixing NoMix; for (typename RMap::RegionId r = 0, nr = reg.numRegions(); @@ -863,7 +863,7 @@ namespace Opm const UnstructuredGrid& G , const double grav) { - typedef miscibility::NoMixing NoMix; + typedef Miscibility::NoMixing NoMix; for (typename RMap::RegionId r = 0, nr = reg.numRegions(); @@ -908,7 +908,7 @@ namespace Opm }; } // namespace DeckDependent - } // namespace equil + } // namespace Equil } // namespace Opm #include diff --git a/opm/core/simulator/initStateEquil_impl.hpp b/opm/core/simulator/initStateEquil_impl.hpp index a713e3b34..29ab6ac1d 100644 --- a/opm/core/simulator/initStateEquil_impl.hpp +++ b/opm/core/simulator/initStateEquil_impl.hpp @@ -485,7 +485,7 @@ namespace Opm } } // namespace Details - namespace equil { + namespace Equil { template std::vector< std::vector > @@ -568,7 +568,7 @@ namespace Opm return press; } - } // namespace equil + } // namespace Equil } // namespace Opm #endif // OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED