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

Pass pointers of region and block data to eclIO

Browse Source
This commit is contained in:
Tor Harald Sandve 2018-01-23 15:40:55 +01:00
parent 890b2226b2
commit 8a5062ae27
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/output/eclipse/EclipseIO.hpp
View File

@ -175,10 +175,10 @@ public:
double seconds_elapsed, double seconds_elapsed,
data::Solution, data::Solution,
data::Wells, data::Wells,
std::map<std::string, double> single_summary_values, const std::map<std::string, double>& single_summary_values,
std::map<std::string, std::vector<double>> region_summary_values, const std::map<std::string, std::vector<double>>& region_summary_values,
std::map<std::pair<std::string, int>, double> block_summary_values = {}, const std::map<std::pair<std::string, int>, double>& block_summary_values,
std::map<std::string, std::vector<double>> extra_restart = {}, const std::map<std::string, std::vector<double>>& extra_restart = {},
bool write_double = false); bool write_double = false);

8
src/opm/output/eclipse/EclipseIO.cpp
View File

@ -409,10 +409,10 @@ void EclipseIO::writeTimeStep(int report_step,
double secs_elapsed, double secs_elapsed,
data::Solution cells, data::Solution cells,
data::Wells wells, data::Wells wells,
std::map<std::string, double> single_summary_values, const std::map<std::__cxx11::string, double>& single_summary_values,
std::map<std::string, std::vector<double>> region_summary_values, const std::map<std::__cxx11::string, std::vector<double> >& region_summary_values,
std::map<std::pair<std::string, int>, double> block_summary_values, const std::map<std::pair<std::__cxx11::string, int>, double>& block_summary_values,
std::map<std::string, std::vector<double>> extra_restart, const std::map<std::__cxx11::string, std::vector<double>>&extra_restart,
bool write_double) bool write_double)
{ {

1
tests/test_EclipseIO.cpp
View File

@ -342,6 +342,7 @@ BOOST_AUTO_TEST_CASE(EclipseIOIntegration) {
first_step - start_time, first_step - start_time,
sol, sol,
wells, wells,
{},
{}, {},
{}); {});

2
tests/test_RFT.cpp
View File

@ -145,6 +145,7 @@ BOOST_AUTO_TEST_CASE(test_RFT) {
step_time - start_time, step_time - start_time,
createBlackoilState( 2, numCells ), createBlackoilState( 2, numCells ),
wells, wells,
{},
{}, {},
{}); {});
} }
@ -223,6 +224,7 @@ BOOST_AUTO_TEST_CASE(test_RFT2) {
createBlackoilState( 2, numCells ), createBlackoilState( 2, numCells ),
wells, wells,
{}, {},
{},
{}); {});
} }
verifyRFTFile2("TESTRFT.RFT"); verifyRFTFile2("TESTRFT.RFT");

5
tests/test_writenumwells.cpp
View File

@ -161,8 +161,9 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
timestep, timestep,
solution, solution,
wells , wells ,
{}, {},
{} ); {},
{} );
} }
verifyWellState(eclipse_restart_filename, grid, schedule); verifyWellState(eclipse_restart_filename, grid, schedule);