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

Remove DeckPtr+ParserPtr aliases

Browse Source 
Remove the deprecated DeckPtr and ParserPtr aliases and removes
shared_ptr<Deck> and friends from all interfaces.
This commit is contained in:
Jørgen Kvalsvik
2016-10-19 20:38:28 +02:00
parent 0059446147
commit f9cb516b99
79 changed files with 1461 additions and 1741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/parser/eclipse/EclipseState/IOConfig/tests/IOConfigTest.cpp
+6 -6
View File
@@ -154,15 +154,15 @@ const std::string deckStr_RFT = "RUNSPEC\n"
static DeckPtr createDeck(const std::string& input) {
static Deck createDeck(const std::string& input) {
Opm::Parser parser;
return parser.parseString(input, Opm::ParseContext());
}
BOOST_AUTO_TEST_CASE( RFT_TIME) {
DeckPtr deck = createDeck(deckStr_RFT);
EclipseState state( *deck , Opm::ParseContext() );
Deck deck = createDeck(deckStr_RFT);
EclipseState state( deck , Opm::ParseContext() );
const IOConfig& ioConfig = state.cfg().io();
@@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE(DefaultProperties) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
IOConfig ioConfig( *deck );
IOConfig ioConfig( deck );
/*If no GRIDFILE nor NOGGF keywords are specified, default output an EGRID file*/
BOOST_CHECK( ioConfig.getWriteEGRIDFile() );
@@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE(OutputProperties) {
auto deck = Parser().parseString( data, ParseContext() );
IOConfig ioConfig( *deck );
IOConfig ioConfig( deck );
BOOST_CHECK( !ioConfig.getWriteEGRIDFile() );
/*If INIT keyword is specified, verify write of INIT file*/
@@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(NoGRIDFILE) {
"\n";
auto deck = Parser().parseString( data, ParseContext() );
IOConfig ioConfig( *deck );
IOConfig ioConfig( deck );
/*If GRIDFILE 0 0 is specified, no EGRID file is written */
BOOST_CHECK( !ioConfig.getWriteEGRIDFile() );
opm/parser/eclipse/EclipseState/IOConfig/tests/RestartConfigTests.cpp
+27 -27
View File
@@ -39,7 +39,7 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(RPTSCHED_INTEGER) {
const char *deckData1 =
const char* deckData1 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED_INTEGER) {
ParseContext ctx;
auto deck1 = parser.parseString( deckData1, ctx );
RestartConfig rstConfig1( *deck1 );
RestartConfig rstConfig1( deck1 );
BOOST_CHECK( rstConfig1.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig1.getWriteRestartFile( 1 ) );
@@ -255,12 +255,12 @@ BOOST_AUTO_TEST_CASE(RPTRST_mixed_mnemonics_int_list) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
BOOST_CHECK_THROW( RestartConfig c( *deck ), std::runtime_error );
BOOST_CHECK_THROW( RestartConfig c( deck ), std::runtime_error );
}
BOOST_AUTO_TEST_CASE(RPTRST) {
const char *deckData1 =
const char* deckData1 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -281,7 +281,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
" 20 JAN 2010 / \n"
"/\n";
const char *deckData2 =
const char* deckData2 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -302,7 +302,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
" 20 JAN 2011 / \n"
"/\n";
const char *deckData3 =
const char* deckData3 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -327,7 +327,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
ParseContext ctx;
auto deck1 = parser.parseString( deckData1, ctx );
RestartConfig rstConfig1( *deck1 );
RestartConfig rstConfig1( deck1 );
// Observe that this is true due to some undocumented guessing that
// the initial restart file should be written if a RPTRST keyword is
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
BOOST_CHECK_EQUAL( rstConfig1.getKeyword( "ALLPROPS" , 2 ) , 0);
auto deck2 = parser.parseString( deckData2, ctx );
RestartConfig rstConfig2( *deck2 );
RestartConfig rstConfig2( deck2 );
const auto expected2 = { "BASIC", "FLOWS", "FREQ" };
const auto kw_list2 = fun::map( fst, rstConfig2.getRestartKeywords( 2 ) );
@@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
BOOST_CHECK( !rstConfig2.getWriteRestartFile( 3 ) );
auto deck3 = parser.parseString( deckData3, ctx );
RestartConfig rstConfig3( *deck3 );
RestartConfig rstConfig3( deck3 );
BOOST_CHECK( !rstConfig3.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig3.getWriteRestartFile( 1 ) );
@@ -373,7 +373,7 @@ BOOST_AUTO_TEST_CASE(RPTRST) {
BOOST_AUTO_TEST_CASE(RPTSCHED) {
const char *deckData1 =
const char* deckData1 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -398,7 +398,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
"/\n";
const char *deckData2 =
const char* deckData2 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -425,7 +425,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
"NOTHING RUBBISH\n"
"/\n";
const char *deckData3 =
const char* deckData3 =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -456,7 +456,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
ParseContext ctx;
auto deck1 = parser.parseString( deckData1, ctx );
RestartConfig rstConfig1( *deck1 );
RestartConfig rstConfig1( deck1 );
BOOST_CHECK( !rstConfig1.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig1.getWriteRestartFile( 1 ) );
@@ -465,7 +465,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
auto deck2 = parser.parseString( deckData2, ctx );
RestartConfig rstConfig2( *deck2 );
RestartConfig rstConfig2( deck2 );
BOOST_CHECK( !rstConfig2.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig2.getWriteRestartFile( 1 ) );
@@ -479,7 +479,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
auto deck3 = parser.parseString( deckData3, ctx );
RestartConfig rstConfig3( *deck3 );
RestartConfig rstConfig3( deck3 );
//Older ECLIPSE 100 data set may use integer controls instead of mnemonics
BOOST_CHECK( rstConfig3.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig3.getWriteRestartFile( 1 ) );
@@ -493,7 +493,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED) {
BOOST_AUTO_TEST_CASE(RPTSCHED_and_RPTRST) {
const char *deckData =
const char* deckData =
"RUNSPEC\n"
"DIMENS\n"
" 10 10 10 /\n"
@@ -522,7 +522,7 @@ BOOST_AUTO_TEST_CASE(RPTSCHED_and_RPTRST) {
ParseContext ctx;
auto deck = parser.parseString( deckData, ctx );
RestartConfig rstConfig( *deck );
RestartConfig rstConfig( deck );
BOOST_CHECK( !rstConfig.getWriteRestartFile( 0 ) );
BOOST_CHECK( !rstConfig.getWriteRestartFile( 1 ) );
@@ -552,7 +552,7 @@ BOOST_AUTO_TEST_CASE(NO_BASIC) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
for( size_t ts = 0; ts < 4; ++ts )
BOOST_CHECK( !ioConfig.getWriteRestartFile( ts ) );
@@ -583,7 +583,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_1) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
for( size_t ts = 0; ts < 3; ++ts )
BOOST_CHECK( !ioConfig.getWriteRestartFile( ts ) );
@@ -618,7 +618,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_3) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
const size_t freq = 3;
@@ -655,7 +655,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_4) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
/* BASIC=4, restart file is written at the first report step of each year.
*/
@@ -693,7 +693,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_4_FREQ_2) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
/* BASIC=4, restart file is written at the first report step of each year.
* Optionally, if the mnemonic FREQ is set >1 the restart is written only
@@ -735,7 +735,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_5) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
/* BASIC=5, restart file is written at the first report step of each month.
*/
@@ -773,7 +773,7 @@ BOOST_AUTO_TEST_CASE(BASIC_EQ_0) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
/* RESTART=0, no restart file is written
*/
@@ -809,7 +809,7 @@ BOOST_AUTO_TEST_CASE(RESTART_EQ_0) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
/* RESTART=0, no restart file is written
*/
@@ -849,7 +849,7 @@ BOOST_AUTO_TEST_CASE(RESTART_BASIC_GT_2) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
for( size_t ts : { 1, 2, 3, 4, 5, 7, 8, 10, 11 } )
BOOST_CHECK( !ioConfig.getWriteRestartFile( ts ) );
@@ -890,7 +890,7 @@ BOOST_AUTO_TEST_CASE(RESTART_BASIC_LEQ_2) {
"/\n";
auto deck = Parser().parseString( data, ParseContext() );
RestartConfig ioConfig( *deck );
RestartConfig ioConfig( deck );
BOOST_CHECK( ioConfig.getWriteRestartFile( 1 ) );
for( size_t ts = 2; ts < 11; ++ts )