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

Merge pull request #414 from joakim-hove/add-python-arg

Browse Source 
Add Python arg to Schedule constructor
This commit is contained in:
Joakim Hove 2020-03-27 13:43:55 +01:00 committed by GitHub
commit 0defd3de8e
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_eclblackoilfluidsystem.cpp
View File

@ -43,6 +43,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/Python/Python.hpp>
#include <dune/common/parallel/mpihelper.hh>
@ -631,8 +632,9 @@ inline void testAll()
Opm::Parser parser;
auto deck = parser.parseString(deckString1);
Opm::Python python;
Opm::EclipseState eclState(deck);
Opm::Schedule schedule(deck, eclState);
Opm::Schedule schedule(deck, eclState, python);
FluidSystem::initFromState(eclState, schedule);

4
tests/test_eclblackoilpvt.cpp
View File

@ -50,6 +50,7 @@
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/Python/Python.hpp>
#include <dune/common/parallel/mpihelper.hh>
@ -223,10 +224,11 @@ inline void testAll()
static const Scalar tolerance = std::numeric_limits<Scalar>::epsilon()*1e3;
Opm::Parser parser;
Opm::Python python;
auto deck = parser.parseString(deckString1);
Opm::EclipseState eclState(deck);
Opm::Schedule schedule(deck, eclState);
Opm::Schedule schedule(deck, eclState, python);
const auto& pvtwKeyword = deck.getKeyword("PVTW");
size_t numPvtRegions = pvtwKeyword.size();

6
tests/test_fluidsystems.cpp
View File

@ -57,6 +57,9 @@
// include the tables for CO2 which are delivered with opm-material by default
#include <opm/material/common/UniformTabulated2DFunction.hpp>
#include <opm/parser/eclipse/Python/Python.hpp>
namespace Opm {
namespace FluidSystemsTest {
#include <opm/material/components/co2tables.inc>
@ -72,9 +75,10 @@ void ensureBlackoilApi()
// that they compile
while (false) {
#if HAVE_ECL_INPUT
Opm::Python python;
Opm::Deck deck;
Opm::EclipseState eclState(deck);
Opm::Schedule schedule(deck, eclState);
Opm::Schedule schedule(deck, eclState, python);
FluidSystem::initFromState(eclState, schedule);
#endif