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

rename the last files.

Browse Source
This commit is contained in:
Liu Ming
2016-03-17 08:42:46 +08:00
parent 1fe83c9a78
commit 25acd89325
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/Applications/OpmLoadDeck.cpp
View File

@@ -26,21 +26,21 @@
#include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
void loadDeck( const char * deck_file) {
Opm::ParseMode parseMode;
Opm::ParseContext parseContext;
Opm::ParserPtr parser(new Opm::Parser());
std::shared_ptr<const Opm::Deck> deck;
std::shared_ptr<Opm::EclipseState> state;
std::cout << "Loading deck: " << deck_file << " ..... "; std::cout.flush();
deck = parser->parseFile(deck_file, parseMode);
deck = parser->parseFile(deck_file, parseContext);
std::cout << "parse complete - creating EclipseState .... "; std::cout.flush();
state = std::make_shared<Opm::EclipseState>( deck , parseMode );
state = std::make_shared<Opm::EclipseState>( deck , parseContext );
std::cout << "complete." << std::endl;
}

8
opm/parser/eclipse/Applications/Schedule.cpp
View File

@@ -25,7 +25,7 @@
#include <iostream>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
@@ -33,13 +33,13 @@
int main(int /* argc */, char** argv) {
Opm::ParseMode parseMode;
Opm::ParseContext parseContext;
Opm::ParserPtr parser(new Opm::Parser());
std::string file = argv[1];
Opm::DeckConstPtr deck = parser->parseFile(file, parseMode);
Opm::DeckConstPtr deck = parser->parseFile(file, parseContext);
std::shared_ptr<const Opm::EclipseGrid> grid = std::make_shared<const Opm::EclipseGrid>( deck );
Opm::IOConfigPtr ioConfig = std::make_shared<Opm::IOConfig>();
Opm::Schedule sched( parseMode , grid , deck, ioConfig );
Opm::Schedule sched( parseContext , grid , deck, ioConfig );
std::cout << "Wells: " << sched.numWells() << std::endl;

8
opm/parser/eclipse/Applications/opm-eclkwtest.cpp
View File

@@ -25,7 +25,7 @@
#include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@@ -66,11 +66,11 @@ int main(int argc, char** argv) {
printKeywords = true;
}
//std::shared_ptr<Opm::StreamLog> streamLog = std::make_shared<Opm::StreamLog>("log.txt" , Opm::Log::MessageType::Warning);
Opm::ParseMode parseMode;
Opm::ParseContext parseContext;
Opm::ParserPtr parser(new Opm::Parser());
std::string file = argv[1];
Opm::DeckConstPtr deck = parser->parseFile(file, parseMode);
Opm::EclipseState state(deck , parseMode );
Opm::DeckConstPtr deck = parser->parseFile(file, parseContext);
Opm::EclipseState state(deck , parseContext );
printDeckDiagnostics(deck, printKeywords);

6
opm/parser/eclipse/CMakeLists.txt
View File

@@ -50,7 +50,7 @@ Deck/DeckTimeStep.cpp
)
set( parser_source
Parser/ParseMode.cpp
Parser/ParseContext.cpp
Parser/ParserEnums.cpp
Parser/ParserKeyword.cpp
Parser/Parser.cpp
@@ -66,7 +66,7 @@ Generator/KeywordGenerator.cpp
Generator/KeywordLoader.cpp )
set( build_parser_source
Parser/ParseMode.cpp
Parser/ParseContext.cpp
Parser/ParserEnums.cpp
Parser/ParserKeyword.cpp
Parser/ParserRecord.cpp
@@ -175,7 +175,7 @@ Parser/ParserIntItem.hpp
Parser/ParserDoubleItem.hpp
Parser/ParserStringItem.hpp
Parser/InputErrorAction.hpp
Parser/ParseMode.hpp
Parser/ParseContext.hpp
#
Generator/KeywordLoader.hpp
Generator/KeywordGenerator.hpp

6
opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
View File

@@ -758,9 +758,9 @@ BOOST_AUTO_TEST_CASE(ConstructorMINPV) {
Opm::EclipseGrid grid4(deck4);
BOOST_CHECK(!grid1.equal( grid3 ));
BOOST_CHECK_EQUAL(grid1.getMinpvContext(), Opm::MinpvContext::ContextEnum::Inactive);
BOOST_CHECK_EQUAL(grid3.getMinpvContext(), Opm::MinpvContext::ContextEnum::EclSTD);
BOOST_CHECK_EQUAL(grid1.getMinpvMode(), Opm::MinpvMode::ModeEnum::Inactive);
BOOST_CHECK_EQUAL(grid3.getMinpvMode(), Opm::MinpvMode::ModeEnum::EclSTD);
BOOST_CHECK_EQUAL(grid3.getMinpvValue(), 10.0);
BOOST_CHECK_EQUAL(grid4.getMinpvContext(), Opm::MinpvContext::ContextEnum::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvMode(), Opm::MinpvMode::ModeEnum::OpmFIL);
BOOST_CHECK_EQUAL(grid4.getMinpvValue(), 20.0);
}

4
opm/parser/eclipse/Parser/tests/ParseModeTests.cpp → opm/parser/eclipse/Parser/tests/ParseContextTests.cpp
View File

@@ -20,7 +20,7 @@
#include <stdexcept>
#include <iostream>
#include <boost/filesystem.hpp>
#define BOOST_TEST_MODULE ParseModeTests
#define BOOST_TEST_MODULE ParseContextTests
#include <boost/test/unit_test.hpp>
@@ -30,7 +30,7 @@
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/T.hpp>
#include <opm/parser/eclipse/Parser/InputErrorAction.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>