From 4dfa22e6a26254857d4827fc0f7528949a8734cc Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 10 Mar 2020 08:50:32 +0100 Subject: [PATCH 1/2] Allow flow to continue with --sched-restart=false --- flow/flow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/flow/flow.cpp b/flow/flow.cpp index eed3e15de..1431551ce 100644 --- a/flow/flow.cpp +++ b/flow/flow.cpp @@ -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); From 779bc981f66ba1c389ef462a077bba994dcc0fe9 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 10 Mar 2020 09:23:03 +0100 Subject: [PATCH 2/2] Use --sched-restart=false in restart testing --- compareECLFiles.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake index 1df999f93..f016f94fa 100755 --- a/compareECLFiles.cmake +++ b/compareECLFiles.cmake @@ -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 "")