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

Merge branch 'master' into gravity-in-wells

Browse Source
This commit is contained in:
Bård Skaflestad 2012-10-18 10:58:28 +02:00
commit 37d54be703
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/core/utility/VelocityInterpolation.cpp
View File

@ -73,6 +73,7 @@ namespace Opm
if (cell == grid_.face_cells[2*face]) { if (cell == grid_.face_cells[2*face]) {
face_flux = flux_[face]; face_flux = flux_[face];
} else { } else {
ASSERT(cell == grid_.face_cells[2*face + 1]);
face_flux = -flux_[face]; face_flux = -flux_[face];
} }
for (int dd = 0; dd < dim; ++dd) { for (int dd = 0; dd < dim; ++dd) {

2
tests/test_velocityinterpolation.cpp
View File

@ -465,7 +465,7 @@ BOOST_AUTO_TEST_CASE(test_VelocityInterpolationConstant)
testConstantVelRepro2d<VelocityInterpolationConstant>(); testConstantVelRepro2d<VelocityInterpolationConstant>();
testConstantVelReproPyramid<VelocityInterpolationConstant>(); testConstantVelReproPyramid<VelocityInterpolationConstant>();
testConstantVelReproIrreg2d<VelocityInterpolationConstant>(); testConstantVelReproIrreg2d<VelocityInterpolationConstant>();
// testConstantVelReproIrregPrism<VelocityInterpolationConstant>(); // We should verify if this is expected to fail or not. testConstantVelReproIrregPrism<VelocityInterpolationConstant>();
} }
BOOST_AUTO_TEST_CASE(test_VelocityInterpolationECVI) BOOST_AUTO_TEST_CASE(test_VelocityInterpolationECVI)