From 7b6172a1f867f7ab3ee87dac1c12a9d08636ee1e Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 27 Jul 2015 13:07:02 +0200 Subject: [PATCH] Updated to use ParseMode. --- examples/compute_initial_state.cpp | 6 ++-- examples/compute_tof.cpp | 6 ++-- examples/mirror_grid.cpp | 4 ++- examples/sim_2p_comp_reorder.cpp | 6 ++-- examples/sim_2p_incomp.cpp | 5 +-- examples/wells_example.cpp | 6 ++-- opm/core/io/eclipse/CornerpointChopper.hpp | 4 ++- tests/satfuncEPSBase.DATA | 2 +- tests/satfuncEPS_A.DATA | 2 +- tests/satfuncEPS_B.DATA | 2 +- tests/satfuncEPS_C.DATA | 2 +- tests/satfuncEPS_D.DATA | 2 +- tests/testBlackoilState3.DATA | 2 +- tests/test_EclipseWriteRFTHandler.cpp | 5 +-- tests/test_EclipseWriter.cpp | 5 +-- tests/test_blackoilfluid.cpp | 11 ++++--- tests/test_blackoilstate.cpp | 12 +++++--- tests/test_column_extract.cpp | 5 +-- tests/test_compressedpropertyaccess.cpp | 6 ++-- tests/test_equil.cpp | 36 +++++++++++++--------- tests/test_parser.cpp | 4 ++- tests/test_readWriteWellStateData.cpp | 6 ++-- tests/test_satfunc.cpp | 26 ++++++++++------ tests/test_stoppedwells.cpp | 6 ++-- tests/test_timer.cpp | 4 ++- tests/test_ug.cpp | 14 ++++++--- tests/test_wellcollection.cpp | 6 ++-- tests/test_wellsgroup.cpp | 11 ++++--- tests/test_wellsmanager.cpp | 26 ++++++++++------ tests/test_writenumwells.cpp | 6 ++-- tests/wells_group.data | 4 +-- 31 files changed, 153 insertions(+), 89 deletions(-) diff --git a/examples/compute_initial_state.cpp b/examples/compute_initial_state.cpp index 4eeec0b2..6093b694 100644 --- a/examples/compute_initial_state.cpp +++ b/examples/compute_initial_state.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -84,9 +85,10 @@ try parameter::ParameterGroup param(argc, argv); std::cout << "--------------- Reading parameters ---------------" << std::endl; const std::string deck_filename = param.get("deck_filename"); + Opm::ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr deck = parser->parseFile(deck_filename); - Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); + Opm::DeckConstPtr deck = parser->parseFile(deck_filename , parseMode); + Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck, parseMode)); const double grav = param.getDefault("gravity", unit::gravity); GridManager gm(deck); const UnstructuredGrid& grid = *gm.c_grid(); diff --git a/examples/compute_tof.cpp b/examples/compute_tof.cpp index 4d3148b5..5d21d349 100644 --- a/examples/compute_tof.cpp +++ b/examples/compute_tof.cpp @@ -44,6 +44,7 @@ #include #include +#include #include #include @@ -166,8 +167,9 @@ try // Read the deck. std::string deck_filename = param.get("deck_filename"); Parser parser; - DeckConstPtr deck = parser.parseFile(deck_filename); - EclipseStateConstPtr eclipseState = std::make_shared(deck); + ParseMode parseMode; + DeckConstPtr deck = parser.parseFile(deck_filename , parseMode); + EclipseStateConstPtr eclipseState = std::make_shared(deck , parseMode); // Grid init GridManager grid_manager(deck); diff --git a/examples/mirror_grid.cpp b/examples/mirror_grid.cpp index 8cd58627..7ca0df56 100644 --- a/examples/mirror_grid.cpp +++ b/examples/mirror_grid.cpp @@ -21,6 +21,7 @@ #include "config.h" #include +#include #include #include @@ -361,7 +362,8 @@ int main(int argc, char** argv) // Parse grdecl file std::cout << "Parsing grid file '" << eclipsefilename << "' ..." << std::endl; Opm::ParserPtr parser(new Opm::Parser); - Opm::DeckConstPtr deck(parser->parseFile(eclipsefilename)); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck(parser->parseFile(eclipsefilename , parseMode)); if ( ! (deck->hasKeyword("SPECGRID") && deck->hasKeyword("COORD") && deck->hasKeyword("ZCORN")) ) { std::cerr << "Grid file " << eclipsefilename << "are missing keywords SPECGRID, COORD or ZCORN!" << std::endl; exit(1); diff --git a/examples/sim_2p_comp_reorder.cpp b/examples/sim_2p_comp_reorder.cpp index 01e9cc27..cd8352f0 100644 --- a/examples/sim_2p_comp_reorder.cpp +++ b/examples/sim_2p_comp_reorder.cpp @@ -45,6 +45,7 @@ #include #include +#include #include @@ -97,9 +98,10 @@ try // int max_well_control_iterations = 0; double gravity[3] = { 0.0 }; if (use_deck) { + ParseMode parseMode; std::string deck_filename = param.get("deck_filename"); - deck = parser->parseFile(deck_filename); - eclipseState.reset(new EclipseState(deck)); + deck = parser->parseFile(deck_filename , parseMode); + eclipseState.reset(new EclipseState(deck, parseMode)); // Grid init grid.reset(new GridManager(deck)); diff --git a/examples/sim_2p_incomp.cpp b/examples/sim_2p_incomp.cpp index b17f4242..e28e1bc0 100644 --- a/examples/sim_2p_incomp.cpp +++ b/examples/sim_2p_incomp.cpp @@ -110,10 +110,11 @@ try double gravity[3] = { 0.0 }; if (use_deck) { ParserPtr parser(new Opm::Parser()); + ParseMode parseMode; std::string deck_filename = param.get("deck_filename"); - deck = parser->parseFile(deck_filename); - eclipseState.reset( new EclipseState(deck)); + deck = parser->parseFile(deck_filename , parseMode); + eclipseState.reset( new EclipseState(deck, parseMode)); // Grid init grid.reset(new GridManager(deck)); // Rock and fluid init diff --git a/examples/wells_example.cpp b/examples/wells_example.cpp index 88a91041..02fe261b 100644 --- a/examples/wells_example.cpp +++ b/examples/wells_example.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -34,9 +35,10 @@ try simtimer.init(parameters); // Read input file + ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser()); - Opm::DeckConstPtr deck = parser->parseFile(file_name); - Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); + Opm::DeckConstPtr deck = parser->parseFile(file_name , parseMode); + Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck , parseMode)); std::cout << "Done!" << std::endl; // Setup grid diff --git a/opm/core/io/eclipse/CornerpointChopper.hpp b/opm/core/io/eclipse/CornerpointChopper.hpp index dd581130..bb142700 100644 --- a/opm/core/io/eclipse/CornerpointChopper.hpp +++ b/opm/core/io/eclipse/CornerpointChopper.hpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -44,8 +45,9 @@ namespace Opm public: CornerPointChopper(const std::string& file) { + Opm::ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser()); - deck_ = parser->parseFile(file); + deck_ = parser->parseFile(file , parseMode); metricUnits_.reset(Opm::UnitSystem::newMETRIC()); diff --git a/tests/satfuncEPSBase.DATA b/tests/satfuncEPSBase.DATA index 5f47737c..f39066f6 100644 --- a/tests/satfuncEPSBase.DATA +++ b/tests/satfuncEPSBase.DATA @@ -21,7 +21,7 @@ WELLDIMS ENDSCALE --DIR REV NTENDP NSENDP 'NODIR' 'REVERS' 1 20 / -/ + START 1 'JAN' 1990 / diff --git a/tests/satfuncEPS_A.DATA b/tests/satfuncEPS_A.DATA index 47e9612a..e633e679 100644 --- a/tests/satfuncEPS_A.DATA +++ b/tests/satfuncEPS_A.DATA @@ -21,7 +21,7 @@ WELLDIMS ENDSCALE --DIR REV NTENDP NSENDP 'NODIR' 'REVERS' 1 20 / -/ + START 1 'JAN' 1990 / diff --git a/tests/satfuncEPS_B.DATA b/tests/satfuncEPS_B.DATA index a1d8a317..38f430f8 100644 --- a/tests/satfuncEPS_B.DATA +++ b/tests/satfuncEPS_B.DATA @@ -21,7 +21,7 @@ WELLDIMS ENDSCALE --DIR REV NTENDP NSENDP 'NODIR' 'REVERS' 1 20 / -/ + START 1 'JAN' 1990 / diff --git a/tests/satfuncEPS_C.DATA b/tests/satfuncEPS_C.DATA index 74a89c02..2b295a73 100644 --- a/tests/satfuncEPS_C.DATA +++ b/tests/satfuncEPS_C.DATA @@ -21,7 +21,7 @@ WELLDIMS ENDSCALE --DIR REV NTENDP NSENDP 'NODIR' 'REVERS' 1 20 / -/ + START 1 'JAN' 1990 / diff --git a/tests/satfuncEPS_D.DATA b/tests/satfuncEPS_D.DATA index 1077121e..d3709a48 100644 --- a/tests/satfuncEPS_D.DATA +++ b/tests/satfuncEPS_D.DATA @@ -21,7 +21,7 @@ WELLDIMS ENDSCALE --DIR REV NTENDP NSENDP 'NODIR' 'REVERS' 1 20 / -/ + SATOPTS HYSTER / diff --git a/tests/testBlackoilState3.DATA b/tests/testBlackoilState3.DATA index 8b067f88..27834606 100644 --- a/tests/testBlackoilState3.DATA +++ b/tests/testBlackoilState3.DATA @@ -29,7 +29,7 @@ DZV DEPTHZ 121*1000 / -/ + diff --git a/tests/test_EclipseWriteRFTHandler.cpp b/tests/test_EclipseWriteRFTHandler.cpp index 6c59d6ce..b3f8e871 100755 --- a/tests/test_EclipseWriteRFTHandler.cpp +++ b/tests/test_EclipseWriteRFTHandler.cpp @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -91,7 +92,7 @@ void verifyRFTFile(const std::string& rft_filename) { Opm::DeckConstPtr createDeck(const std::string& input_str) { Opm::ParserPtr parser = std::make_shared(); - Opm::DeckConstPtr deck = parser->parseString(input_str); + Opm::DeckConstPtr deck = parser->parseString(input_str , Opm::ParseMode()); return deck; } @@ -201,7 +202,7 @@ BOOST_AUTO_TEST_CASE(test_EclipseWriterRFTHandler) test_area.reset(new_ptr, test_work_area_free); std::shared_ptr deck = createDeck(deckString); - std::shared_ptr eclipseState = std::make_shared(deck); + std::shared_ptr eclipseState = std::make_shared(deck , Opm::ParseMode()); std::shared_ptr simulatorTimer = std::make_shared(); simulatorTimer->init(eclipseState->getSchedule()->getTimeMap()); diff --git a/tests/test_EclipseWriter.cpp b/tests/test_EclipseWriter.cpp index f5d935b9..a02f3771 100644 --- a/tests/test_EclipseWriter.cpp +++ b/tests/test_EclipseWriter.cpp @@ -55,13 +55,14 @@ std::shared_ptr wellState; void createEclipseWriter(const char *deckString) { + Opm::ParseMode parseMode; Opm::ParserConstPtr parser(new Opm::Parser()); - deck = parser->parseString(deckString); + deck = parser->parseString(deckString, parseMode); Opm::parameter::ParameterGroup params; params.insertParameter("deck_filename", "foo.data"); - eclipseState.reset(new Opm::EclipseState(deck)); + eclipseState.reset(new Opm::EclipseState(deck , parseMode)); auto eclGrid = eclipseState->getEclipseGrid(); BOOST_CHECK(eclGrid->getNX() == 3); diff --git a/tests/test_blackoilfluid.cpp b/tests/test_blackoilfluid.cpp index aed8b45d..13be860f 100644 --- a/tests/test_blackoilfluid.cpp +++ b/tests/test_blackoilfluid.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -233,8 +234,9 @@ BOOST_AUTO_TEST_CASE(test_liveoil) const std::string filename = "liveoil.DATA"; cout << "Reading deck: " << filename << endl; Opm::ParserPtr parser(new Opm::Parser()); - Opm::DeckConstPtr deck(parser->parseFile(filename)); - Opm::EclipseStateConstPtr eclipseState(new EclipseState(deck)); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode)); + Opm::EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode)); // setup pvt interface PhaseUsage phase_usage_ = phaseUsageFromDeck(deck); @@ -313,8 +315,9 @@ BOOST_AUTO_TEST_CASE(test_wetgas) const std::string filename = "wetgas.DATA"; cout << "Reading deck: " << filename << endl; Opm::ParserPtr parser(new Opm::Parser()); - Opm::DeckConstPtr deck(parser->parseFile(filename)); - Opm::EclipseStateConstPtr eclipseState(new EclipseState(deck)); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck(parser->parseFile(filename , parseMode)); + Opm::EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode)); // setup pvt interface PhaseUsage phase_usage_ = phaseUsageFromDeck(deck); diff --git a/tests/test_blackoilstate.cpp b/tests/test_blackoilstate.cpp index 48c84a12..eda7c780 100644 --- a/tests/test_blackoilstate.cpp +++ b/tests/test_blackoilstate.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #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(); diff --git a/tests/test_column_extract.cpp b/tests/test_column_extract.cpp index d643c3ce..865bdd97 100644 --- a/tests/test_column_extract.cpp +++ b/tests/test_column_extract.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -130,9 +131,9 @@ BOOST_AUTO_TEST_CASE(DisjointColumn) correct_answer[4].resize(1); correct_answer[9].resize(1); + Opm::ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser()); - Opm::DeckConstPtr deck(parser->parseString(grdecl)); - + Opm::DeckConstPtr deck(parser->parseString(grdecl , parseMode)); Opm::GridManager manager(deck); VVI columns; diff --git a/tests/test_compressedpropertyaccess.cpp b/tests/test_compressedpropertyaccess.cpp index 8836de4d..ab4200f8 100644 --- a/tests/test_compressedpropertyaccess.cpp +++ b/tests/test_compressedpropertyaccess.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -43,9 +44,10 @@ struct SetupSimple { SetupSimple() { + Opm::ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser()); - deck = parser->parseFile("compressed_gridproperty.data"); - ecl.reset(new Opm::EclipseState(deck)); + deck = parser->parseFile("compressed_gridproperty.data" , parseMode); + ecl.reset(new Opm::EclipseState(deck , parseMode)); } Opm::DeckConstPtr deck; diff --git a/tests/test_equil.cpp b/tests/test_equil.cpp index 5a8eb6f8..b029f527 100644 --- a/tests/test_equil.cpp +++ b/tests/test_equil.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -342,9 +343,10 @@ BOOST_AUTO_TEST_CASE (DeckAllDead) { std::shared_ptr 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); diff --git a/tests/test_parser.cpp b/tests/test_parser.cpp index ed0c1cd3..5484e5d0 100644 --- a/tests/test_parser.cpp +++ b/tests/test_parser.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -40,8 +41,9 @@ BOOST_AUTO_TEST_CASE(CreateParser) { const std::string filename1 = "testBlackoilState1.DATA"; + Opm::ParseMode parseMode; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr deck = parser->parseFile( filename1 ); + Opm::DeckConstPtr deck = parser->parseFile( filename1 , parseMode); BOOST_CHECK_EQUAL( 6U , deck->size() ); Opm::DeckItemConstPtr actnum = deck->getKeyword("ACTNUM")->getRecord(0)->getItem(0); diff --git a/tests/test_readWriteWellStateData.cpp b/tests/test_readWriteWellStateData.cpp index f63a55c2..c9dbc01d 100644 --- a/tests/test_readWriteWellStateData.cpp +++ b/tests/test_readWriteWellStateData.cpp @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -241,8 +242,9 @@ BOOST_AUTO_TEST_CASE(EclipseReadWriteWellStateData) test_work_area_type * test_area = test_work_area_alloc("EclipseReadWriteWellStateData"); Opm::Parser parser; - Opm::DeckConstPtr deck = parser.parseString(input); - Opm::EclipseStatePtr eclipseState(new Opm::EclipseState(deck)); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck = parser.parseString(input, parseMode); + Opm::EclipseStatePtr eclipseState(new Opm::EclipseState(deck , parseMode)); Opm::EclipseWriterPtr eclipseWriter = createEclipseWriter(deck, eclipseState, eclipse_data_filename); std::shared_ptr simTimer( new Opm::SimulatorTimer() ); diff --git a/tests/test_satfunc.cpp b/tests/test_satfunc.cpp index ff850f7a..22aae895 100644 --- a/tests/test_satfunc.cpp +++ b/tests/test_satfunc.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -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; diff --git a/tests/test_stoppedwells.cpp b/tests/test_stoppedwells.cpp index 33a6e573..39d4f60a 100644 --- a/tests/test_stoppedwells.cpp +++ b/tests/test_stoppedwells.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -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; diff --git a/tests/test_timer.cpp b/tests/test_timer.cpp index e02d150c..065cf8f6 100644 --- a/tests/test_timer.cpp +++ b/tests/test_timer.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -41,7 +42,8 @@ BOOST_AUTO_TEST_CASE(CreateTimer) { const std::string filename1 = "TESTTIMER.DATA"; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 ); + Opm::ParseMode parseMode; + Opm::DeckConstPtr parserDeck = parser->parseFile( filename1 , parseMode); Opm::TimeMapPtr timeMap(new Opm::TimeMap(parserDeck)); Opm::SimulatorTimer simtimer; diff --git a/tests/test_ug.cpp b/tests/test_ug.cpp index 35f4fb79..f374cab7 100644 --- a/tests/test_ug.cpp +++ b/tests/test_ug.cpp @@ -23,6 +23,7 @@ #include /* compute_geometry */ #include #include +#include #include #include @@ -31,6 +32,7 @@ using namespace std; BOOST_AUTO_TEST_CASE(Equal) { + Opm::ParseMode parseMode; const std::string filename1 = "CORNERPOINT_ACTNUM.DATA"; const char *deck2Data = "RUNSPEC\n" @@ -50,8 +52,8 @@ BOOST_AUTO_TEST_CASE(Equal) { "\n"; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr deck1 = parser->parseFile( filename1 ); - Opm::DeckConstPtr deck2 = parser->parseString( deck2Data ); + Opm::DeckConstPtr deck1 = parser->parseFile( filename1 , parseMode); + Opm::DeckConstPtr deck2 = parser->parseString( deck2Data , parseMode); BOOST_CHECK( deck1->hasKeyword("ZCORN") ); BOOST_CHECK( deck1->hasKeyword("COORD") ); @@ -74,7 +76,8 @@ BOOST_AUTO_TEST_CASE(Equal) { BOOST_AUTO_TEST_CASE(EqualEclipseGrid) { const std::string filename = "CORNERPOINT_ACTNUM.DATA"; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr deck = parser->parseFile( filename ); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck = parser->parseFile( filename , parseMode); std::shared_ptr grid(new Opm::EclipseGrid(deck)); @@ -146,8 +149,9 @@ BOOST_AUTO_TEST_CASE(TOPS_Fully_Specified) { "\n"; Opm::ParserPtr parser(new Opm::Parser() ); - Opm::DeckConstPtr deck1 = parser->parseString( deck1Data ); - Opm::DeckConstPtr deck2 = parser->parseString( deck2Data ); + Opm::ParseMode parseMode; + Opm::DeckConstPtr deck1 = parser->parseString( deck1Data , parseMode); + Opm::DeckConstPtr deck2 = parser->parseString( deck2Data , parseMode); std::shared_ptr grid1(new Opm::EclipseGrid(deck1)); std::shared_ptr grid2(new Opm::EclipseGrid(deck2)); diff --git a/tests/test_wellcollection.cpp b/tests/test_wellcollection.cpp index d22ba3b4..d94d19b1 100644 --- a/tests/test_wellcollection.cpp +++ b/tests/test_wellcollection.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -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"); diff --git a/tests/test_wellsgroup.cpp b/tests/test_wellsgroup.cpp index 46fd8eb0..3aa996fc 100644 --- a/tests/test_wellsgroup.cpp +++ b/tests/test_wellsgroup.cpp @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -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 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 nodes = eclipseState->getSchedule()->getGroupTree(2)->getNodes(); diff --git a/tests/test_wellsmanager.cpp b/tests/test_wellsmanager.cpp index 37bb4b6e..2daebf63 100644 --- a/tests/test_wellsmanager.cpp +++ b/tests/test_wellsmanager.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -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); diff --git a/tests/test_writenumwells.cpp b/tests/test_writenumwells.cpp index 1049169d..fee3ddbe 100644 --- a/tests/test_writenumwells.cpp +++ b/tests/test_writenumwells.cpp @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -135,7 +136,7 @@ std::shared_ptr createBlackOilState(Opm::EclipseGridConstPtr Opm::DeckConstPtr createDeck(const std::string& eclipse_data_filename) { Opm::ParserPtr parser(new Opm::Parser()); - Opm::DeckConstPtr deck = parser->parseFile(eclipse_data_filename); + Opm::DeckConstPtr deck = parser->parseFile(eclipse_data_filename , Opm::ParseMode()); return deck; } @@ -168,8 +169,9 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) test_work_area_type * test_area = test_work_area_alloc("TEST_EclipseWriteNumWells"); test_work_area_copy_file(test_area, eclipse_data_filename.c_str()); + Opm::ParseMode parseMode; Opm::DeckConstPtr deck = createDeck(eclipse_data_filename); - Opm::EclipseStatePtr eclipseState(new Opm::EclipseState(deck)); + Opm::EclipseStatePtr eclipseState(new Opm::EclipseState(deck , parseMode)); Opm::EclipseWriterPtr eclipseWriter = createEclipseWriter(deck, eclipseState, eclipse_data_filename); std::shared_ptr simTimer( new Opm::SimulatorTimer() ); diff --git a/tests/wells_group.data b/tests/wells_group.data index 6390da07..5fa7fb8c 100755 --- a/tests/wells_group.data +++ b/tests/wells_group.data @@ -36,7 +36,7 @@ WELSPECS TSTEP 14.0 / -/ + WELSPECS 'INJ2' 'G1' 1 1 8335 'GAS' / @@ -63,7 +63,7 @@ WCONPROD TSTEP 3 / -/ + END