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 13d57cebfb into 363d2eb902

Browse Source
This commit is contained in:
Tor Harald Sandve 2025-02-13 13:10:42 +01:00 committed by GitHub
commit ab60a597fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
opm/simulators/wells/RegionAverageCalculator.hpp
View File

@ -89,18 +89,11 @@ namespace Opm {
numRegions = std::max(numRegions, reg); numRegions = std::max(numRegions, reg);
} }
numRegions = comm.max(numRegions); numRegions = comm.max(numRegions);
for (int reg = 1; reg <= numRegions ; ++ reg) { // reg = 0 is used for field
for (int reg = 0; reg <= numRegions ; ++ reg) {
if (!attr_.has(reg)) if (!attr_.has(reg))
attr_.insert(reg, Attributes()); attr_.insert(reg, Attributes());
} }
// create map from cell to region
// and set all attributes to zero
for (int reg = 1; reg <= numRegions ; ++ reg) {
auto& ra = attr_.attributes(reg);
ra.pressure = 0.0;
ra.pv = 0.0;
}
// quantities for pore volume average // quantities for pore volume average
std::unordered_map<RegionId, Attributes> attributes_pv; std::unordered_map<RegionId, Attributes> attributes_pv;
@ -114,7 +107,6 @@ namespace Opm {
} }
ElementContext elemCtx( simulator ); ElementContext elemCtx( simulator );
OPM_BEGIN_PARALLEL_TRY_CATCH(); OPM_BEGIN_PARALLEL_TRY_CATCH();
for (const auto& elem : elements(gridView, Dune::Partitions::interior)) { for (const auto& elem : elements(gridView, Dune::Partitions::interior)) {
elemCtx.updatePrimaryStencil(elem); elemCtx.updatePrimaryStencil(elem);
@ -165,6 +157,10 @@ namespace Opm {
} }
OPM_END_PARALLEL_TRY_CATCH("AverageRegionalPressure::defineState(): ", simulator.vanguard().grid().comm()); OPM_END_PARALLEL_TRY_CATCH("AverageRegionalPressure::defineState(): ", simulator.vanguard().grid().comm());
Scalar field_p_hpv = 0.0;
Scalar field_hpv = 0.0;
Scalar field_p_pv = 0.0;
Scalar field_pv = 0.0;
for (int reg = 1; reg <= numRegions ; ++ reg) { for (int reg = 1; reg <= numRegions ; ++ reg) {
auto& ra = attr_.attributes(reg); auto& ra = attr_.attributes(reg);
const Scalar hpv_sum = comm.sum(attributes_hpv[reg].pv); const Scalar hpv_sum = comm.sum(attributes_hpv[reg].pv);
@ -173,6 +169,9 @@ namespace Opm {
const auto& attri_hpv = attributes_hpv[reg]; const auto& attri_hpv = attributes_hpv[reg];
const Scalar p_hpv_sum = comm.sum(attri_hpv.pressure); const Scalar p_hpv_sum = comm.sum(attri_hpv.pressure);
ra.pressure = p_hpv_sum / hpv_sum; ra.pressure = p_hpv_sum / hpv_sum;
ra.pv = hpv_sum;
field_p_hpv += p_hpv_sum;
field_hpv += hpv_sum;
} else { } else {
// using the pore volume to do the averaging // using the pore volume to do the averaging
const auto& attri_pv = attributes_pv[reg]; const auto& attri_pv = attributes_pv[reg];
@ -181,9 +180,18 @@ namespace Opm {
if (pv_sum > 0) { if (pv_sum > 0) {
const Scalar p_pv_sum = comm.sum(attri_pv.pressure); const Scalar p_pv_sum = comm.sum(attri_pv.pressure);
ra.pressure = p_pv_sum / pv_sum; ra.pressure = p_pv_sum / pv_sum;
ra.pv = pv_sum;
field_p_pv += p_pv_sum;
field_pv += pv_sum;
} }
} }
} }
// update field pressure
auto& ra_field = attr_.attributes(0);
if (field_hpv > 0)
ra_field.pressure = field_p_hpv / field_hpv;
else if (field_hpv > 0)
ra_field.pressure = field_p_pv / field_pv;
} }
/** /**
@ -200,19 +208,6 @@ namespace Opm {
Scalar Scalar
pressure(const RegionId r) const pressure(const RegionId r) const
{ {
if (r == 0 ) // region 0 is the whole field
{
Scalar pressure = 0.0;
int num_active_regions = 0;
for (const auto& attr : attr_.attributes()) {
const auto& value = *attr.second;
const auto& ra = value.attr_;
pressure += ra.pressure;
num_active_regions ++;
}
return pressure / num_active_regions;
}
const auto& ra = attr_.attributes(r); const auto& ra = attr_.attributes(r);
return ra.pressure; return ra.pressure;
} }