Merge pull request #2115 from joakim-hove/all-connections-inactive

Automatically shut wells with no connections

tests/parser/ConnectionTests.cpp

@@ -42,6 +42,7 @@
 
 #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+#include <opm/common/OpmLog/KeywordLocation.hpp>
 
 #include <opm/parser/eclipse/Units/Units.hpp>
 
@@ -61,7 +62,7 @@ Opm::WellConnections loadCOMPDAT(const std::string& compdat_keyword) {
     const auto& keyword = deck.getKeyword("COMPDAT", 0);
     Opm::WellConnections connections(Opm::Connection::Order::TRACK, 10,10);
     for (const auto& rec : keyword)
-        connections.loadCOMPDAT(rec, grid, field_props);
+        connections.loadCOMPDAT(rec, grid, field_props, {});
 
     return connections;
 }

tests/parser/WellTests.cpp

@@ -1343,7 +1343,7 @@ END
                         "P and Q must have the same internal connections pointers");
 
     auto connQ = std::make_shared<WellConnections>(wellP.getConnections());
-    wellQ.forceUpdateConnections(std::move(connQ));
+    wellQ.updateConnections(std::move(connQ), true);
     BOOST_CHECK_MESSAGE(! wellP.hasSameConnectionsPointers(wellQ),
                         "P and Q must NOT have the same internal connections pointers "
                         "after forcibly updating the connections structure");