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 active and not canonical phases in getConvergence() etc.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-30 10:03:48 +02:00
parent 57deb18dc4
commit aac34009e1
2 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/autodiff/BlackoilModelBase.hpp
View File

@ -493,12 +493,12 @@ namespace Opm {
/// \param[in] nw The number of wells on the local grid. /// \param[in] nw The number of wells on the local grid.
/// \return The total pore volume over all cells. /// \return The total pore volume over all cells.
double double
convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& B, convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& B,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& tempV, const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& tempV,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& R, const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& R,
std::array<double,MaxNumPhases>& R_sum, std::vector<double>& R_sum,
std::array<double,MaxNumPhases>& maxCoeff, std::vector<double>& maxCoeff,
std::array<double,MaxNumPhases>& B_avg, std::vector<double>& B_avg,
std::vector<double>& maxNormWell, std::vector<double>& maxNormWell,
int nc, int nc,
int nw) const; int nw) const;

117
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -2275,16 +2275,18 @@ namespace detail {
template <class Grid, class Implementation> template <class Grid, class Implementation>
double double
BlackoilModelBase<Grid, Implementation>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& B, BlackoilModelBase<Grid, Implementation>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& B,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& tempV, const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& tempV,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases>& R, const Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic>& R,
std::array<double,MaxNumPhases>& R_sum, std::vector<double>& R_sum,
std::array<double,MaxNumPhases>& maxCoeff, std::vector<double>& maxCoeff,
std::array<double,MaxNumPhases>& B_avg, std::vector<double>& B_avg,
std::vector<double>& maxNormWell, std::vector<double>& maxNormWell,
int nc, int nc,
int nw) const int nw) const
{ {
const int num_elems = B.cols();
// Do the global reductions // Do the global reductions
#if HAVE_MPI #if HAVE_MPI
if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) ) if ( linsolver_.parallelInformation().type() == typeid(ParallelISTLInformation) )
@ -2332,21 +2334,20 @@ namespace detail {
else else
#endif #endif
{ {
for ( int idx=0; idx<MaxNumPhases; ++idx ) B_avg.resize(num_elems);
maxCoeff.resize(num_elems);
R_sum.resize(num_elems);
maxNormWell.resize(num_elems);
for ( int idx = 0; idx < num_elems; ++idx )
{ {
if (active_[idx]) { B_avg[idx] = B.col(idx).sum()/nc;
B_avg[idx] = B.col(idx).sum()/nc; maxCoeff[idx] = tempV.col(idx).maxCoeff();
maxCoeff[idx]=tempV.col(idx).maxCoeff(); R_sum[idx] = R.col(idx).sum();
R_sum[idx] = R.col(idx).sum();
}
else
{
R_sum[idx] = B_avg[idx] = maxCoeff[idx] =0.0;
}
maxNormWell[idx] = 0.0; maxNormWell[idx] = 0.0;
for ( int w=0; w<nw; ++w ) for ( int w = 0; w < nw; ++w )
{ {
maxNormWell[idx] = std::max(maxNormWell[idx], std::abs(residual_.well_flux_eq.value()[nw*idx + w])); maxNormWell[idx] = std::max(maxNormWell[idx], std::abs(residual_.well_flux_eq.value()[nw*idx + w]));
} }
} }
// Compute total pore volume // Compute total pore volume
@ -2368,43 +2369,42 @@ namespace detail {
const int nc = Opm::AutoDiffGrid::numCells(grid_); const int nc = Opm::AutoDiffGrid::numCells(grid_);
const int nw = localWellsActive() ? wells().number_of_wells : 0; const int nw = localWellsActive() ? wells().number_of_wells : 0;
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const int np = fluid_.numPhases();
assert(int(rq_.size()) == np);
const V pv = geo_.poreVolume(); const V pv = geo_.poreVolume();
const std::vector<PhasePresence> cond = phaseCondition(); const std::vector<PhasePresence> cond = phaseCondition();
std::array<double,MaxNumPhases> CNV = {{0., 0., 0.}}; std::vector<double> R_sum(np);
std::array<double,MaxNumPhases> R_sum = {{0., 0., 0.}}; std::vector<double> B_avg(np);
std::array<double,MaxNumPhases> B_avg = {{0., 0., 0.}}; std::vector<double> maxCoeff(np);
std::array<double,MaxNumPhases> maxCoeff = {{0., 0., 0.}}; std::vector<double> maxNormWell(np);
std::array<double,MaxNumPhases> mass_balance_residual = {{0., 0., 0.}}; Eigen::Array<V::Scalar, Eigen::Dynamic, Eigen::Dynamic> B(nc, np);
std::array<double,MaxNumPhases> well_flux_residual = {{0., 0., 0.}}; Eigen::Array<V::Scalar, Eigen::Dynamic, Eigen::Dynamic> R(nc, np);
std::size_t cols = MaxNumPhases; // needed to pass the correct type to Eigen Eigen::Array<V::Scalar, Eigen::Dynamic, Eigen::Dynamic> tempV(nc, np);
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> B(nc, cols);
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> R(nc, cols);
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> tempV(nc, cols);
std::vector<double> maxNormWell(MaxNumPhases);
for ( int idx=0; idx<MaxNumPhases; ++idx ) for ( int idx = 0; idx < np; ++idx )
{ {
if (active_[idx]) { const ADB& tempB = rq_[idx].b;
const int pos = pu.phase_pos[idx]; B.col(idx) = 1./tempB.value();
const ADB& tempB = rq_[pos].b; R.col(idx) = residual_.material_balance_eq[idx].value();
B.col(idx) = 1./tempB.value(); tempV.col(idx) = R.col(idx).abs()/pv;
R.col(idx) = residual_.material_balance_eq[idx].value();
tempV.col(idx) = R.col(idx).abs()/pv;
}
} }
const double pvSum = convergenceReduction(B, tempV, R, R_sum, maxCoeff, B_avg, const double pvSum = convergenceReduction(B, tempV, R,
maxNormWell, nc, nw); R_sum, maxCoeff, B_avg, maxNormWell,
nc, nw);
std::vector<double> CNV(np);
std::vector<double> mass_balance_residual(np);
std::vector<double> well_flux_residual(np);
bool converged_MB = true; bool converged_MB = true;
bool converged_CNV = true; bool converged_CNV = true;
bool converged_Well = true; bool converged_Well = true;
// Finish computation // Finish computation
for ( int idx=0; idx<MaxNumPhases; ++idx ) for ( int idx = 0; idx < np; ++idx )
{ {
CNV[idx] = B_avg[idx] * dt * maxCoeff[idx]; CNV[idx] = B_avg[idx] * dt * maxCoeff[idx];
mass_balance_residual[idx] = std::abs(B_avg[idx]*R_sum[idx]) * dt / pvSum; mass_balance_residual[idx] = std::abs(B_avg[idx]*R_sum[idx]) * dt / pvSum;
@ -2417,8 +2417,8 @@ namespace detail {
const double residualWell = detail::infinityNormWell(residual_.well_eq, const double residualWell = detail::infinityNormWell(residual_.well_eq,
linsolver_.parallelInformation()); linsolver_.parallelInformation());
converged_Well = converged_Well && (residualWell < Opm::unit::barsa); converged_Well = converged_Well && (residualWell < Opm::unit::barsa);
const bool converged = converged_MB && converged_CNV && converged_Well; const bool converged = converged_MB && converged_CNV && converged_Well;
// Residual in Pascal can have high values and still be ok. // Residual in Pascal can have high values and still be ok.
const double maxWellResidualAllowed = 1000.0 * maxResidualAllowed(); const double maxWellResidualAllowed = 1000.0 * maxResidualAllowed();
@ -2475,34 +2475,31 @@ namespace detail {
const int nc = Opm::AutoDiffGrid::numCells(grid_); const int nc = Opm::AutoDiffGrid::numCells(grid_);
const int nw = localWellsActive() ? wells().number_of_wells : 0; const int nw = localWellsActive() ? wells().number_of_wells : 0;
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const int np = fluid_.numPhases();
const V pv = geo_.poreVolume(); const V pv = geo_.poreVolume();
std::array<double,MaxNumPhases> R_sum = {{0., 0., 0.}}; std::vector<double> R_sum(np);
std::array<double,MaxNumPhases> B_avg = {{0., 0., 0.}}; std::vector<double> B_avg(np);
std::array<double,MaxNumPhases> maxCoeff = {{0., 0., 0.}}; std::vector<double> maxCoeff(np);
std::array<double,MaxNumPhases> well_flux_residual = {{0., 0., 0.}};
std::size_t cols = MaxNumPhases; // needed to pass the correct type to Eigen std::size_t cols = MaxNumPhases; // needed to pass the correct type to Eigen
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> B(nc, cols); Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> B(nc, cols);
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> R(nc, cols); Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> R(nc, cols);
Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> tempV(nc, cols); Eigen::Array<V::Scalar, Eigen::Dynamic, MaxNumPhases> tempV(nc, cols);
std::vector<double> maxNormWell(MaxNumPhases); std::vector<double> maxNormWell(MaxNumPhases);
for ( int idx=0; idx<MaxNumPhases; ++idx ) for ( int idx = 0; idx < np; ++idx )
{ {
if (active_[idx]) { const ADB& tempB = rq_[idx].b;
const int pos = pu.phase_pos[idx]; B.col(idx) = 1./tempB.value();
const ADB& tempB = rq_[pos].b; R.col(idx) = residual_.material_balance_eq[idx].value();
B.col(idx) = 1./tempB.value(); tempV.col(idx) = R.col(idx).abs()/pv;
R.col(idx) = residual_.material_balance_eq[idx].value();
tempV.col(idx) = R.col(idx).abs()/pv;
}
} }
convergenceReduction(B, tempV, R, R_sum, maxCoeff, B_avg, maxNormWell, nc, nw); convergenceReduction(B, tempV, R, R_sum, maxCoeff, B_avg, maxNormWell, nc, nw);
std::vector<double> well_flux_residual(np);
bool converged_Well = true; bool converged_Well = true;
// Finish computation // Finish computation
for ( int idx=0; idx<MaxNumPhases; ++idx ) for ( int idx = 0; idx < np; ++idx )
{ {
well_flux_residual[idx] = B_avg[idx] * maxNormWell[idx]; well_flux_residual[idx] = B_avg[idx] * maxNormWell[idx];
converged_Well = converged_Well && (well_flux_residual[idx] < tol_wells); converged_Well = converged_Well && (well_flux_residual[idx] < tol_wells);