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

Added GridProperty::multiplyWith( )

Browse Source
This commit is contained in:
Joakim Hove
2014-10-09 15:37:14 +02:00
parent 88d9319197
commit b26475031c
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,16 @@ public:
iset(g,value);
}
void multiplyWith(const GridProperty<T>& other) {
if ((m_nx == other.m_nx) && (m_ny == other.m_ny) && (m_nz == other.m_nz)) {
for (size_t g=0; g < m_data.size(); g++)
m_data[g] *= other.m_data[g];
} else
throw std::invalid_argument("Size mismatch between properties in mulitplyWith.");
}
void multiplyValueAtIndex(size_t index, T factor) {
m_data[index] *= factor;
}

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

@@ -353,3 +353,21 @@ BOOST_AUTO_TEST_CASE(GridPropertyInitializers) {
BOOST_CHECK_EQUAL(sguPropData[2 * 3*3], 0.80);
}
BOOST_AUTO_TEST_CASE(multiply) {
typedef Opm::GridProperty<int>::SupportedKeywordInfo SupportedKeywordInfo;
SupportedKeywordInfo keywordInfo("P" , 10 , "1");
Opm::GridProperty<int> p1( 5 , 5 , 4 , keywordInfo);
Opm::GridProperty<int> p2( 5 , 5 , 5 , keywordInfo);
Opm::GridProperty<int> p3( 5 , 5 , 4 , keywordInfo);
BOOST_CHECK_THROW( p1.multiplyWith(p2) , std::invalid_argument );
p1.multiplyWith(p3);
for (size_t g = 0; g < p1.getCartesianSize(); g++)
BOOST_CHECK_EQUAL( 100 , p1.iget(g));
}