Liu Ming
c42cfafc90
Merge remote-tracking branch 'remotes/opm/master' into MessageContainer-sub-class
...
Conflicts:
opm/parser/eclipse/EclipseState/EclipseState.cpp
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
2016-04-22 14:53:16 +08:00
Atgeirr Flø Rasmussen
1c4e4bd3da
Silence some shadowing warnings.
2016-04-21 09:32:25 +02:00
Pål Grønås Drange
444f74642c
Refactored EclipseState.getEclipseGrid to getInputGrid
2016-04-19 16:47:05 +02:00
Liu Ming
d73b79c210
remove unused headers.
2016-04-14 09:38:54 +08:00
Pål Grønås Drange
4e97aab8aa
Testing Eclipse3DProperties API
...
* Added Eclipse3DPropertiesTests
* Refactored tests to use Eclipse3DProperties instead of EclipseState
* Added unsigned literal to MessageContainerTest
2016-04-13 12:44:07 +02:00
