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

Merge pull request #788 from joakim-hove/remove-welltest

Browse Source 
Removed well testing from Schedule constructor
This commit is contained in:
Joakim Hove 2019-05-27 20:13:45 +02:00 committed by GitHub
commit 2682eef9b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -8,11 +8,6 @@ set(OPM_MACROS_ROOT ${PROJECT_SOURCE_DIR})
option(ENABLE_ECL_INPUT "Enable eclipse input support?" ON) option(ENABLE_ECL_INPUT "Enable eclipse input support?" ON)
option(ENABLE_ECL_OUTPUT "Enable eclipse output support?" ON) option(ENABLE_ECL_OUTPUT "Enable eclipse output support?" ON)
option(ENABLE_MOCKSIM "Build the mock simulator for io testing" ON) option(ENABLE_MOCKSIM "Build the mock simulator for io testing" ON)
option(ENABLE_WELL_TEST "Enable testing of well code when building Schedule object" OFF)
if (ENABLE_WELL_TEST)
add_definitions(-DWELL_TEST)
endif()
# Output implies input # Output implies input
if(ENABLE_ECL_OUTPUT) if(ENABLE_ECL_OUTPUT)

1
jenkins/build-opm-module.sh
View File

@ -3,7 +3,6 @@
declare -A configurations declare -A configurations
declare -A EXTRA_MODULE_FLAGS declare -A EXTRA_MODULE_FLAGS
EXTRA_MODULE_FLAGS[opm-common]="-DENABLE_WELL_TEST=ON"
EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON" EXTRA_MODULE_FLAGS[opm-simulators]="-DBUILD_EBOS_EXTENSIONS=ON -DBUILD_EBOS_DEBUG_EXTENSIONS=ON"
# Parse revisions from trigger comment and setup arrays # Parse revisions from trigger comment and setup arrays

3
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@ -252,9 +252,6 @@ namespace Opm
const UnitSystem& unit_system, const UnitSystem& unit_system,
std::vector<std::pair<const DeckKeyword*, size_t > >& rftProperties); std::vector<std::pair<const DeckKeyword*, size_t > >& rftProperties);
void addWellEvent(const std::string& well, ScheduleEvents::Events event, size_t reportStep); void addWellEvent(const std::string& well, ScheduleEvents::Events event, size_t reportStep);
#ifdef WELL_TEST
bool checkWells(const ParseContext& parseContext, ErrorGuard& errors) const;
#endif
}; };
} }

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

@ -2293,10 +2293,5 @@ namespace Opm {
} }
#ifdef WELL_TEST
bool Schedule::checkWells(const ParseContext& parseContext, ErrorGuard& errors) const {
return true;
}
#endif
} }