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 #2342 from joakim-hove/schedule-rst

Browse Source 
Restart flow from restart state
This commit is contained in:
Joakim Hove
2020-03-13 12:03:59 +01:00
committed by GitHub
parent 0c3cacf4da 779bc981f6
commit 556983192e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compareECLFiles.cmake
View File

@@ -430,13 +430,13 @@ add_test_compare_restarted_simulation(CASENAME spe1
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
TEST_ARGS --sched-restart=true)
TEST_ARGS --sched-restart=false)
add_test_compare_restarted_simulation(CASENAME spe9
FILENAME SPE9_CP_SHORT
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
TEST_ARGS --sched-restart=true)
TEST_ARGS --sched-restart=false)
# PORV test
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-porv-acceptanceTest.sh "")
@@ -467,7 +467,7 @@ if(MPI_FOUND)
SIMULATOR flow
ABS_TOL ${abs_tol_restart}
REL_TOL ${rel_tol_restart}
TEST_ARGS --sched-restart=true)
TEST_ARGS --sched-restart=false)
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-parallel-regressionTest.sh "")

2
flow/flow.cpp
View File

@@ -373,8 +373,6 @@ int main(int argc, char** argv)
const bool init_from_restart_file = !EWOMS_GET_PARAM(PreTypeTag, bool, SchedRestart);
const auto& init_config = eclipseState->getInitConfig();
if (init_config.restartRequested() && init_from_restart_file) {
throw std::logic_error("Sorry - the ability to initialize wells and groups from the restart file is currently not ready");
int report_step = init_config.getRestartStep();
const auto& rst_filename = eclipseState->getIOConfig().getRestartFileName( init_config.getRestartRootName(), report_step, false );
Opm::EclIO::ERst rst_file(rst_filename);