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

Merge pull request #1000 from joakim-hove/zcorn-fixup-cell2cell

Browse Source 
ZCORN adjustments considers cell-cell relation.
This commit is contained in:
Joakim Hove
2016-12-05 10:41:47 +01:00
committed by GitHub
parent 237658825b eb283a1434
commit 9b6436204d
3 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -773,19 +773,35 @@ namespace Opm {
return index(i,j,k,c);
}
size_t ZcornMapper::fixupZCORN( std::vector<double>& zcorn, int sign, size_t i, size_t j, size_t k , size_t c) {
size_t index1 = this->index(i,j,k,c);
size_t index2 = this->index(i,j,k,c+4);
bool ZcornMapper::validZCORN( const std::vector<double>& zcorn) const {
int sign = zcorn[ this->index(0,0,0,0) ] <= zcorn[this->index(0,0, this->dims[2] - 1,4)] ? 1 : -1;
for (size_t j=0; j < this->dims[1]; j++)
for (size_t i=0; i < this->dims[0]; i++)
for (size_t c=0; c < 4; c++)
for (size_t k=0; k < this->dims[2]; k++) {
/* Between cells */
if (k > 0) {
size_t index1 = this->index(i,j,k-1,c+4);
size_t index2 = this->index(i,j,k,c);
if ((zcorn[index2] - zcorn[index1]) * sign < 0)
return false;
}
if ((zcorn[index2] - zcorn[index1]) * sign < 0 ) {
zcorn[index2] = zcorn[index1];
return 1;
} else
return 0;
/* In cell */
{
size_t index1 = this->index(i,j,k,c);
size_t index2 = this->index(i,j,k,c+4);
if ((zcorn[index2] - zcorn[index1]) * sign < 0)
return false;
}
}
return true;
}
size_t ZcornMapper::fixupZCORN( std::vector<double>& zcorn) {
int sign = zcorn[ this->index(0,0,0,0) ] <= zcorn[this->index(0,0, this->dims[2] - 1,4)] ? 1 : -1;
size_t cells_adjusted = 0;
@@ -793,9 +809,30 @@ namespace Opm {
for (size_t k=0; k < this->dims[2]; k++)
for (size_t j=0; j < this->dims[1]; j++)
for (size_t i=0; i < this->dims[0]; i++)
for (size_t c=0; c < 4; c++)
cells_adjusted += this->fixupZCORN( zcorn , sign, i , j , k , c );
for (size_t c=0; c < 4; c++) {
/* Cell to cell */
if (k > 0) {
size_t index1 = this->index(i,j,k-1,c+4);
size_t index2 = this->index(i,j,k,c);
if ((zcorn[index2] - zcorn[index1]) * sign < 0 ) {
zcorn[index2] = zcorn[index1];
cells_adjusted++;
}
}
/* Cell internal */
{
size_t index1 = this->index(i,j,k,c);
size_t index2 = this->index(i,j,k,c+4);
if ((zcorn[index2] - zcorn[index1]) * sign < 0 ) {
zcorn[index2] = zcorn[index1];
cells_adjusted++;
}
}
}
return cells_adjusted;
}
}

2
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -241,7 +241,7 @@ namespace Opm {
*/
size_t fixupZCORN( std::vector<double>& zcorn);
size_t fixupZCORN( std::vector<double>& zcorn, int sign, size_t, size_t , size_t k , size_t c);
bool validZCORN( const std::vector<double>& zcorn) const;
private:
std::array<size_t,3> dims;
std::array<size_t,3> stride;

24
opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
View File

@@ -1061,13 +1061,29 @@ BOOST_AUTO_TEST_CASE(ZcornMapper) {
std::vector<double> zcorn;
auto points_adjusted = grid.exportZCORN( zcorn );
BOOST_CHECK_EQUAL( points_adjusted , 0 );
BOOST_CHECK( zmp.validZCORN( zcorn ));
/* Manually destroy it */
zcorn[ zmp.index(0,0,0,4) ] = zcorn[ zmp.index(0,0,0,0) ] - 1;
/* Manually destroy it - cell internal */
zcorn[ zmp.index(0,0,0,4) ] = zcorn[ zmp.index(0,0,0,0) ] - 0.1;
BOOST_CHECK( !zmp.validZCORN( zcorn ));
points_adjusted = zmp.fixupZCORN( zcorn );
BOOST_CHECK_EQUAL( points_adjusted , 1 );
BOOST_CHECK_EQUAL( zcorn[ zmp.index(0,0,0,4) ] , zcorn[ zmp.index(0,0,0,0) ] );
BOOST_CHECK( zmp.validZCORN( zcorn ));
/* Manually destroy it - cell 2 cell */
zcorn[ zmp.index(0,0,0,4) ] = zcorn[ zmp.index(0,0,1,0) ] + 0.1;
BOOST_CHECK( !zmp.validZCORN( zcorn ));
points_adjusted = zmp.fixupZCORN( zcorn );
BOOST_CHECK_EQUAL( points_adjusted , 1 );
BOOST_CHECK( zmp.validZCORN( zcorn ));
/* Manually destroy it - cell 2 cell and cell internal*/
zcorn[ zmp.index(0,0,0,4) ] = zcorn[ zmp.index(0,0,1,0) ] + 0.1;
zcorn[ zmp.index(0,0,0,0) ] = zcorn[ zmp.index(0,0,0,4) ] + 0.1;
BOOST_CHECK( !zmp.validZCORN( zcorn ));
points_adjusted = zmp.fixupZCORN( zcorn );
BOOST_CHECK_EQUAL( points_adjusted , 2 );
BOOST_CHECK( zmp.validZCORN( zcorn ));
}