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 #4102 from GitPaean/fixing_drift_determination

Browse Source 
we only use drift compensation when wells are active
This commit is contained in:
Kai Bao 2022-09-28 15:40:15 +02:00 committed by GitHub
commit 8a247cb5ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compareECLFiles.cmake
View File

@ -1396,7 +1396,7 @@ if(MPI_FOUND)
SIMULATOR flow SIMULATOR flow
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel} REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME spe1_gaswater add_test_compare_parallel_simulation(CASENAME spe1_gaswater
FILENAME SPE1CASE2_GASWATER FILENAME SPE1CASE2_GASWATER
@ -1411,7 +1411,7 @@ if(MPI_FOUND)
SIMULATOR flow SIMULATOR flow
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel} REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
# A test for distributed standard wells. We load distribute only along the z-axis # A test for distributed standard wells. We load distribute only along the z-axis
add_test_compare_parallel_simulation(CASENAME spe9 add_test_compare_parallel_simulation(CASENAME spe9
@ -1419,7 +1419,7 @@ if(MPI_FOUND)
SIMULATOR flow_distribute_z SIMULATOR flow_distribute_z
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel} REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME spe9group add_test_compare_parallel_simulation(CASENAME spe9group
FILENAME SPE9_CP_GROUP FILENAME SPE9_CP_GROUP
@ -1540,7 +1540,7 @@ if(MPI_FOUND)
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel} REL_TOL ${rel_tol_parallel}
DIR model2 DIR model2
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME rxft add_test_compare_parallel_simulation(CASENAME rxft
FILENAME TEST_RXFT FILENAME TEST_RXFT
@ -1548,7 +1548,7 @@ if(MPI_FOUND)
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL 1.0e-3 REL_TOL 1.0e-3
DIR rxft_smry DIR rxft_smry
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8) TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
endif() endif()
if(OPM_TESTS_ROOT) if(OPM_TESTS_ROOT)

8
ebos/eclproblem.hh
View File

@ -1883,12 +1883,8 @@ public:
// if requested, compensate systematic mass loss for cells which were "well // if requested, compensate systematic mass loss for cells which were "well
// behaved" in the last time step // behaved" in the last time step
// Note that we don't allow for drift compensation if there is // Note that we don't allow for drift compensation if there are no active wells.
// no source terms i.e. no wells and no aquifers. const bool compensateDrift = wellModel_.wellsActive();
const auto& schedule = this->simulator().vanguard().schedule();
int episodeIdx = this->simulator().episodeIndex();
const auto& aquifer = this->simulator().vanguard().eclState().aquifer();
bool compensateDrift = schedule.numWells(episodeIdx) > 0 && aquifer.active();
if (enableDriftCompensation_ && compensateDrift) { if (enableDriftCompensation_ && compensateDrift) {
const auto& simulator = this->simulator(); const auto& simulator = this->simulator();
const auto& model = this->model(); const auto& model = this->model();