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

Use harmonic averaging of mobility for pressure eqns.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-06 13:28:30 +02:00
parent ea993f6647
commit 18ec43f255
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sim_simple.cpp
View File

@ -293,11 +293,10 @@ int main()
{ 1.0, 30.0 }, { 1.0, 30.0 },
1.0, 1.0, 1.0, 1.0,
grid.dimensions, grid.number_of_cells); grid.dimensions, grid.number_of_cells);
std::vector<double> htrans(grid.cell_facepos[grid.number_of_cells]); V htrans(grid.cell_facepos[grid.number_of_cells]);
tpfa_htrans_compute(const_cast<UnstructuredGrid*>(&grid), props.permeability(), htrans.data()); tpfa_htrans_compute(const_cast<UnstructuredGrid*>(&grid), props.permeability(), htrans.data());
// std::vector<double> trans(grid.number_of_faces);
V trans_all(grid.number_of_faces); V trans_all(grid.number_of_faces);
tpfa_trans_compute((UnstructuredGrid*)&grid, htrans.data(), trans_all.data()); // tpfa_trans_compute(const_cast<UnstructuredGrid*>(&grid), htrans.data(), trans_all.data());
const int nc = grid.number_of_cells; const int nc = grid.number_of_cells;
std::vector<int> allcells(nc); std::vector<int> allcells(nc);
for (int i = 0; i < nc; ++i) { for (int i = 0; i < nc; ++i) {
@ -308,10 +307,6 @@ int main()
// Define neighbourhood-derived operator matrices. // Define neighbourhood-derived operator matrices.
const HelperOps ops(grid); const HelperOps ops(grid);
const int num_internal = ops.internal_faces.size(); const int num_internal = ops.internal_faces.size();
V transi(num_internal);
for (int fi = 0; fi < num_internal; ++fi) {
transi[fi] = trans_all[ops.internal_faces[fi]];
}
std::cerr << "Topology matrices " << clock.secsSinceLast() << std::endl; std::cerr << "Topology matrices " << clock.secsSinceLast() << std::endl;
typedef AutoDiff::ForwardBlock<double> ADB; typedef AutoDiff::ForwardBlock<double> ADB;
@ -336,12 +331,15 @@ int main()
const V kro = kr.rightCols<1>(); const V kro = kr.rightCols<1>();
const double* mu = props.viscosity(); const double* mu = props.viscosity();
const V totmob = krw/mu[0] + kro/mu[1]; const V totmob = krw/mu[0] + kro/mu[1];
const V totmobf = (ops.caver*totmob.matrix()).array();
// Mobility-weighted transmissibilities per internal face. // Moved down here because we need total mobility.
tpfa_eff_trans_compute(const_cast<UnstructuredGrid*>(&grid), totmob.data(),
htrans.data(), trans_all.data());
// Still explicit, and no upwinding! // Still explicit, and no upwinding!
const V mobtransf = totmobf*transi; V mobtransf(num_internal);
for (int fi = 0; fi < num_internal; ++fi) {
mobtransf[fi] = trans_all[ops.internal_faces[fi]];
}
std::cerr << "Property arrays " << clock.secsSinceLast() << std::endl; std::cerr << "Property arrays " << clock.secsSinceLast() << std::endl;
// Initial pressure. // Initial pressure.
@ -399,8 +397,8 @@ int main()
const V sw0 = s0.leftCols<1>(); const V sw0 = s0.leftCols<1>();
// V sw1 = sw0; // V sw1 = sw0;
V sw1 = 0.5*V::Ones(nc,1); V sw1 = 0.5*V::Ones(nc,1);
const V nkdp = transi * (ops.ngrad * p1.matrix()).array(); const V ndp = (ops.ngrad * p1.matrix()).array();
const V dflux = totmobf * nkdp; const V dflux = mobtransf * ndp;
const UpwindSelectorTotalFlux<double> upwind(grid, ops, dflux); const UpwindSelectorTotalFlux<double> upwind(grid, ops, dflux);
const V pv = Eigen::Map<const V>(props.porosity(), nc, 1) const V pv = Eigen::Map<const V>(props.porosity(), nc, 1)
* Eigen::Map<const V>(grid.cell_volumes, nc, 1); * Eigen::Map<const V>(grid.cell_volumes, nc, 1);