OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-11 21:55:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3374 from joakim-hove/rename-wellrates

Browse Source 
Rename data::WellRates -> data::Wells in opm-common
This commit is contained in:
Joakim Hove 2021-06-13 13:14:03 +02:00 committed by GitHub
commit 7c133bb0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/utils/ParallelRestart.cpp
View File

@ -304,7 +304,7 @@ std::size_t packSize(const data::GroupAndNetworkValues& data, Dune::MPIHelper::M
+ packSize(data.nodeData, comm); + packSize(data.nodeData, comm);
} }
std::size_t packSize(const data::WellRates& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const data::Wells& data, Dune::MPIHelper::MPICommunicator comm)
{ {
// Needs explicit conversion to a supported base type holding the data // Needs explicit conversion to a supported base type holding the data
// to prevent throwing. // to prevent throwing.
@ -611,7 +611,7 @@ void pack(const data::Solution& data, std::vector<char>& buffer, int& position,
buffer, position, comm); buffer, position, comm);
} }
void pack(const data::WellRates& data, std::vector<char>& buffer, int& position, void pack(const data::Wells& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
// Needs explicit conversion to a supported base type holding the data // Needs explicit conversion to a supported base type holding the data
@ -948,7 +948,7 @@ void unpack(data::Solution& data, std::vector<char>& buffer, int& position,
buffer, position, comm); buffer, position, comm);
} }
void unpack(data::WellRates& data, std::vector<char>& buffer, int& position, void unpack(data::Wells& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
// Needs explicit conversion to a supported base type holding the data // Needs explicit conversion to a supported base type holding the data

2
tests/test_ParallelRestart.cpp
View File

@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE(dataWell)
BOOST_AUTO_TEST_CASE(WellRates) BOOST_AUTO_TEST_CASE(WellRates)
{ {
Opm::data::WellRates val1; Opm::data::Wells val1;
val1.insert({"test_well", getWell()}); val1.insert({"test_well", getWell()});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack(val1);
DO_CHECKS(data::WellRates) DO_CHECKS(data::WellRates)