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

Removed parameters to EclipseWriter

Browse Source 
Paramater::ParameterGroup& params and numCells and compressedToCartesianCellIndex
These are now stored in the IOconfig object
This commit is contained in:
Kjell W. Kongsvik
2016-04-15 14:45:26 +02:00
parent d622f6e04b
commit bd1d8dc576
7 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/test_EclipseWriter.cpp
View File

@@ -42,6 +42,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
// ERT stuff
#include <ert/ecl/ecl_kw.h>
@@ -64,12 +65,10 @@ void createEclipseWriter(const char *deckString)
Opm::ParserConstPtr parser(new Opm::Parser());
deck = parser->parseString(deckString, parseContext);
Opm::parameter::ParameterGroup params;
params.insertParameter("deck_filename", "foo.data");
eclipseState.reset(new Opm::EclipseState(deck , parseContext));
auto eclGrid = eclipseState->getInputGrid();
BOOST_CHECK(eclGrid->getNX() == 3);
BOOST_CHECK(eclGrid->getNY() == 3);
BOOST_CHECK(eclGrid->getNZ() == 3);
@@ -89,9 +88,9 @@ void createEclipseWriter(const char *deckString)
BOOST_CHECK(ourFinerUnstructuredGrid.number_of_cells == 3*3*3);
Opm::PhaseUsage phaseUsage = Opm::phaseUsageFromDeck(deck);
eclWriter.reset(new Opm::EclipseWriter(params,
eclipseState,
eclWriter.reset(new Opm::EclipseWriter(eclipseState,
phaseUsage));
// this check is disabled so far, because UnstructuredGrid uses some weird definition
@@ -183,8 +182,7 @@ void getErtData(ecl_kw_type *eclKeyword, std::vector<int> &data)
std::copy(ertData, ertData + kwSize, data.begin());
}
void compareErtData(const std::vector<double> &src, const std::vector<double> &dst, double tolerance)
{
void compareErtData(const std::vector<double> &src, const std::vector<double> &dst, double tolerance) {
BOOST_CHECK_EQUAL(src.size(), dst.size());
if (src.size() != dst.size())
return;
@@ -193,14 +191,14 @@ void compareErtData(const std::vector<double> &src, const std::vector<double> &d
BOOST_CHECK_CLOSE(src[i], dst[i], tolerance);
}
void compareErtData(const std::vector<int> &src, const std::vector<int> &dst)
{
void compareErtData(const std::vector<int> &src, const std::vector<int> &dst) {
BOOST_CHECK_EQUAL(src.size(), dst.size());
if (src.size() != dst.size())
return;
for (size_t i = 0; i < src.size(); ++i)
BOOST_CHECK_EQUAL(src[i], dst[i]);
}
void checkEgridFile()