OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-06 14:16:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename ParseMode as ParseContext.

Browse Source
This commit is contained in:
Liu Ming committed 2016-03-17 09:57:59 +08:00
1 parent cb41a45687
commit 8cd08728f7
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/wells_example.cpp
+5 -5
View File
@@ -18,7 +18,7 @@
#include <opm/core/linalg/LinearSolverFactory.hpp> #include <opm/core/linalg/LinearSolverFactory.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp> #include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
@@ -35,10 +35,10 @@ try
simtimer.init(parameters); simtimer.init(parameters);
// Read input file // Read input file
ParseMode parseMode; ParseContext parseContext;
Opm::ParserPtr parser(new Opm::Parser()); Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck = parser->parseFile(file_name , parseMode); Opm::DeckConstPtr deck = parser->parseFile(file_name , parseContext);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseContext));
std::cout << "Done!" << std::endl; std::cout << "Done!" << std::endl;
// Setup grid // Setup grid
@@ -108,7 +108,7 @@ try
TwophaseFluid fluid(incomp_properties); TwophaseFluid fluid(incomp_properties);
TransportModel model(fluid, *grid->c_grid(), porevol, gravity[2], true); TransportContextl model(fluid, *grid->c_grid(), porevol, gravity[2], true);
TransportSolver tsolver(model); TransportSolver tsolver(model);
tests/test_timer.cpp
+3 -3
View File
@@ -31,7 +31,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp> #include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp> #include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
@@ -44,8 +44,8 @@ BOOST_AUTO_TEST_CASE(CreateTimer)
{ {
const std::string filename1 = "TESTTIMER.DATA"; const std::string filename1 = "TESTTIMER.DATA";
Opm::ParserPtr parser(new Opm::Parser() ); Opm::ParserPtr parser(new Opm::Parser() );
Opm::ParseMode parseMode; Opm::ParseContext parseContext;
Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 , parseMode); Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 , parseContext);
Opm::TimeMapPtr timeMap(new Opm::TimeMap(parserDeck)); Opm::TimeMapPtr timeMap(new Opm::TimeMap(parserDeck));
Opm::SimulatorTimer simtimer; Opm::SimulatorTimer simtimer;