rename ParseMode as ParseContext in IntegrationTests folder.
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
|
||||
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
|
||||
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
|
||||
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
|
||||
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
|
||||
#include <opm/parser/eclipse/Parser/Parser.hpp>
|
||||
|
||||
using namespace Opm;
|
||||
@@ -300,10 +300,10 @@ BOOST_AUTO_TEST_CASE( NorneResttartConfig ) {
|
||||
rptConfig.push_back( std::make_tuple(241 , true , boost::gregorian::date( 2006,10,10)) );
|
||||
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/RPTRST_DECK.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/RPTRST_DECK.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
|
||||
verifyRestartConfig(state.getIOConfigConst(), rptConfig);
|
||||
}
|
||||
@@ -345,10 +345,10 @@ BOOST_AUTO_TEST_CASE( RestartConfig2 ) {
|
||||
else rptConfig.push_back( std::make_tuple(report_step, false, boost::gregorian::date(2000,1,1)));
|
||||
}
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/RPT_TEST2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/RPT_TEST2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
|
||||
verifyRestartConfig(state.getIOConfigConst(), rptConfig);
|
||||
}
|
||||
@@ -499,10 +499,10 @@ void fillRptConfig(std::vector<std::tuple<int, bool, boost::gregorian::date>>& r
|
||||
BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_1 ) {
|
||||
|
||||
//Write reportfile every first day of a month
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
@@ -524,10 +524,10 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_1 ) {
|
||||
BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_13 ) {
|
||||
|
||||
//Write reportfile every first day of a month
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -555,10 +555,10 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_13 ) {
|
||||
BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_14 ) {
|
||||
|
||||
//Write reportfile every first day of a month
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -583,10 +583,10 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_14 ) {
|
||||
BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_SET_ON_TIMESTEP_37 ) {
|
||||
|
||||
//Write reportfile every first day of a month
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -641,11 +641,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_FREQ10_SET_ON_TIMESTEP_10 ) {
|
||||
}
|
||||
}
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -675,11 +675,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_FREQ40_SET_ON_TIMESTEP_1 ) {
|
||||
}
|
||||
}
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -699,10 +699,10 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_FREQ40_SET_ON_TIMESTEP_1 ) {
|
||||
BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC5_FREQ40_SET_ON_TIMESTEP_14 ) {
|
||||
|
||||
//Write reportfile every first day of a month, with frequency 40
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
EclipseState state( deck , parseMode );
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 5;
|
||||
@@ -764,11 +764,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC4_SET_ON_TIMESTEP_1 ) {
|
||||
}
|
||||
}
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
int basic = 4;
|
||||
@@ -812,11 +812,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC4_SET_ON_TIMESTEP_12 ) {
|
||||
}
|
||||
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
|
||||
@@ -858,11 +858,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC4_SET_ON_TIMESTEP_13 ) {
|
||||
}
|
||||
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
|
||||
@@ -894,11 +894,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC4_FREQ3_SET_ON_TIMESTEP_13 ) {
|
||||
}
|
||||
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
|
||||
@@ -973,11 +973,11 @@ BOOST_AUTO_TEST_CASE( SPE1CASE2_BASIC3_FREQ5_SET_ON_TIMESTEP_11 ) {
|
||||
}
|
||||
|
||||
|
||||
ParseMode parseMode;
|
||||
ParseContext parseContext;
|
||||
ParserPtr parser(new Parser());
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseMode);
|
||||
DeckConstPtr deck = parser->parseFile("testdata/integration_tests/IOConfig/SPE1CASE2.DATA", parseContext);
|
||||
|
||||
EclipseState state( deck , parseMode );
|
||||
EclipseState state( deck , parseContext );
|
||||
std::shared_ptr<IOConfig> ioconfig = state.getIOConfig();
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user