Atle Haugan
|
1dd448b178
|
Merge branch 'master' into specialkeywords
Conflicts:
opm/parser/eclipse/EclipseState/EclipseState.hpp
|
2014-01-30 15:05:01 +01:00 |
|
Atle Haugan
|
825e976566
|
New version based on feedback from code review
|
2014-01-29 19:39:33 +01:00 |
|
Joakim Hove
|
a464429388
|
Added namespace Phase around the PhaseEnum enum.
|
2014-01-28 08:18:03 +01:00 |
|
Kristian Flikka
|
ab49cba392
|
Fixed erroneous include statement path
|
2014-01-08 16:03:19 +01:00 |
|
Kristian Flikka
|
fd99df1213
|
Added missing include statements
|
2014-01-08 15:59:38 +01:00 |
|
Joakim Hove
|
09f70a2205
|
Added std::set<enum PhaseEnum> to keep track of phases present to the EclipseState.
|
2014-01-07 17:52:20 +01:00 |
|
Joakim Hove
|
b90830ea79
|
Added class EclipseState which currently holds a Schedule instance.
|
2014-01-07 17:39:07 +01:00 |
|