OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5224 from bska/fix-per-cell-fip-rst-output

Browse Source 
Add Special Case Handling for Fluid-In-Place of Pure Phases
This commit is contained in:
Bård Skaflestad 2024-03-04 12:01:14 +01:00 committed by GitHub
commit 58875a1483
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -667,7 +667,17 @@ assignToSolution(data::Solution& sol)
// Fluid in place
if (this->outputFipRestart_) {
for (const auto& phase : Inplace::phases()) {
const auto baseFIPArrays = std::array {
DataEntry{"FIPOIL", UnitSystem::measure::liquid_surface_volume, fip_[Inplace::Phase::OIL]},
DataEntry{"FIPWAT", UnitSystem::measure::liquid_surface_volume, fip_[Inplace::Phase::WATER]},
DataEntry{"FIPGAS", UnitSystem::measure::gas_surface_volume, fip_[Inplace::Phase::GAS]},
};
for (const auto& fipArray : baseFIPArrays) {
doInsert(fipArray, data::TargetType::RESTART_SOLUTION);
}
for (const auto& phase : Inplace::mixingPhases()) {
if (! this->fip_[phase].empty()) {
sol.insert(EclString(phase),
UnitSystem::measure::volume,

14
parallelTests.cmake
View File

@ -121,9 +121,9 @@ add_test_compare_parallel_simulation(CASENAME 3d_tran_operator
FILENAME 3D_TRAN_OPERATOR
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}
REL_TOL 0.03
DIR parallel_fieldprops
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-6)
TEST_ARGS --enable-tuning=true --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME numerical_aquifer_3d_2aqu
FILENAME 3D_2AQU_NUM
@ -131,15 +131,15 @@ add_test_compare_parallel_simulation(CASENAME numerical_aquifer_3d_2aqu
ABS_TOL 0.17
REL_TOL ${coarse_rel_tol_parallel}
DIR aquifer-num
TEST_ARGS --tolerance-cnv=0.000003 --time-step-control=pid --linear-solver=cpr_trueimpes)
TEST_ARGS --tolerance-cnv=0.000003 --time-step-control=pid --linear-solver=cpr_trueimpes --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME aquflux_01
FILENAME AQUFLUX-01
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${coarse_rel_tol_parallel}
REL_TOL 0.04
DIR aquifers
TEST_ARGS --enable-tuning=true)
TEST_ARGS --enable-tuning=true --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME aquflux_02
FILENAME AQUFLUX-02
@ -161,9 +161,9 @@ add_test_compare_parallel_simulation(CASENAME numerical_aquifer_3d_1aqu
FILENAME 3D_1AQU_3CELLS
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL ${coarse_rel_tol_parallel}
REL_TOL 0.05
DIR aquifer-num
TEST_ARGS --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes)
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME actionx_m1
FILENAME ACTIONX_M1

2
restartTests.cmake
View File

@ -45,7 +45,7 @@ add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_1aqu
REL_TOL 4.0e-3
RESTART_STEP 3
DIR aquifer-num
TEST_ARGS --sched-restart=true --enable-tuning=true)
TEST_ARGS --enable-tuning=true --relaxed-max-pv-fraction=0.0 --ecl-enable-drift-compensation=false)
add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_2aqu
FILENAME 3D_2AQU_NUM