Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class

Conflicts: opm/parser/eclipse/EclipseState/EclipseState.cpp
2016-04-15 09:14:00 +08:00
parent 37f13e3761 92a55cb267
commit 940d7f8449
21 changed files with 246 additions and 44 deletions
--- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
@@ -1495,6 +1495,10 @@ namespace Opm {
        return m_wells.get( wellName );
    }

+    const Well& Schedule::getWell(const std::string& wellName) const {
+        return *m_wells.get( wellName );
+    }
+

    /*
      Observe that this method only returns wells which have state ==