OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add runtime Schedule integration test - guarded by #ifdef

Browse Source
This commit is contained in:
Joakim Hove
2021-01-11 09:53:34 +01:00
parent 046f5800e4
commit c8ba2b30b3
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -11,6 +11,7 @@ option(ENABLE_MOCKSIM "Build the mock simulator for io testing" ON)
option(OPM_ENABLE_PYTHON "Enable python bindings?" OFF)
option(OPM_INSTALL_PYTHON "Enable python bindings?" OFF)
option(OPM_ENABLE_EMBEDDED_PYTHON "Enable python bindings?" OFF)
option(ENABLE_SCHEDULE_DEBUG "Enable runtime integration testing of Schedule construction" OFF)
# Output implies input
if(ENABLE_ECL_OUTPUT)
@@ -181,6 +182,10 @@ if (ENABLE_MOCKSIM)
endif()
endif()
if (ENABLE_SCHEDULE_DEBUG)
add_compile_definitions( SCHEDULE_DEBUG )
endif()
# Build the compare utilities
if(ENABLE_ECL_INPUT)
add_executable(compareECL

75
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -153,47 +153,46 @@ namespace {
this->iterateScheduleSection( {}, parseContext, errors, grid, fp);
/*
The code in the if (integration_test) { ... } is an enforced
integration test to assert the sanity of the ongoing Schedule
refactoring. At the very latest this should be removed when the
Schedule refactoring is complete.
The code in the #ifdef SCHEDULE_DEBUG is an enforced integration test
to assert the sanity of the ongoing Schedule refactoring. This will be
removed when the Schedule refactoring is complete.
*/
const bool integration_test = false;
if (integration_test) {
if (this->size() == 0)
return;
#ifdef SCHEDULE_DEBUG
if (this->size() == 0)
return;
// Verify that we can safely re-iterate over the Schedule section
if (!rst)
this->iterateScheduleSection( 0, parseContext, errors, grid, fp);
else {
auto restart_offset = this->m_sched_deck.restart_offset();
this->iterateScheduleSection( restart_offset, parseContext, errors, grid, fp);
}
// Verify that the time schedule is correct.
for (std::size_t report_step = 0; report_step < this->size() - 1; report_step++) {
const auto& this_block = this->m_sched_deck[report_step];
if (this_block.start_time() != std::chrono::system_clock::from_time_t(this->m_timeMap[report_step])) {
auto msg = fmt::format("Block: Bug in start_time for report_step: {} ", report_step);
throw std::logic_error(msg);
}
const auto& next_block = this->m_sched_deck[report_step + 1];
if (this_block.end_time() != next_block.start_time())
throw std::logic_error("Block: Internal bug in sched_block start / end inconsistent");
const auto& this_step = this->operator[](report_step);
if (this_step.start_time() != std::chrono::system_clock::from_time_t(this->m_timeMap[report_step])) {
auto msg = fmt::format("Bug in start_time for report_step: {} ", report_step);
throw std::logic_error(msg);
}
const auto& next_step = this->operator[](report_step + 1);
if (this_step.end_time() != next_step.start_time())
throw std::logic_error(fmt::format("Internal bug in sched_step start / end inconsistent report:{}", report_step));
}
// Verify that we can safely re-iterate over the Schedule section
if (!rst)
this->iterateScheduleSection(0, parseContext, errors, grid, fp);
else {
auto restart_offset = this->m_sched_deck.restart_offset();
this->iterateScheduleSection(restart_offset, parseContext, errors, grid, fp);
}
// Verify that the time schedule is correct.
for (std::size_t report_step = 0; report_step < this->size() - 1; report_step++) {
const auto& this_block = this->m_sched_deck[report_step];
if (this_block.start_time() != std::chrono::system_clock::from_time_t(this->m_timeMap[report_step])) {
auto msg = fmt::format("Block: Bug in start_time for report_step: {} ", report_step);
throw std::logic_error(msg);
}
const auto& next_block = this->m_sched_deck[report_step + 1];
if (this_block.end_time() != next_block.start_time())
throw std::logic_error("Block: Internal bug in sched_block start / end inconsistent");
const auto& this_step = this->operator[](report_step);
if (this_step.start_time() != std::chrono::system_clock::from_time_t(this->m_timeMap[report_step])) {
auto msg = fmt::format("Bug in start_time for report_step: {} ", report_step);
throw std::logic_error(msg);
}
const auto& next_step = this->operator[](report_step + 1);
if (this_step.end_time() != next_step.start_time())
throw std::logic_error(
fmt::format("Internal bug in sched_step start / end inconsistent report:{}", report_step));
}
#endif
}
catch (const OpmInputError& opm_error) {
throw;