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

Updated to use ParseMode.

Browse Source
This commit is contained in:
Joakim Hove
2015-07-27 13:07:02 +02:00
parent 7b9bdb6017
commit 23b3670c1e
15 changed files with 89 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/satfuncEPSBase.DATA
View File

@@ -21,7 +21,7 @@ WELLDIMS
ENDSCALE
--DIR REV NTENDP NSENDP
'NODIR' 'REVERS' 1 20 /
/
START
1 'JAN' 1990 /

2
tests/satfuncEPS_A.DATA
View File

@@ -21,7 +21,7 @@ WELLDIMS
ENDSCALE
--DIR REV NTENDP NSENDP
'NODIR' 'REVERS' 1 20 /
/
START
1 'JAN' 1990 /

2
tests/satfuncEPS_B.DATA
View File

@@ -21,7 +21,7 @@ WELLDIMS
ENDSCALE
--DIR REV NTENDP NSENDP
'NODIR' 'REVERS' 1 20 /
/
START
1 'JAN' 1990 /

2
tests/satfuncEPS_C.DATA
View File

@@ -21,7 +21,7 @@ WELLDIMS
ENDSCALE
--DIR REV NTENDP NSENDP
'NODIR' 'REVERS' 1 20 /
/
START
1 'JAN' 1990 /

2
tests/satfuncEPS_D.DATA
View File

@@ -21,7 +21,7 @@ WELLDIMS
ENDSCALE
--DIR REV NTENDP NSENDP
'NODIR' 'REVERS' 1 20 /
/
SATOPTS
HYSTER /

2
tests/testBlackoilState3.DATA
View File

@@ -29,7 +29,7 @@ DZV
DEPTHZ
121*1000 /
/

12
tests/test_blackoilstate.cpp
View File

@@ -4,6 +4,7 @@
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#if HAVE_DYNAMIC_BOOST_TEST
@@ -29,11 +30,12 @@ using namespace std;
BOOST_AUTO_TEST_CASE(EqualsDifferentDeckReturnFalse) {
ParseMode parseMode;
const string filename1 = "testBlackoilState1.DATA";
const string filename2 = "testBlackoilState2.DATA";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck1(parser->parseFile(filename1));
Opm::DeckConstPtr deck2(parser->parseFile(filename2));
Opm::DeckConstPtr deck1(parser->parseFile(filename1, parseMode));
Opm::DeckConstPtr deck2(parser->parseFile(filename2, parseMode));
GridManager gridManager1(deck1);
const UnstructuredGrid* grid1 = gridManager1.c_grid();
@@ -54,8 +56,9 @@ BOOST_AUTO_TEST_CASE(EqualsDifferentDeckReturnFalse) {
BOOST_AUTO_TEST_CASE(EqualsDifferentNumPhasesReturnFalse) {
const string filename = "testBlackoilState1.DATA";
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::DeckConstPtr deck(parser->parseFile(filename, parseMode));
GridManager gridManager(deck);
const UnstructuredGrid* grid = gridManager.c_grid();
@@ -74,8 +77,9 @@ BOOST_AUTO_TEST_CASE(EqualsDifferentNumPhasesReturnFalse) {
BOOST_AUTO_TEST_CASE(EqualsNumericalDifferenceReturnFalse) {
const string filename = "testBlackoilState1.DATA";
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
GridManager gridManager(deck);
const UnstructuredGrid* grid = gridManager.c_grid();

36
tests/test_equil.cpp
View File

@@ -28,6 +28,7 @@
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/core/pressure/msmfem/partition.h>
@@ -342,9 +343,10 @@ BOOST_AUTO_TEST_CASE (DeckAllDead)
{
std::shared_ptr<UnstructuredGrid>
grid(create_grid_cart3d(1, 1, 10), destroy_grid);
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("deadfluids.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::DeckConstPtr deck = parser->parseFile("deadfluids.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, *grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, *grid, 10.0);
const auto& pressures = comp.press();
@@ -370,8 +372,9 @@ BOOST_AUTO_TEST_CASE (CapillaryInversion)
Opm::GridManager gm(1, 1, 40, 1.0, 1.0, 2.5);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("capillary.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("capillary.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
// Test the capillary inversion for oil-water.
@@ -423,8 +426,9 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillary)
Opm::GridManager gm(1, 1, 20, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("capillary.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("capillary.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, grid, 10.0);
@@ -463,8 +467,9 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillaryOverlap)
Opm::GridManager gm(1, 1, 20, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("capillary_overlap.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("capillary_overlap.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, grid, 9.80665);
@@ -525,8 +530,9 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveOil)
Opm::GridManager gm(1, 1, 20, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("equil_liveoil.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("equil_liveoil.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, grid, 9.80665);
@@ -604,8 +610,9 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveGas)
Opm::GridManager gm(1, 1, 20, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("equil_livegas.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("equil_livegas.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, grid, 9.80665);
@@ -686,8 +693,9 @@ BOOST_AUTO_TEST_CASE (DeckWithRSVDAndRVVD)
Opm::GridManager gm(1, 1, 20, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("equil_rsvd_and_rvvd.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("equil_rsvd_and_rvvd.DATA", parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, false);
Opm::Equil::DeckDependent::InitialStateComputer comp(props, deck, eclipseState, grid, 9.80665);

26
tests/test_satfunc.cpp
View File

@@ -28,6 +28,7 @@
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/core/pressure/msmfem/partition.h>
@@ -66,8 +67,9 @@ BOOST_AUTO_TEST_CASE (GwsegStandard)
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("satfuncStandard.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("satfuncStandard.DATA", parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false);
const int np = 3;
@@ -151,8 +153,9 @@ BOOST_AUTO_TEST_CASE (GwsegEPSBase)
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPSBase.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPSBase.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false);
const int np = 3;
@@ -235,9 +238,10 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_A)
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_A.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_A.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false);
const int np = 3;
@@ -482,8 +486,9 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_C)
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_C.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_C.DATA", parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false);
const int np = 3;
@@ -580,8 +585,9 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_D)
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
Opm::ParserPtr parser(new Opm::Parser() );
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_D.DATA");
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck = parser->parseFile("satfuncEPS_D.DATA" , parseMode);
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false);
const int np = 3;

6
tests/test_stoppedwells.cpp
View File

@@ -27,6 +27,7 @@
#include <boost/test/unit_test.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/core/wells/WellsManager.hpp>
@@ -43,9 +44,10 @@ BOOST_AUTO_TEST_CASE(TestStoppedWells)
{
const std::string filename = "wells_stopped.data";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
double target_surfacerate_inj;

6
tests/test_wellcollection.cpp
View File

@@ -29,6 +29,7 @@
#include <boost/test/unit_test.hpp>
#include <opm/core/wells/WellCollection.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
@@ -40,8 +41,9 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) {
ParserPtr parser(new Parser());
boost::filesystem::path scheduleFile("wells_group.data");
DeckConstPtr deck = parser->parseFile(scheduleFile.string());
EclipseStateConstPtr eclipseState(new EclipseState(deck));
ParseMode parseMode;
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState);
GroupTreeNodePtr field=eclipseState->getSchedule()->getGroupTree(2)->getNode("FIELD");

11
tests/test_wellsgroup.cpp
View File

@@ -37,6 +37,7 @@
#include <opm/core/wells/WellsGroup.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseMode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.hpp>
@@ -48,8 +49,9 @@ using namespace Opm;
BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
ParserPtr parser(new Parser());
boost::filesystem::path scheduleFile("wells_group.data");
DeckConstPtr deck = parser->parseFile(scheduleFile.string());
EclipseStateConstPtr eclipseState(new EclipseState(deck));
ParseMode parseMode;
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState);
std::vector<WellConstPtr> wells = eclipseState->getSchedule()->getWells();
@@ -79,9 +81,10 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) {
ParserPtr parser(new Parser());
ParseMode parseMode;
boost::filesystem::path scheduleFile("wells_group.data");
DeckConstPtr deck = parser->parseFile(scheduleFile.string());
EclipseStateConstPtr eclipseState(new EclipseState(deck));
DeckConstPtr deck = parser->parseFile(scheduleFile.string() , parseMode);
EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
PhaseUsage pu = phaseUsageFromDeck(eclipseState);
std::vector<GroupTreeNodeConstPtr> nodes = eclipseState->getSchedule()->getGroupTree(2)->getNodes();

26
tests/test_wellsmanager.cpp
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/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/core/wells/WellsManager.hpp>
@@ -187,9 +188,10 @@ BOOST_AUTO_TEST_CASE(New_Constructor_Works) {
const std::string filename = "wells_manager_data.data";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
{
@@ -226,9 +228,10 @@ BOOST_AUTO_TEST_CASE(New_Constructor_Works) {
BOOST_AUTO_TEST_CASE(WellsEqual) {
const std::string filename = "wells_manager_data.data";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
Opm::WellsManager wellsManager0(eclipseState , 0 , *gridManager.c_grid(), NULL);
@@ -241,10 +244,11 @@ BOOST_AUTO_TEST_CASE(WellsEqual) {
BOOST_AUTO_TEST_CASE(ControlsEqual) {
const std::string filename = "wells_manager_data.data";
Opm::ParseMode parseMode;
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
Opm::WellsManager wellsManager0(eclipseState , 0 , *gridManager.c_grid(), NULL);
@@ -266,9 +270,10 @@ BOOST_AUTO_TEST_CASE(ControlsEqual) {
BOOST_AUTO_TEST_CASE(WellShutOK) {
const std::string filename = "wells_manager_data.data";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
Opm::WellsManager wellsManager2(eclipseState , 2 , *gridManager.c_grid(), NULL);
@@ -284,9 +289,10 @@ BOOST_AUTO_TEST_CASE(WellShutOK) {
BOOST_AUTO_TEST_CASE(WellSTOPOK) {
const std::string filename = "wells_manager_data_wellSTOP.data";
Opm::ParserPtr parser(new Opm::Parser());
Opm::DeckConstPtr deck(parser->parseFile(filename));
Opm::ParseMode parseMode;
Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode));
Opm::GridManager gridManager(deck);
Opm::WellsManager wellsManager(eclipseState , 0 , *gridManager.c_grid(), NULL);

4
tests/wells_group.data
View File

@@ -36,7 +36,7 @@ WELSPECS
TSTEP
14.0 /
/
WELSPECS
'INJ2' 'G1' 1 1 8335 'GAS' /
@@ -63,7 +63,7 @@ WCONPROD
TSTEP
3 /
/
END