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 #5258 from bska/prune-inactive-pavg-conns

Browse Source 
Allow for Sparse Source-Location Subsets
This commit is contained in:
Bård Skaflestad 2024-03-19 14:34:22 +01:00 committed by GitHub
commit 84052fcefc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -350,14 +350,13 @@ initializeWellPerfData()
hasFirstConnection = true;
}
auto pd = PerforationData{};
auto& pd = well_perf_data_[well_index].emplace_back();
pd.cell_index = active_index;
pd.connection_transmissibility_factor = connection.CF();
pd.satnum_id = connection.satTableId();
pd.ecl_index = connection_index;
well_perf_data_[well_index].push_back(pd);
parallelWellInfo.pushBackEclIndex(connection_index_above,
connection_index);
}

14
opm/simulators/wells/ParallelPAvgDynamicSourceData.cpp
View File

@ -148,7 +148,19 @@ void Opm::ParallelPAvgDynamicSourceData::defineCommunication()
// 4) Build translation mapping from source term element indices to
// storage indices.
this->storageIndex_.resize(allIndices.size());
//
// Note that if the source terms aren't all active--e.g., if a well
// is connected in deactivated cells--then allIndices is not a
// permutation of 0..allIndices.size()-1 and the maximum source
// location may exceed size()-1. Resize the storageIndex_ according
// to the largest source location ID.
if (auto maxIxPos = std::max_element(allIndices.begin(), allIndices.end());
maxIxPos != allIndices.end())
{
// +1 for zero-based indices.
this->storageIndex_.resize(*maxIxPos + 1);
}
auto storageIx = std::vector<double>::size_type{0};
for (const auto& elemIndex : allIndices) {
this->storageIndex_[elemIndex] = storageIx++;

10
opm/simulators/wells/PerforationData.hpp
View File

@ -28,12 +28,12 @@ namespace Opm
/// Static data associated with a well perforation.
struct PerforationData
{
int cell_index;
double connection_transmissibility_factor;
double connection_d_factor;
int satnum_id;
int cell_index{};
double connection_transmissibility_factor{};
double connection_d_factor{};
int satnum_id{};
/// \brief The original index of the perforation in ECL Schedule
std::size_t ecl_index;
std::size_t ecl_index{};
};
struct PerforationRates