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

Add Python arg to Schedule constructor

Browse Source
This commit is contained in:
Joakim Hove
2020-03-26 15:31:21 +01:00
parent 9d3ec9be61
commit 50fb51d56e
45 changed files with 395 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_RFT.cpp
View File

@@ -24,6 +24,7 @@
#include <opm/io/eclipse/ERft.hpp>
#include <opm/io/eclipse/OutputStream.hpp>
#include <opm/parser/eclipse/Python/Python.hpp>
#include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp>
@@ -244,6 +245,7 @@ BOOST_AUTO_TEST_SUITE(Using_EclipseIO)
BOOST_AUTO_TEST_CASE(test_RFT)
{
Python python;
const auto rset = RSet{ "TESTRFT" };
const auto eclipse_data_filename = std::string{ "testrft.DATA" };
@@ -263,7 +265,7 @@ BOOST_AUTO_TEST_CASE(test_RFT)
const auto& grid = eclipseState.getInputGrid();
const auto numCells = grid.getCartesianSize( );
const Schedule schedule(deck, eclipseState);
const Schedule schedule(deck, eclipseState, python);
const SummaryConfig summary_config( deck, schedule, eclipseState.getTableManager( ));
EclipseIO eclipseWriter( eclipseState, grid, schedule, summary_config );
@@ -365,6 +367,7 @@ namespace {
BOOST_AUTO_TEST_CASE(test_RFT2)
{
Python python;
const auto rset = RSet{ "TESTRFT" };
const auto eclipse_data_filename = std::string{ "testrft.DATA" };
@@ -384,7 +387,7 @@ BOOST_AUTO_TEST_CASE(test_RFT2)
const auto& grid = eclipseState.getInputGrid();
const auto numCells = grid.getCartesianSize( );
Schedule schedule(deck, eclipseState);
Schedule schedule(deck, eclipseState, python);
SummaryConfig summary_config( deck, schedule, eclipseState.getTableManager( ));
SummaryState st(std::chrono::system_clock::now());
@@ -453,13 +456,15 @@ namespace {
{}
explicit Setup(const ::Opm::Deck& deck)
: es { deck }
, sched{ deck, es }
: es { deck }
, python{ }
, sched { deck, es , python }
{
}
::Opm::EclipseState es;
::Opm::Schedule sched;
::Opm::Python python;
};
std::vector<Opm::data::Connection>