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

Improve includes from opm-parser

Browse Source 
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
This commit is contained in:
Jørgen Kvalsvik 2016-01-24 23:09:47 +01:00
parent 50c1bbdc85
commit b0692304d5
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/props/IncompPropertiesSinglePhase.cpp
View File

@ -25,6 +25,8 @@
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
namespace Opm namespace Opm

2
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
View File

@ -24,6 +24,8 @@
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp> #include <opm/parser/eclipse/Deck/DeckRecord.hpp>

1
tests/test_pinchprocessor.cpp
View File

@ -41,6 +41,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp> #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp> #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
#include <opm/core/pressure/tpfa/TransTpfa.hpp> #include <opm/core/pressure/tpfa/TransTpfa.hpp>
#include <opm/core/grid/PinchProcessor.hpp> #include <opm/core/grid/PinchProcessor.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp> #include <opm/core/props/rock/RockFromDeck.hpp>

4
tests/test_wellcollection.cpp
View File

@ -41,9 +41,9 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) { BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) {
ParserPtr parser(new Parser()); ParserPtr parser(new Parser());
boost::filesystem::path scheduleFile("wells_group.data"); std::string scheduleFile("wells_group.data");
ParseMode parseMode; ParseMode parseMode;
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode); DeckConstPtr deck = parser->parseFile(scheduleFile, parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode)); EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState); PhaseUsage pu = phaseUsageFromDeck(eclipseState);

8
tests/test_wellsgroup.cpp
View File

@ -49,9 +49,9 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) { BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
ParserPtr parser(new Parser()); ParserPtr parser(new Parser());
boost::filesystem::path scheduleFile("wells_group.data"); std::string scheduleFile("wells_group.data");
ParseMode parseMode; ParseMode parseMode;
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode); DeckConstPtr deck = parser->parseFile(scheduleFile, parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode)); EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState); PhaseUsage pu = phaseUsageFromDeck(eclipseState);
@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) { BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) {
ParserPtr parser(new Parser()); ParserPtr parser(new Parser());
ParseMode parseMode; ParseMode parseMode;
boost::filesystem::path scheduleFile("wells_group.data"); std::string scheduleFile("wells_group.data");
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode); DeckConstPtr deck = parser->parseFile(scheduleFile, parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode)); EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState); PhaseUsage pu = phaseUsageFromDeck(eclipseState);