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

Merge pull request #5203 from akva2/rename_drift_parameter

Browse Source 
rename EclEnableDriftCompensation parameter to EnableDriftCompensation
This commit is contained in:
Kai Bao 2024-03-05 21:10:50 +01:00 committed by GitHub
commit d764eb416c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclproblem.hh
View File

@ -233,7 +233,7 @@ public:
"Tell the output writer to use double precision. Useful for 'perfect' restarts");
EWOMS_REGISTER_PARAM(TypeTag, unsigned, RestartWritingInterval,
"The frequencies of which time steps are serialized to disk");
EWOMS_REGISTER_PARAM(TypeTag, bool, EclEnableDriftCompensation,
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableDriftCompensation,
"Enable partial compensation of systematic mass losses via the source term of the next time step");
EWOMS_REGISTER_PARAM(TypeTag, std::string, OutputMode,
"Specify which messages are going to be printed. Valid values are: none, log, all (default)");
@ -313,7 +313,7 @@ public:
damarisWriter_ = std::make_unique<DamarisWriterType>(simulator);
enableDamarisOutput_ = EWOMS_GET_PARAM(TypeTag, bool, EnableDamarisOutput) ;
#endif
enableDriftCompensation_ = EWOMS_GET_PARAM(TypeTag, bool, EclEnableDriftCompensation);
enableDriftCompensation_ = EWOMS_GET_PARAM(TypeTag, bool, EnableDriftCompensation);
enableEclOutput_ = EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput);

4
ebos/eclproblem_properties.hh
View File

@ -88,7 +88,7 @@ struct RestartWritingInterval {
// Enable partial compensation of systematic mass losses via the source term of the next time
// step
template<class TypeTag, class MyTypeTag>
struct EclEnableDriftCompensation {
struct EnableDriftCompensation {
using type = UndefinedProperty;
};
@ -521,7 +521,7 @@ struct RestartWritingInterval<TypeTag, TTag::EclBaseProblem> {
// conservation quantities are only compensated for
// as default if experimental mode is enabled.
template<class TypeTag>
struct EclEnableDriftCompensation<TypeTag, TTag::EclBaseProblem> {
struct EnableDriftCompensation<TypeTag, TTag::EclBaseProblem> {
static constexpr bool value = true;
};

22
parallelTests.cmake
View File

@ -10,7 +10,7 @@ add_test_compare_parallel_simulation(CASENAME spe1
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME spe1_gaswater
FILENAME SPE1CASE2_GASWATER
@ -25,7 +25,7 @@ add_test_compare_parallel_simulation(CASENAME spe9
SIMULATOR flow
ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)
# A test for distributed standard wells. We load distribute only along the z-axis
add_test_compare_parallel_simulation(CASENAME spe9_dist_z
@ -34,7 +34,7 @@ add_test_compare_parallel_simulation(CASENAME spe9_dist_z
SIMULATOR flow_distribute_z
ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME spe9group
FILENAME SPE9_CP_GROUP
@ -123,7 +123,7 @@ add_test_compare_parallel_simulation(CASENAME 3d_tran_operator
ABS_TOL ${abs_tol_parallel}
REL_TOL 0.03
DIR parallel_fieldprops
TEST_ARGS --enable-tuning=true --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
TEST_ARGS --enable-tuning=true --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,7 +131,7 @@ 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 --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
TEST_ARGS --tolerance-cnv=0.000003 --time-step-control=pid --linear-solver=cpr_trueimpes --enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME aquflux_01
FILENAME AQUFLUX-01
@ -139,7 +139,7 @@ add_test_compare_parallel_simulation(CASENAME aquflux_01
ABS_TOL ${abs_tol}
REL_TOL 0.04
DIR aquifers
TEST_ARGS --enable-tuning=true --ecl-enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
TEST_ARGS --enable-tuning=true --enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME aquflux_02
FILENAME AQUFLUX-02
@ -163,7 +163,7 @@ add_test_compare_parallel_simulation(CASENAME numerical_aquifer_3d_1aqu
ABS_TOL ${abs_tol_parallel}
REL_TOL 0.05
DIR aquifer-num
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)
TEST_ARGS --enable-tuning=true --tolerance-cnv=0.00003 --time-step-control=pid --linear-solver=cpr_trueimpes --enable-drift-compensation=false --relaxed-max-pv-fraction=0.0)
add_test_compare_parallel_simulation(CASENAME actionx_m1
FILENAME ACTIONX_M1
@ -179,7 +179,7 @@ add_test_compare_parallel_simulation(CASENAME winjmult_msw
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR winjmult
TEST_ARGS --ecl-enable-drift-compensation=false --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8)
TEST_ARGS --enable-drift-compensation=false --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8)
add_test_compare_parallel_simulation(CASENAME winjdam_msw
FILENAME WINJDAM_MSW
@ -187,7 +187,7 @@ add_test_compare_parallel_simulation(CASENAME winjdam_msw
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR winjdam
TEST_ARGS --ecl-enable-drift-compensation=false --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8)
TEST_ARGS --enable-drift-compensation=false --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8)
add_test_compare_parallel_simulation(CASENAME 3_a_mpi_multflt_mod2
FILENAME 3_A_MPI_MULTFLT_SCHED_MODEL2
@ -195,7 +195,7 @@ add_test_compare_parallel_simulation(CASENAME 3_a_mpi_multflt_mod2
ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}
DIR model2
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
TEST_ARGS --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)
add_test_compare_parallel_simulation(CASENAME rxft
FILENAME TEST_RXFT
@ -203,4 +203,4 @@ add_test_compare_parallel_simulation(CASENAME rxft
ABS_TOL ${abs_tol_parallel}
REL_TOL 1.0e-3
DIR rxft_smry
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --ecl-enable-drift-compensation=false)
TEST_ARGS --enable-tuning=true --linear-solver-reduction=1e-7 --tolerance-cnv=5e-6 --tolerance-mb=1e-8 --enable-drift-compensation=false)

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 --enable-tuning=true --relaxed-max-pv-fraction=0.0 --ecl-enable-drift-compensation=false)
TEST_ARGS --enable-tuning=true --relaxed-max-pv-fraction=0.0 --enable-drift-compensation=false)
add_test_compare_restarted_simulation(CASENAME numerical_aquifer_3d_2aqu
FILENAME 3D_2AQU_NUM