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

Renamed GridProperty::size -> GridProperty::getCartesiansize

Browse Source
This commit is contained in:
Joakim Hove
2014-09-19 14:45:32 +02:00
parent fa335b50fb
commit 70c94a36b2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp
View File

@@ -101,7 +101,7 @@ public:
m_kwInfo.getInitializer()->apply(m_data, m_kwInfo.getKeywordName());
}
size_t size() const {
size_t getCartesianSize() const {
return m_data.size();
}
@@ -166,7 +166,7 @@ public:
void copyFrom(const GridProperty<T>& src, std::shared_ptr<const Box> inputBox) {
if (inputBox->isGlobal()) {
for (size_t i = 0; i < src.size(); ++i)
for (size_t i = 0; i < src.getCartesianSize(); ++i)
m_data[i] = src.m_data[i];
} else {
const std::vector<size_t>& indexList = inputBox->getIndexList();

2
opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp
View File

@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE(Empty) {
Opm::GridProperty<int> gridProperty( 5 , 5 , 4 , keywordInfo);
const std::vector<int>& data = gridProperty.getData();
BOOST_CHECK_EQUAL( 100U , data.size());
BOOST_CHECK_EQUAL( 100U , gridProperty.size());
BOOST_CHECK_EQUAL( 100U , gridProperty.getCartesianSize());
BOOST_CHECK_EQUAL( 5U , gridProperty.getNX());
BOOST_CHECK_EQUAL( 5U , gridProperty.getNY());
BOOST_CHECK_EQUAL( 4U , gridProperty.getNZ());

4
opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
View File

@@ -182,8 +182,8 @@ BOOST_AUTO_TEST_CASE(GetProperty) {
std::shared_ptr<GridProperty<int> > satNUM = state.getIntGridProperty( "SATNUM" );
BOOST_CHECK_EQUAL(1000U , satNUM->size() );
for (size_t i=0; i < satNUM->size(); i++)
BOOST_CHECK_EQUAL(1000U , satNUM->getCartesianSize() );
for (size_t i=0; i < satNUM->getCartesianSize(); i++)
BOOST_CHECK_EQUAL( 2 , satNUM->iget(i) );
BOOST_CHECK_THROW( satNUM->iget(100000) , std::invalid_argument);