WellState: move typedefs into public section and include string.

This commit is contained in:
Robert Kloefkorn 2015-09-16 10:00:03 +02:00
parent 50bf1d7e62
commit 8163137b2c

View File

@ -22,9 +22,10 @@
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/well_controls.h> #include <opm/core/well_controls.h>
#include <vector>
#include <array> #include <array>
#include <map> #include <map>
#include <string>
#include <vector>
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
@ -34,11 +35,10 @@ namespace Opm
/// The state of a set of wells. /// The state of a set of wells.
class WellState class WellState
{ {
protected: public:
typedef std::array< int, 3 > mapentry_t; typedef std::array< int, 3 > mapentry_t;
typedef std::map< std::string, mapentry_t > WellMapType; typedef std::map< std::string, mapentry_t > WellMapType;
public:
/// Allocate and initialize if wells is non-null. /// Allocate and initialize if wells is non-null.
/// Also tries to give useful initial values to the bhp() and /// Also tries to give useful initial values to the bhp() and
/// wellRates() fields, depending on controls. The /// wellRates() fields, depending on controls. The