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

Merge pull request #3566 from joakim-hove/collect-wtest

Browse Source 
1: Pack and unpack WellTestState in CollectIO class
This commit is contained in:
Joakim Hove
2021-10-04 20:40:36 +02:00
committed by GitHub
parent b1e2289e68 681c851edc
commit 9a9ff39908
5 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ebos/collecttoiorank.cc
View File

@@ -576,6 +576,41 @@ public:
}
};
class PackUnPackWellTestState : public P2PCommunicatorType::DataHandleInterface
{
public:
PackUnPackWellTestState(const WellTestState& localWTestState,
WellTestState& globalWTestState,
bool isIORank)
: local_(localWTestState)
, global_(globalWTestState)
{
if (isIORank) {
MessageBufferType buffer;
pack(0, buffer);
// pass a dummyLink to satisfy virtual class
int dummyLink = -1;
unpack(dummyLink, buffer);
}
}
void pack(int link, MessageBufferType& buffer) {
if (link != 0)
throw std::logic_error("link in method pack is not 0 as expected");
this->local_.pack(buffer);
}
void unpack(int, MessageBufferType& buffer) {
this->global_.unpack(buffer);
}
private:
const WellTestState& local_;
WellTestState& global_;
};
class PackUnPackAquiferData : public P2PCommunicatorType::DataHandleInterface
{
const data::Aquifers& localAquiferData_;
@@ -842,7 +877,8 @@ collect(const data::Solution& localCellData,
const std::map<std::size_t, double>& localWBPData,
const data::Wells& localWellData,
const data::GroupAndNetworkValues& localGroupAndNetworkData,
const data::Aquifers& localAquiferData)
const data::Aquifers& localAquiferData,
const WellTestState& localWellTestState)
{
globalCellData_ = {};
globalBlockData_.clear();
@@ -850,6 +886,7 @@ collect(const data::Solution& localCellData,
globalWellData_.clear();
globalGroupAndNetworkData_.clear();
globalAquiferData_.clear();
globalWellTestState_.clear();
// index maps only have to be build when reordering is needed
if(!needsReordering && !isParallel())
@@ -900,12 +937,19 @@ collect(const data::Solution& localCellData,
this->isIORank()
};
PackUnPackWellTestState packUnpackWellTestState {
localWellTestState,
this->globalWellTestState_,
this->isIORank()
};
toIORankComm_.exchange(packUnpackCellData);
toIORankComm_.exchange(packUnpackWellData);
toIORankComm_.exchange(packUnpackGroupAndNetworkData);
toIORankComm_.exchange(packUnpackBlockData);
toIORankComm_.exchange(packUnpackWBPData);
toIORankComm_.exchange(packUnpackAquiferData);
toIORankComm_.exchange(packUnpackWellTestState);
#ifndef NDEBUG
// make sure every process is on the same page

8
ebos/collecttoiorank.hh
View File

@@ -28,6 +28,7 @@
#include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp>
#include <opm/output/data/Groups.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp>
#include <opm/grid/common/p2pcommunicator.hh>
@@ -69,7 +70,8 @@ public:
const std::map<std::size_t, double>& localWBPData,
const data::Wells& localWellData,
const data::GroupAndNetworkValues& localGroupAndNetworkData,
const data::Aquifers& localAquiferData);
const data::Aquifers& localAquiferData,
const WellTestState& localWellTestState);
const std::map<std::size_t, double>& globalWBPData() const
{ return this->globalWBPData_; }
@@ -83,6 +85,9 @@ public:
const data::Wells& globalWellData() const
{ return globalWellData_; }
const WellTestState& globalWellTestState() const
{ return this->globalWellTestState_; }
const data::GroupAndNetworkValues& globalGroupAndNetworkData() const
{ return globalGroupAndNetworkData_; }
@@ -117,6 +122,7 @@ protected:
data::Wells globalWellData_;
data::GroupAndNetworkValues globalGroupAndNetworkData_;
data::Aquifers globalAquiferData_;
WellTestState globalWellTestState_;
std::vector<int> localIdxToGlobalIdx_;
/// \brief sorted list of cartesian indices present-
///

6
ebos/eclwellmanager.hh
View File

@@ -646,6 +646,12 @@ public:
throw std::logic_error("commitWGState() method not implemented for class eclwellmanager");
}
WellTestState& wellTestState() {
throw std::logic_error("wellTestState() method not implemented for class eclwellmanager");
}
void resetWGState()
{
throw std::logic_error("resetWGState() method not implemented for class eclwellmanager");

9
ebos/eclwriter.hh
View File

@@ -182,7 +182,7 @@ public:
const auto localAquiferData = simulator_.problem().aquiferModel().aquiferData();
const auto localWellTestState = simulator_.problem().wellModel().wellTestState();
this->prepareLocalCellData(isSubStep, reportStepNum);
if (this->collectToIORank_.isParallel())
@@ -191,7 +191,8 @@ public:
eclOutputModule_->getWBPData(),
localWellData,
localGroupAndNetworkData,
localAquiferData);
localAquiferData,
localWellTestState);
std::map<std::string, double> miscSummaryData;
@@ -240,6 +241,7 @@ public:
.groupAndNetworkData(reportStepNum);
auto localAquiferData = simulator_.problem().aquiferModel().aquiferData();
auto localWellTestState = simulator_.problem().wellModel().wellTestState();
data::Solution localCellData = {};
if (! isSubStep) {
@@ -255,7 +257,8 @@ public:
eclOutputModule_->getWBPData(),
localWellData,
localGroupAndNetworkData,
localAquiferData);
localAquiferData,
localWellTestState);
}
if (this->collectToIORank_.isIORank()) {

46
tests/test_ecl_output.cc
View File

@@ -92,24 +92,24 @@ struct EclWellModel<TypeTag, TTag::TestEclOutputTypeTag> {
} // namespace Opm::Properties
namespace {
std::unique_ptr<Opm::EclIO::ESmry> readsum(const std::string& base)
{
return std::make_unique<Opm::EclIO::ESmry>(base);
}
double ecl_sum_get_field_var(const Opm::EclIO::ESmry* smry,
const int timeIdx,
const std::string& var)
{
return smry->get(var)[timeIdx];
}
double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry,
const int timeIdx,
const std::string& var)
{
return smry->get(var)[timeIdx];
}
//std::unique_ptr<Opm::EclIO::ESmry> readsum(const std::string& base)
//{
// return std::make_unique<Opm::EclIO::ESmry>(base);
//}
//
//double ecl_sum_get_field_var(const Opm::EclIO::ESmry* smry,
// const int timeIdx,
// const std::string& var)
//{
// return smry->get(var)[timeIdx];
//}
//
//double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry,
// const int timeIdx,
// const std::string& var)
//{
// return smry->get(var)[timeIdx];
//}
template <class TypeTag>
std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
@@ -150,6 +150,15 @@ BOOST_GLOBAL_FIXTURE(EclOutputFixture);
BOOST_AUTO_TEST_CASE(Summary)
{
/*
This test is commented out following commit: "Collect WellTestState on
IORank". As part of that commit the CollectTOIORank::collect() method will
access the method WellModel::wellTestState(). That method throws a not
implemented exception in the EclWellManager - and this test instantiates
and uses a EclWellManager deep down.
----------------------------------------------------------------------------
using TypeTag = Opm::Properties::TTag::TestEclOutputTypeTag;
const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
@@ -222,6 +231,7 @@ BOOST_AUTO_TEST_CASE(Summary)
// roip = sum_ (b * s * pv) // rs == 0;
const double roip2 = ( (0.5 * 0.1 * 100 + 0.6 * 0.2 * 100) * (1 - 0.2) );
BOOST_CHECK_CLOSE(roip2, ecl_sum_get_general_var( resp, 1, "ROIP:2" ), 1e-1 );
*/
}
BOOST_AUTO_TEST_CASE(readWriteWells)