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

Removed well testing from Schedule constructor

CMakeLists.txt

@@ -8,11 +8,6 @@ set(OPM_MACROS_ROOT ${PROJECT_SOURCE_DIR})
 option(ENABLE_ECL_INPUT "Enable eclipse input support?" ON)
 option(ENABLE_ECL_OUTPUT "Enable eclipse output support?" 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
 if(ENABLE_ECL_OUTPUT)

jenkins/build-opm-module.sh

@@ -3,7 +3,6 @@
 declare -A configurations
 
 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"
 
 # Parse revisions from trigger comment and setup arrays

opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp

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

src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp

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