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

Rely on local ids being persistent across grid modifications

Browse Source 
as the issue in CpGrid was fixed, recently.
This commit is contained in:
Markus Blatt 2020-03-11 13:51:35 +01:00
parent 6f7d15c56e
commit 5fc248f786
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/utils/PropsCentroidsDataHandle.hpp
View File

@ -149,7 +149,7 @@ public:
std::size_t counter{}; std::size_t counter{};
const auto& id = idSet.id(element); const auto& id = idSet.id(element);
auto index = elemMapper.index(element); auto index = elemMapper.index(element);
auto data = rcvdElementData_.find(id); auto data = elementData_.find(id);
assert(data != elementData_.end()); assert(data != elementData_.end());
for(const auto& intKey : m_intKeys) for(const auto& intKey : m_intKeys)
@ -198,7 +198,7 @@ public:
void scatter(BufferType& buffer, const EntityType& e, std::size_t n) void scatter(BufferType& buffer, const EntityType& e, std::size_t n)
{ {
assert(n == m_no_data); assert(n == m_no_data);
auto& array = rcvdElementData_[m_grid.localIdSet().id(e)]; auto& array = elementData_[m_grid.localIdSet().id(e)];
array.resize(n); array.resize(n);
for(auto& data: array) for(auto& data: array)
{ {
@ -217,12 +217,6 @@ private:
std::vector<std::string> m_doubleKeys; std::vector<std::string> m_doubleKeys;
/// \brief The data per element as a vector mapped from the local id. /// \brief The data per element as a vector mapped from the local id.
std::unordered_map<typename LocalIdSet::IdType, std::vector<double> > elementData_; std::unordered_map<typename LocalIdSet::IdType, std::vector<double> > elementData_;
/*! \brief The data received per element as a vector mapped from the local id.
*
* Needed because CpGrid is in violation of the requirement that local ids
* need to be persistent across grid modifications
*/
std::unordered_map<typename LocalIdSet::IdType, std::vector<double> > rcvdElementData_;
/// \brief The cell centroids of the distributed grid. /// \brief The cell centroids of the distributed grid.
std::vector<double>& m_centroids; std::vector<double>& m_centroids;
/// \brief The amount of data to send for each element /// \brief The amount of data to send for each element