mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities().
This commit is contained in:
parent
c4f803fedd
commit
29ba859a80
@ -119,26 +119,24 @@ namespace Opm
|
||||
std::vector<double>& totmob,
|
||||
std::vector<double>& omega)
|
||||
{
|
||||
int num_cells = cells.size();
|
||||
int num_phases = props.numPhases();
|
||||
totmob.resize(num_cells);
|
||||
omega.resize(num_cells);
|
||||
ASSERT(int(s.size()) == num_cells*num_phases);
|
||||
std::vector<double> kr(num_cells*num_phases);
|
||||
props.relperm(num_cells, &s[0], &cells[0], &kr[0], 0);
|
||||
const double* mu = props.viscosity();
|
||||
for (int cell = 0; cell < num_cells; ++cell) {
|
||||
totmob[cell] = 0.0;
|
||||
for (int phase = 0; phase < num_phases; ++phase) {
|
||||
totmob[cell] += kr[num_phases*cell + phase]/mu[phase];
|
||||
}
|
||||
}
|
||||
std::vector<double> pmobc;
|
||||
|
||||
computePhaseMobilities(props, cells, s, pmobc);
|
||||
|
||||
const std::size_t np = props.numPhases();
|
||||
const std::vector<int>::size_type nc = cells.size();
|
||||
|
||||
std::vector<double>(cells.size(), 0.0).swap(totmob);
|
||||
std::vector<double>(cells.size(), 0.0).swap(omega );
|
||||
|
||||
const double* rho = props.density();
|
||||
for (int cell = 0; cell < num_cells; ++cell) {
|
||||
omega[cell] = 0.0;
|
||||
for (int phase = 0; phase < num_phases; ++phase) {
|
||||
omega[cell] += rho[phase]*(kr[num_phases*cell + phase]/mu[phase])/totmob[cell];
|
||||
for (std::vector<int>::size_type c = 0; c < nc; ++c) {
|
||||
for (std::size_t p = 0; p < np; ++p) {
|
||||
totmob[ c ] += pmobc[c*np + p];
|
||||
omega [ c ] += pmobc[c*np + p] * rho[ p ];
|
||||
}
|
||||
|
||||
omega[ c ] /= totmob[ c ];
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user