OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2157 from joakim-hove/wbp-porv

Browse Source 
Add PORV argument when creating PAvgCalculator
This commit is contained in:
Joakim Hove
2020-12-04 20:31:52 +01:00
committed by GitHub
parent 968aa79468 9809197b5d
commit e261253683
8 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/parser/PAvgTests.cpp
View File

@@ -195,7 +195,8 @@ END
auto sched = Schedule{ deck, es };
auto summary_config = SummaryConfig{deck, sched, es.getTableManager(), es.aquifer()};
const auto& w1 = sched.getWell("P1", 0);
auto calc = w1.pavg_calculator(grid);
const auto& porv = es.globalFieldProps().porv(true);
auto calc = w1.pavg_calculator(grid, porv);
{
const auto& index_list = calc.index_list();
@@ -234,7 +235,7 @@ END
//----------------------------------------------------
const auto& w5 = sched.getWell("P5", 0);
auto calc5 = w5.pavg_calculator(grid);
auto calc5 = w5.pavg_calculator(grid, porv);
{
const auto& index_list = calc5.index_list();
@@ -262,8 +263,8 @@ END
// We emulate MPI and calc1 and calc2 are on two different processors
{
auto calc1 = w5.pavg_calculator(grid);
auto calc2 = w5.pavg_calculator(grid);
auto calc1 = w5.pavg_calculator(grid, porv);
auto calc2 = w5.pavg_calculator(grid, porv);
for (std::size_t k = 0; k < 3; k++) {
calc1.add_pressure(grid.getGlobalIndex(0,0,k), 1);
calc2.add_pressure(grid.getGlobalIndex(1,0,k), 2.0);
@@ -285,9 +286,9 @@ END
auto calculators = sched.pavg_calculators(grid, summary_config.wbp_wells(), 0);
calculators.add(w1.pavg_calculator(grid));
calculators.add(w5.pavg_calculator(grid));
PAvgCalculatorCollection calculators;
calculators.add(w1.pavg_calculator(grid, porv));
calculators.add(w5.pavg_calculator(grid, porv));
BOOST_CHECK( calculators.has("P1"));