OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in EclipseGrids

Browse Source 
getCellCenter() in EclipseGrid no longer returns
tuble<double,double,double> but array<double,3>
This simplifies its usage.

Variable name is changed from cellCentroid to cellCenter to emphasize a
difference between the value in the unstructured grid and in EclispeGrid
This commit is contained in:
Tor Harald Sandve 2015-11-25 15:15:22 +01:00
parent 2a13275943
commit 67eadc30e5
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/GeoProps.hpp
View File

@ -392,23 +392,11 @@ namespace Opm
#endif #endif
int cartesianCellIdx = AutoDiffGrid::globalCell(grid)[cellIdx]; int cartesianCellIdx = AutoDiffGrid::globalCell(grid)[cellIdx];
auto cellCentroid = eclGrid->getCellCenter(cartesianCellIdx); auto cellCenter = eclGrid->getCellCenter(cartesianCellIdx);
for (int indx = 0; indx < dim; ++indx) { for (int indx = 0; indx < dim; ++indx) {
double Ci = Opm::UgGridHelpers::faceCentroid(grid, faceIdx)[indx]; const double Ci = Opm::UgGridHelpers::faceCentroid(grid, faceIdx)[indx] - cellCenter[indx];
switch (indx) {
case 0:
Ci -= std::get<0>(cellCentroid);
break;
case 1:
Ci -= std::get<1>(cellCentroid);
break;
case 2:
Ci -= std::get<2>(cellCentroid);
break;
}
dist += Ci*Ci; dist += Ci*Ci;
cn += sgn * Ci * scaledFaceNormal[ indx ]; cn += sgn * Ci * scaledFaceNormal[ indx ];
} }