OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps

Browse Source
This commit is contained in:
Robert K 2015-01-12 12:23:48 +01:00
commit 0ecff82940
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -347,8 +347,8 @@ public:
icon_data.push_back(completion_ptr->getK() + eclipse_offset); icon_data.push_back(completion_ptr->getK() + eclipse_offset);
icon_data.push_back(0); icon_data.push_back(0);
CompletionStateEnum completion_state = completion_ptr->getState(); WellCompletion::StateEnum completion_state = completion_ptr->getState();
if (completion_state == CompletionStateEnum::OPEN) { if (completion_state == WellCompletion::StateEnum::OPEN) {
icon_data.push_back(1); icon_data.push_back(1);
} else { } else {
icon_data.push_back(0); icon_data.push_back(0);

14
opm/core/wells/WellsManager.cpp
View File

@ -173,19 +173,19 @@ namespace WellsManagerDetail
// perpendicular to completion while last element is direction // perpendicular to completion while last element is direction
// along completion. // along completion.
inline std::array< std::array<double,3>::size_type, 3 > inline std::array< std::array<double,3>::size_type, 3 >
directionIndices(const Opm::CompletionDirection::DirectionEnum direction) directionIndices(const Opm::WellCompletion::DirectionEnum direction)
{ {
typedef std::array<double,3>::size_type idx_t; typedef std::array<double,3>::size_type idx_t;
typedef std::array<idx_t,3> permutation; typedef std::array<idx_t,3> permutation;
switch (direction) { switch (direction) {
case Opm::CompletionDirection::DirectionEnum::X: case Opm::WellCompletion::DirectionEnum::X:
return permutation {{ idx_t(1), idx_t(2), idx_t(0) }}; 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) }}; 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) }}; return permutation {{ idx_t(0), idx_t(1), idx_t(2) }};
} }
// All enum values should be handled above. Therefore // All enum values should be handled above. Therefore
@ -198,7 +198,7 @@ namespace WellsManagerDetail
// Permute (diagonal) permeability components according to // Permute (diagonal) permeability components according to
// completion's direction. // completion's direction.
inline std::array<double,3> inline std::array<double,3>
permComponents(const Opm::CompletionDirection::DirectionEnum direction, permComponents(const Opm::WellCompletion::DirectionEnum direction,
const double* perm) const double* perm)
{ {
const auto p = directionIndices(direction); const auto p = directionIndices(direction);
@ -218,7 +218,7 @@ namespace WellsManagerDetail
// Note: 'extent' is intentionally accepted by modifiable value // Note: 'extent' is intentionally accepted by modifiable value
// rather than reference-to-const to support NTG manipulation. // rather than reference-to-const to support NTG manipulation.
inline std::array<double,3> inline std::array<double,3>
effectiveExtent(const Opm::CompletionDirection::DirectionEnum direction, effectiveExtent(const Opm::WellCompletion::DirectionEnum direction,
const double ntg, const double ntg,
std::array<double,3> extent) std::array<double,3> extent)
{ {
@ -266,7 +266,7 @@ namespace WellsManagerDetail
const std::array<double, 3>& cubical, const std::array<double, 3>& cubical,
const double* cell_permeability, const double* cell_permeability,
const double skin_factor, const double skin_factor,
const Opm::CompletionDirection::DirectionEnum direction, const Opm::WellCompletion::DirectionEnum direction,
const double ntg) const double ntg)
{ {
const std::array<double,3>& K = const std::array<double,3>& K =