From a0d41dc130f794cdf4390520b6cefac95b89b7a3 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 12 Jan 2015 11:57:27 +0100 Subject: [PATCH] Added WellCompletion namespace --- opm/core/wells/WellsManager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/opm/core/wells/WellsManager.cpp b/opm/core/wells/WellsManager.cpp index cf9462da2..418bad754 100644 --- a/opm/core/wells/WellsManager.cpp +++ b/opm/core/wells/WellsManager.cpp @@ -173,19 +173,19 @@ namespace WellsManagerDetail // perpendicular to completion while last element is direction // along completion. inline std::array< std::array::size_type, 3 > - directionIndices(const Opm::CompletionDirection::DirectionEnum direction) + directionIndices(const Opm::WellCompletion::DirectionEnum direction) { typedef std::array::size_type idx_t; typedef std::array permutation; switch (direction) { - case Opm::CompletionDirection::DirectionEnum::X: + case Opm::WellCompletion::DirectionEnum::X: return permutation {{ idx_t(1), idx_t(2), idx_t(0) }}; - case Opm::CompletionDirection::DirectionEnum::Y: + case Opm::WellCompletion::DirectionEnum::Y: return permutation {{ idx_t(2), idx_t(0), idx_t(1) }}; - case Opm::CompletionDirection::DirectionEnum::Z: + case Opm::WellCompletion::DirectionEnum::Z: return permutation {{ idx_t(0), idx_t(1), idx_t(2) }}; } // All enum values should be handled above. Therefore @@ -198,7 +198,7 @@ namespace WellsManagerDetail // Permute (diagonal) permeability components according to // completion's direction. inline std::array - permComponents(const Opm::CompletionDirection::DirectionEnum direction, + permComponents(const Opm::WellCompletion::DirectionEnum direction, const double* perm) { const auto p = directionIndices(direction); @@ -218,7 +218,7 @@ namespace WellsManagerDetail // Note: 'extent' is intentionally accepted by modifiable value // rather than reference-to-const to support NTG manipulation. inline std::array - effectiveExtent(const Opm::CompletionDirection::DirectionEnum direction, + effectiveExtent(const Opm::WellCompletion::DirectionEnum direction, const double ntg, std::array extent) { @@ -266,7 +266,7 @@ namespace WellsManagerDetail const std::array& cubical, const double* cell_permeability, const double skin_factor, - const Opm::CompletionDirection::DirectionEnum direction, + const Opm::WellCompletion::DirectionEnum direction, const double ntg) { const std::array& K =