Updated to use ParseMode.

This commit is contained in:
Joakim Hove
2015-07-27 13:07:02 +02:00
parent bfa1d476e3
commit b94d5a135d
2 changed files with 7 additions and 3 deletions

View File

@@ -18,6 +18,7 @@
#include <opm/core/linalg/LinearSolverFactory.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
@@ -34,9 +35,10 @@ try
simtimer.init(parameters);
// Read input file
ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck = parser->parseFile(file_name);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::DeckConstPtr deck = parser->parseFile(file_name , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
std::cout << "Done!" << std::endl;
// Setup grid

View File

@@ -29,6 +29,7 @@
#include <boost/test/unit_test.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/Units.hpp>
@@ -41,7 +42,8 @@ BOOST_AUTO_TEST_CASE(CreateTimer)
{
const std::string filename1 = "TESTTIMER.DATA";
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 );
Opm::ParseMode parseMode;
Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 , parseMode);
Opm::TimeMapPtr timeMap(new Opm::TimeMap(parserDeck));
Opm::SimulatorTimer simtimer;