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

Add "Polymer" material and disable custom getConvergence().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-30 14:49:15 +02:00
parent 6ef6dbcf5a
commit b885c8e454
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
View File

@ -119,7 +119,7 @@ namespace Opm {
/// residual mass balance (tol_cnv). /// residual mass balance (tol_cnv).
/// \param[in] dt timestep length /// \param[in] dt timestep length
/// \param[in] iteration current iteration number /// \param[in] iteration current iteration number
bool getConvergence(const double dt, const int iteration); // bool getConvergence(const double dt, const int iteration);
/// Assemble the residual and Jacobian of the nonlinear system. /// Assemble the residual and Jacobian of the nonlinear system.
/// \param[in] reservoir_state reservoir state variables /// \param[in] reservoir_state reservoir state variables
@ -275,16 +275,16 @@ namespace Opm {
/// of B for the phase i. /// of B for the phase i.
/// \param[in] nc The number of cells of the local grid. /// \param[in] nc The number of cells of 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+1>& B, // convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& B,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& tempV, // const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& tempV,
const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& R, // const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& R,
std::array<double,MaxNumPhases+1>& R_sum, // std::array<double,MaxNumPhases+1>& R_sum,
std::array<double,MaxNumPhases+1>& maxCoeff, // std::array<double,MaxNumPhases+1>& maxCoeff,
std::array<double,MaxNumPhases+1>& B_avg, // std::array<double,MaxNumPhases+1>& B_avg,
std::vector<double>& maxNormWell, // std::vector<double>& maxNormWell,
int nc, // int nc,
int nw) const; // int nw) const;
/// Computing the water velocity without shear-thinning for the cell faces. /// Computing the water velocity without shear-thinning for the cell faces.
/// The water velocity will be used for shear-thinning calculation. /// The water velocity will be used for shear-thinning calculation.

8
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@ -110,6 +110,7 @@ namespace Opm {
// If deck has polymer, residual_ should contain polymer equation. // If deck has polymer, residual_ should contain polymer equation.
rq_.resize(fluid_.numPhases() + 1); rq_.resize(fluid_.numPhases() + 1);
residual_.material_balance_eq.resize(fluid_.numPhases() + 1, ADB::null()); residual_.material_balance_eq.resize(fluid_.numPhases() + 1, ADB::null());
Base::material_name_.push_back("Polymer");
assert(poly_pos_ == fluid_.numPhases()); assert(poly_pos_ == fluid_.numPhases());
} }
} }
@ -454,7 +455,7 @@ namespace Opm {
/*
template <class Grid> template <class Grid>
double double
BlackoilPolymerModel<Grid>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& B, BlackoilPolymerModel<Grid>::convergenceReduction(const Eigen::Array<double, Eigen::Dynamic, MaxNumPhases+1>& B,
@ -537,7 +538,7 @@ namespace Opm {
return geo_.poreVolume().sum(); return geo_.poreVolume().sum();
} }
} }
*/
template <class Grid> template <class Grid>
void void
@ -629,7 +630,7 @@ namespace Opm {
/*
template <class Grid> template <class Grid>
bool bool
BlackoilPolymerModel<Grid>::getConvergence(const double dt, const int iteration) BlackoilPolymerModel<Grid>::getConvergence(const double dt, const int iteration)
@ -742,6 +743,7 @@ namespace Opm {
} }
return converged; return converged;
} }
*/
template <class Grid> template <class Grid>
ADB ADB