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

Add group mamber to RstWell

Browse Source
This commit is contained in:
Joakim Hove 2020-02-02 11:23:19 +01:00
parent 6d3cb49c11
commit 6afd05db1b
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/io/eclipse/rst/well.hpp
View File

@ -35,6 +35,7 @@ class RstHeader;
struct RstWell {
RstWell(const RstHeader& header,
const std::string& group_arg,
const std::string* zwel,
const int * iwel,
const float * swel,
@ -44,6 +45,7 @@ struct RstWell {
const double * xcon);
RstWell(const RstHeader& header,
const std::string& group_arg,
const std::string* zwel,
const int * iwel,
const float * swel,
@ -55,6 +57,7 @@ struct RstWell {
const std::vector<double>& rseg);
std::string name;
std::string group;
std::array<int, 2> ij;
std::pair<int,int> k1k2;
int wtype;

7
src/opm/io/eclipse/rst/state.cpp
View File

@ -57,8 +57,11 @@ RstState::RstState(const std::vector<int>& intehead,
std::size_t icon_offset = iw * this->header.niconz * this->header.ncwmax;
std::size_t scon_offset = iw * this->header.nsconz * this->header.ncwmax;
std::size_t xcon_offset = iw * this->header.nxconz * this->header.ncwmax;
int group_index = iwel[ iwel_offset + VI::IWell::Group ] - 1;
const std::string group = this->groups[group_index].name;
this->wells.emplace_back(this->header,
group,
zwel.data() + zwel_offset,
iwel.data() + iwel_offset,
swel.data() + swel_offset,
@ -100,8 +103,11 @@ RstState::RstState(const std::vector<int>& intehead,
std::size_t icon_offset = iw * this->header.niconz * this->header.ncwmax;
std::size_t scon_offset = iw * this->header.nsconz * this->header.ncwmax;
std::size_t xcon_offset = iw * this->header.nxconz * this->header.ncwmax;
int group_index = iwel[ iwel_offset + VI::IWell::Group ] - 1;
const std::string group = this->groups[group_index].name;
this->wells.emplace_back(this->header,
group,
zwel.data() + zwel_offset,
iwel.data() + iwel_offset,
swel.data() + swel_offset,
@ -182,3 +188,4 @@ RstState RstState::load(EclIO::ERst& rst_file, int report_step) {
}
}

5
src/opm/io/eclipse/rst/well.cpp
View File

@ -33,6 +33,7 @@ namespace Opm {
namespace RestartIO {
RstWell::RstWell(const RstHeader& header,
const std::string& group_arg,
const std::string* zwel,
const int * iwel,
const float * swel,
@ -41,6 +42,7 @@ RstWell::RstWell(const RstHeader& header,
const float * scon,
const double * xcon) :
name(trim_copy(zwel[0])),
group(group_arg),
ij({iwel[VI::IWell::IHead] - 1, iwel[VI::IWell::JHead] - 1}),
k1k2(std::make_pair(iwel[VI::IWell::FirstK] - 1, iwel[VI::IWell::LastK] - 1)),
wtype(iwel[VI::IWell::WType]),
@ -96,6 +98,7 @@ RstWell::RstWell(const RstHeader& header,
RstWell::RstWell(const RstHeader& header,
const std::string& group_arg,
const std::string* zwel,
const int * iwel,
const float * swel,
@ -105,7 +108,7 @@ RstWell::RstWell(const RstHeader& header,
const double * xcon,
const std::vector<int>& iseg,
const std::vector<double>& rseg) :
RstWell(header, zwel, iwel, swel, xwel, icon, scon, xcon)
RstWell(header, group_arg, zwel, iwel, swel, xwel, icon, scon, xcon)
{
if (this->msw_index) {

1
tests/test_AggregateWellData.cpp
View File

@ -828,6 +828,7 @@ BOOST_AUTO_TEST_CASE(WELL_POD) {
std::size_t xcon_offset = header.nxconz * header.ncwmax * iw;
wells.emplace_back(header,
"GROUP",
zwel.data() + zwel_offset,
iwel.data() + iwel_offset,
swel.data() + swel_offset,