OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added ParseMode argument

Browse Source
This commit is contained in:
Joakim Hove 2015-07-27 13:53:11 +02:00
parent 0c2c079bd9
commit 71f3cc9c64
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/flow_polymer.cpp
View File

@ -57,6 +57,7 @@
#include <opm/parser/eclipse/OpmLog/CounterLog.hpp> #include <opm/parser/eclipse/OpmLog/CounterLog.hpp>
#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/EclipseState/checkDeck.hpp> #include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@ -163,10 +164,11 @@ try
Opm::DeckConstPtr deck; Opm::DeckConstPtr deck;
std::shared_ptr<EclipseState> eclipseState; std::shared_ptr<EclipseState> eclipseState;
Opm::ParseMode parseMode;
try { try {
deck = parser->parseFile(deck_filename); deck = parser->parseFile(deck_filename , parseMode);
Opm::checkDeck(deck); Opm::checkDeck(deck);
eclipseState.reset(new Opm::EclipseState(deck)); eclipseState.reset(new Opm::EclipseState(deck , parseMode));
} }
catch (const std::invalid_argument& e) { catch (const std::invalid_argument& e) {
std::cerr << "Failed to create valid ECLIPSESTATE object. See logfile: " << logFile << std::endl; std::cerr << "Failed to create valid ECLIPSESTATE object. See logfile: " << logFile << std::endl;

6
examples/sim_poly2p_comp_reorder.cpp
View File

@ -48,6 +48,7 @@
#include <opm/polymer/PolymerProperties.hpp> #include <opm/polymer/PolymerProperties.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/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
@ -99,8 +100,9 @@ try
if (use_deck) { if (use_deck) {
std::string deck_filename = param.get<std::string>("deck_filename"); std::string deck_filename = param.get<std::string>("deck_filename");
ParserPtr parser(new Opm::Parser()); ParserPtr parser(new Opm::Parser());
deck = parser->parseFile(deck_filename); ParseMode parseMode;
eclipseState.reset(new Opm::EclipseState(deck)); deck = parser->parseFile(deck_filename , parseMode);
eclipseState.reset(new Opm::EclipseState(deck , parseMode));
// Grid init // Grid init
grid.reset(new GridManager(deck)); grid.reset(new GridManager(deck));

6
examples/sim_poly2p_incomp_reorder.cpp
View File

@ -48,6 +48,7 @@
#include <opm/polymer/PolymerProperties.hpp> #include <opm/polymer/PolymerProperties.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/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
@ -98,9 +99,10 @@ try
double gravity[3] = { 0.0 }; double gravity[3] = { 0.0 };
if (use_deck) { if (use_deck) {
std::string deck_filename = param.get<std::string>("deck_filename"); std::string deck_filename = param.get<std::string>("deck_filename");
ParseMode parseMode;
ParserPtr parser(new Opm::Parser()); ParserPtr parser(new Opm::Parser());
deck = parser->parseFile(deck_filename); deck = parser->parseFile(deck_filename , parseMode);
eclipseState.reset(new Opm::EclipseState(deck)); eclipseState.reset(new Opm::EclipseState(deck , parseMode));
// Grid init // Grid init
grid.reset(new GridManager(deck)); grid.reset(new GridManager(deck));

6
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -63,6 +63,7 @@
#include <opm/parser/eclipse/OpmLog/CounterLog.hpp> #include <opm/parser/eclipse/OpmLog/CounterLog.hpp>
#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/EclipseState/checkDeck.hpp> #include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@ -137,6 +138,7 @@ try
} }
std::string logFile = output_dir + "/LOGFILE.txt"; std::string logFile = output_dir + "/LOGFILE.txt";
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser()); Opm::ParserPtr parser(new Opm::Parser());
{ {
std::shared_ptr<Opm::StreamLog> streamLog = std::make_shared<Opm::StreamLog>(logFile , Opm::Log::DefaultMessageTypes); std::shared_ptr<Opm::StreamLog> streamLog = std::make_shared<Opm::StreamLog>(logFile , Opm::Log::DefaultMessageTypes);
@ -149,9 +151,9 @@ try
Opm::DeckConstPtr deck; Opm::DeckConstPtr deck;
std::shared_ptr<EclipseState> eclipseState; std::shared_ptr<EclipseState> eclipseState;
try { try {
deck = parser->parseFile(deck_filename); deck = parser->parseFile(deck_filename , parseMode);
Opm::checkDeck(deck); Opm::checkDeck(deck);
eclipseState.reset(new Opm::EclipseState(deck)); eclipseState.reset(new Opm::EclipseState(deck , parseMode));
} }
catch (const std::invalid_argument& e) { catch (const std::invalid_argument& e) {
std::cerr << "Failed to create valid ECLIPSESTATE object. See logfile: " << logFile << std::endl; std::cerr << "Failed to create valid ECLIPSESTATE object. See logfile: " << logFile << std::endl;