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

Rename data::WellRates -> data::Wells

Browse Source
This commit is contained in:
Joakim Hove
2021-06-12 09:06:03 +02:00
parent 5e1d923647
commit 9fe4be5ebf
17 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/output/data/Wells.hpp
View File

@@ -308,7 +308,7 @@ namespace Opm {
};
class WellRates : public std::map<std::string , Well> {
class Wells: public std::map<std::string , Well> {
public:
double get(const std::string& well_name , Rates::opt m) const {
@@ -361,8 +361,6 @@ namespace Opm {
}
};
using Wells = WellRates;
/* IMPLEMENTATIONS */

4
opm/output/eclipse/AggregateConnectionData.hpp
View File

@@ -34,7 +34,7 @@ namespace Opm {
} // Opm
namespace Opm { namespace data {
class WellRates;
class Wells;
}}
namespace Opm { namespace RestartIO { namespace Helpers {
@@ -47,7 +47,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
void captureDeclaredConnData(const Opm::Schedule& sched,
const Opm::EclipseGrid& grid,
const Opm::UnitSystem& units,
const Opm::data::WellRates& xw,
const Opm::data::Wells& xw,
const Opm::SummaryState& summary_state,
const std::size_t sim_step);

2
opm/output/eclipse/AggregateMSWData.hpp
View File

@@ -67,7 +67,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
const std::vector<int>& inteHead,
const Opm::EclipseGrid& grid,
const Opm::SummaryState& smry,
const Opm::data::WellRates& wr
const Opm::data::Wells& wr
);
/// Retrieve Integer Multisegment well data Array.

2
opm/output/eclipse/AggregateWListData.hpp
View File

@@ -32,7 +32,7 @@ namespace Opm {
} // Opm
namespace Opm { namespace data {
class WellRates;
class Wells;
}} // Opm::data
namespace Opm { namespace RestartIO { namespace Helpers {

4
opm/output/eclipse/AggregateWellData.hpp
View File

@@ -39,7 +39,7 @@ namespace Opm {
} // Opm
namespace Opm { namespace data {
class WellRates;
class Wells;
}} // Opm::data
namespace Opm { namespace RestartIO { namespace Helpers {
@@ -58,7 +58,7 @@ namespace Opm { namespace RestartIO { namespace Helpers {
void captureDynamicWellData(const Opm::Schedule& sched,
const std::size_t sim_step,
const Opm::data::WellRates& xw,
const Opm::data::Wells& xw,
const Opm::SummaryState& smry);
/// Retrieve Integer Well Data Array.

4
opm/output/eclipse/Summary.hpp
View File

@@ -41,7 +41,7 @@ namespace Opm {
} // namespace Opm
namespace Opm { namespace data {
class WellRates;
class Wells;
class GroupAndNetworkValues;
}} // namespace Opm::data
@@ -66,7 +66,7 @@ public:
void eval(SummaryState& summary_state,
const int report_step,
const double secs_elapsed,
const data::WellRates& well_solution,
const data::Wells& well_solution,
const data::GroupAndNetworkValues& group_and_nwrk_solution,
GlobalProcessParameters single_values,
const Inplace& initial_inplace,

4
opm/output/eclipse/WriteRFT.hpp
View File

@@ -30,7 +30,7 @@ namespace Opm {
namespace Opm { namespace data {
class WellRates;
class Wells;
}} // namespace Opm::data
@@ -81,7 +81,7 @@ namespace Opm { namespace RftIO {
const ::Opm::UnitSystem& usys,
const ::Opm::EclipseGrid& grid,
const ::Opm::Schedule& schedule,
const ::Opm::data::WellRates& wellSol,
const ::Opm::data::Wells& wellSol,
::Opm::EclIO::OutputStream::RFT& rftFile);
}} // namespace Opm::RftIO

4
src/opm/output/eclipse/AggregateConnectionData.cpp
View File

@@ -76,7 +76,7 @@ namespace {
void wellConnectionLoop(const Opm::Schedule& sched,
const std::size_t sim_step,
const Opm::EclipseGrid& grid,
const Opm::data::WellRates& xw,
const Opm::data::Wells& xw,
ConnOp&& connOp)
{
for (const auto& wname : sched.wellNames(sim_step)) {
@@ -306,7 +306,7 @@ Opm::RestartIO::Helpers::AggregateConnectionData::
captureDeclaredConnData(const Schedule& sched,
const EclipseGrid& grid,
const UnitSystem& units,
const data::WellRates& xw,
const data::Wells& xw,
const SummaryState& summary_state,
const std::size_t sim_step)
{

4
src/opm/output/eclipse/AggregateMSWData.cpp
View File

@@ -727,7 +727,7 @@ namespace {
const Opm::EclipseGrid& grid,
const Opm::UnitSystem& units,
const ::Opm::SummaryState& smry,
const Opm::data::WellRates& wr,
const Opm::data::Wells& wr,
RSegArray& rSeg)
{
using Ix = ::Opm::RestartIO::Helpers::VectorItems::RSeg::index;
@@ -990,7 +990,7 @@ captureDeclaredMSWData(const Schedule& sched,
const std::vector<int>& inteHead,
const Opm::EclipseGrid& grid,
const Opm::SummaryState& smry,
const Opm::data::WellRates& wr
const Opm::data::Wells& wr
)
{
const auto& wells = sched.getWells(rptStep);

2
src/opm/output/eclipse/AggregateWellData.cpp
View File

@@ -1021,7 +1021,7 @@ void
Opm::RestartIO::Helpers::AggregateWellData::
captureDynamicWellData(const Opm::Schedule& sched,
const std::size_t sim_step,
const Opm::data::WellRates& xw,
const Opm::data::Wells& xw,
const ::Opm::SummaryState& smry)
{
const auto& wells = sched.wellNames(sim_step);

2
src/opm/output/eclipse/RestartIO.cpp
View File

@@ -488,7 +488,7 @@ namespace {
const EclipseGrid& grid,
const EclipseState& es,
const Schedule& schedule,
const data::WellRates& wellSol,
const data::Wells& wellSol,
const Opm::Action::State& action_state,
const Opm::SummaryState& sumState,
const std::vector<int>& inteHD,

8
src/opm/output/eclipse/Summary.cpp
View File

@@ -2297,7 +2297,7 @@ namespace Evaluator {
struct SimulatorResults
{
const Opm::data::WellRates& wellSol;
const Opm::data::Wells& wellSol;
const Opm::data::GroupAndNetworkValues& grpNwrkSol;
const std::map<std::string, double>& single;
const Opm::Inplace inplace;
@@ -3144,7 +3144,7 @@ public:
void eval(const int sim_step,
const double secs_elapsed,
const data::WellRates& well_solution,
const data::Wells& well_solution,
const data::GroupAndNetworkValues& grp_nwrk_solution,
GlobalProcessParameters& single_values,
const Inplace& initial_inplace,
@@ -3287,7 +3287,7 @@ void
Opm::out::Summary::SummaryImplementation::
eval(const int sim_step,
const double secs_elapsed,
const data::WellRates& well_solution,
const data::Wells& well_solution,
const data::GroupAndNetworkValues& grp_nwrk_solution,
GlobalProcessParameters& single_values,
const Inplace& initial_inplace,
@@ -3717,7 +3717,7 @@ Summary::Summary(const EclipseState& es,
void Summary::eval(SummaryState& st,
const int report_step,
const double secs_elapsed,
const data::WellRates& well_solution,
const data::Wells& well_solution,
const data::GroupAndNetworkValues& grp_nwrk_solution,
GlobalProcessParameters single_values,
const Inplace& initial_inplace,

2
src/opm/output/eclipse/WriteRFT.cpp
View File

@@ -388,7 +388,7 @@ void Opm::RftIO::write(const int reportStep,
const ::Opm::UnitSystem& usys,
const ::Opm::EclipseGrid& grid,
const ::Opm::Schedule& schedule,
const ::Opm::data::WellRates& wellSol,
const ::Opm::data::Wells& wellSol,
::Opm::EclIO::OutputStream::RFT& rftFile)
{
const auto& rftCfg = schedule[reportStep].rft_config();

4
tests/test_AggregateConnectionData.cpp
View File

@@ -472,11 +472,11 @@ END
return Opm::Parser{}.parseString(input);
}
std::pair<Opm::data::WellRates, Opm::SummaryState> wr(const Opm::Schedule& sched)
std::pair<Opm::data::Wells, Opm::SummaryState> wr(const Opm::Schedule& sched)
{
using o = ::Opm::data::Rates::opt;
auto xw = ::Opm::data::WellRates {};
auto xw = ::Opm::data::Wells {};
Opm::SummaryState sum_state(Opm::TimeService::now());
{

10
tests/test_AggregateMSWData.cpp
View File

@@ -92,11 +92,11 @@ Opm::SummaryState sim_state()
state.update("WBHP:WINJ", 234.);
return state;
}
Opm::data::WellRates wr()
Opm::data::Wells wr()
{
using o = ::Opm::data::Rates::opt;
auto xw = ::Opm::data::WellRates {};
auto xw = ::Opm::data::Wells {};
{
xw["PROD"].rates
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE (Declared_MSW_Data)
//BOOST_CHECK_EQUAL(ih.nwells, MockIH::Sz{2});
const Opm::data::WellRates wrc = wr();
const Opm::data::Wells wrc = wr();
auto amswd = Opm::RestartIO::Helpers::AggregateMSWData {ih};
amswd.captureDeclaredMSWData(simCase.sched,
rptStep,
@@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(MSW_AICD) {
rptStep, rptStep+1, rptStep);
const Opm::data::WellRates wrc = wr();
const Opm::data::Wells wrc = wr();
auto amswd = Opm::RestartIO::Helpers::AggregateMSWData {ih};
amswd.captureDeclaredMSWData(simCase.sched,
rptStep,
@@ -533,7 +533,7 @@ BOOST_AUTO_TEST_CASE(MSW_RST) {
rptStep, rptStep+1, rptStep);
const Opm::data::WellRates wrc = wr();
const Opm::data::Wells wrc = wr();
auto amswd = Opm::RestartIO::Helpers::AggregateMSWData {ih};
amswd.captureDeclaredMSWData(simCase.sched,
rptStep,

8
tests/test_AggregateWellData.cpp
View File

@@ -485,11 +485,11 @@ TSTEP -- 9
return state;
}
Opm::data::WellRates well_rates_1()
Opm::data::Wells well_rates_1()
{
using o = ::Opm::data::Rates::opt;
auto xw = ::Opm::data::WellRates{};
auto xw = ::Opm::data::Wells{};
{
xw["OP_1"].rates
@@ -524,11 +524,11 @@ TSTEP -- 9
return xw;
}
Opm::data::WellRates well_rates_2()
Opm::data::Wells well_rates_2()
{
using o = ::Opm::data::Rates::opt;
auto xw = ::Opm::data::WellRates{};
auto xw = ::Opm::data::Wells{};
{
xw["OP_1"].bhp = 150.0; // Closed

2
tests/test_RFT.cpp
View File

@@ -552,7 +552,7 @@ namespace {
return xw;
}
::Opm::data::WellRates wellSol(const ::Opm::EclipseGrid& grid)
::Opm::data::Wells wellSol(const ::Opm::EclipseGrid& grid)
{
auto xw = ::Opm::data::Wells{};