OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed getDims() and disable this EclipseGrid

Browse Source 
* Removed method getDims since getNXYZ already exists
* Now we throw if EclipseGrid get lean deck
* Removed tests for assertCellInfo and hasCellInfo
* Fixed ResinsightTests to use GridDims
This commit is contained in:
Pål Grønås Drange
2016-06-21 14:56:34 +02:00
parent 1fada954e2
commit 49f3356934
9 changed files with 85 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
opm/parser/eclipse/IntegrationTests/ResinsightTest.cpp
View File

@@ -17,7 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#define BOOST_TEST_MODULE BoxTest
#define BOOST_TEST_MODULE ResinsightIntegrationTests
#include <boost/test/unit_test.hpp>
#include <boost/test/test_tools.hpp>
@@ -29,7 +30,7 @@
#include <opm/parser/eclipse/Parser/ParserKeywords/G.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridDims.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
@@ -46,10 +47,18 @@ BOOST_AUTO_TEST_CASE( test_parse ) {
parser.addKeyword<ParserKeywords::SPECGRID>();
parser.addKeyword<ParserKeywords::FAULTS>();
auto deck = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext);
auto deckptr = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext);
const Deck& deck = *deckptr;
BOOST_CHECK( deck->hasKeyword<ParserKeywords::SPECGRID>() );
BOOST_CHECK( deck->hasKeyword<ParserKeywords::FAULTS>() );
BOOST_CHECK( deck.hasKeyword<ParserKeywords::SPECGRID>() );
BOOST_CHECK( deck.hasKeyword<ParserKeywords::FAULTS>() );
{
GridDims* grid = nullptr;
BOOST_CHECK_NO_THROW( grid = new GridDims(deck) );
BOOST_CHECK_NO_THROW( grid->getCartesianSize() );
delete grid;
}
}
@@ -64,9 +73,14 @@ BOOST_AUTO_TEST_CASE( test_state ) {
parser.addKeyword<ParserKeywords::SPECGRID>();
parser.addKeyword<ParserKeywords::FAULTS>();
parser.addKeyword<ParserKeywords::GRID>();
auto deck = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext);
auto deckptr = parser.parseFile("testdata/integration_tests/Resinsight/DECK1.DATA" , parseContext);
const Deck& deck = *deckptr;
auto grid = std::make_shared<EclipseGrid>(deck);
GRIDSection gsec(*deck);
FaultCollection faults(gsec, *grid);
GridDims grid(deck);
GRIDSection gsec(deck);
FaultCollection faults(gsec, grid);
BOOST_CHECK_EQUAL( grid.getNX(), 20U);
BOOST_CHECK_EQUAL( grid.getNY(), 20U);
BOOST_CHECK_EQUAL( grid.getNZ(), 10U);
BOOST_CHECK_EQUAL( faults.size(), 2U);
}