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

Merge pull request #543 from totto82/new_trans

Browse Source 
Use cell centers based on cell corners
This commit is contained in:
Atgeirr Flø Rasmussen 2015-11-27 10:18:00 +01:00
commit 979107ac4b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/GeoProps.hpp
View File

@ -125,7 +125,7 @@ namespace Opm
tpfa_htrans_compute(ug, props.permeability(), htrans.data()); tpfa_htrans_compute(ug, props.permeability(), htrans.data());
} }
else { else {
tpfa_loc_trans_compute_(grid,props.permeability(),htrans); tpfa_loc_trans_compute_(grid,eclgrid, props.permeability(),htrans);
} }
std::vector<double> mult; std::vector<double> mult;
@ -143,7 +143,7 @@ namespace Opm
// Compute z coordinates // Compute z coordinates
for (int c = 0; c<numCells; ++c){ for (int c = 0; c<numCells; ++c){
z_[c] = Opm::UgGridHelpers::cellCentroidCoordinate(grid, c, 2); z_[c] = Opm::UgGridHelpers::cellCenterDepth(grid, c);
} }
@ -191,6 +191,7 @@ namespace Opm
template <class Grid> template <class Grid>
void tpfa_loc_trans_compute_(const Grid &grid, void tpfa_loc_trans_compute_(const Grid &grid,
Opm::EclipseGridConstPtr eclGrid,
const double* perm, const double* perm,
Vector &hTrans); Vector &hTrans);
@ -338,6 +339,7 @@ namespace Opm
template <class GridType> template <class GridType>
inline void DerivedGeology::tpfa_loc_trans_compute_(const GridType& grid, inline void DerivedGeology::tpfa_loc_trans_compute_(const GridType& grid,
Opm::EclipseGridConstPtr eclGrid,
const double* perm, const double* perm,
Vector& hTrans){ Vector& hTrans){
@ -358,6 +360,7 @@ namespace Opm
for(auto cellFaceIter = cellFacesRange.begin(), cellFaceEnd = cellFacesRange.end(); for(auto cellFaceIter = cellFacesRange.begin(), cellFaceEnd = cellFacesRange.end();
cellFaceIter != cellFaceEnd; ++cellFaceIter, ++cellFaceIdx) cellFaceIter != cellFaceEnd; ++cellFaceIter, ++cellFaceIdx)
{ {
// The index of the face in the compressed grid // The index of the face in the compressed grid
const int faceIdx = *cellFaceIter; const int faceIdx = *cellFaceIter;
@ -388,11 +391,14 @@ namespace Opm
const double* scaledFaceNormal = faceNormal; const double* scaledFaceNormal = faceNormal;
#endif #endif
int cartesianCellIdx = AutoDiffGrid::globalCell(grid)[cellIdx];
auto cellCenter = eclGrid->getCellCenter(cartesianCellIdx);
for (int indx = 0; indx < dim; ++indx) { for (int indx = 0; indx < dim; ++indx) {
const double Ci = Opm::UgGridHelpers::faceCentroid(grid, faceIdx)[indx] -
Opm::UgGridHelpers::cellCentroidCoordinate(grid, cellIdx, indx); const double Ci = Opm::UgGridHelpers::faceCentroid(grid, faceIdx)[indx] - cellCenter[indx];
dist += Ci*Ci; dist += Ci*Ci;
cn += sgn * Ci * scaledFaceNormal[ indx ]; //Opm::UgGridHelpers::faceNormal(grid, faceIdx)[indx]; cn += sgn * Ci * scaledFaceNormal[ indx ];
} }
if (cn < 0){ if (cn < 0){