Rename variable.

Changed threshold_pressures_by_face_ -> threshold_pressures_by_interior_face_.
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-27 13:46:23 +02:00
parent c5de6635c5
commit dfc726bceb
4 changed files with 6 additions and 4 deletions

View File

@ -0,0 +1 @@
atgeirr@arwen.lan.90866

View File

@ -0,0 +1 @@
atgeirr@arwen.lan.90866

View File

@ -166,7 +166,7 @@ namespace Opm {
double relax_rel_tol_;
int max_iter_;
bool use_threshold_pressure_;
V threshold_pressures_by_face_;
V threshold_pressures_by_interior_face_;
std::vector<ReservoirResidualQuant> rq_;
std::vector<PhasePresence> phaseCondition_;

View File

@ -225,7 +225,7 @@ namespace {
OPM_THROW(std::runtime_error, "Illegal size of threshold_pressures input, must be equal to number of interior faces.");
}
use_threshold_pressure_ = true;
threshold_pressures_by_face_ = threshold_pressures;
threshold_pressures_by_interior_face_ = threshold_pressures;
}
@ -1631,7 +1631,7 @@ namespace {
// Identify the set of faces where the potential is under the
// threshold, that shall have zero flow. Storing the bool
// Array as a V (a double Array) with 1 and 0 elements.
const V low_potential = (dp.value().abs() < threshold_pressures_by_face_).template cast<double>();
const V low_potential = (dp.value().abs() < threshold_pressures_by_interior_face_).template cast<double>();
// Create a sparse vector that nullifies the low potential elements.
const M nullify_low_potential = spdiag(low_potential);
@ -1639,7 +1639,7 @@ namespace {
// The threshold modification must have the sign that reduces the
// absolute value of the potential.
const V sign_for_mod = (dp.value() < 0).template cast<double>();
const V threshold_modification = sign_for_mod * threshold_pressures_by_face_;
const V threshold_modification = sign_for_mod * threshold_pressures_by_interior_face_;
// Modify potential and nullify where appropriate.
dp = nullify_low_potential * (dp + threshold_modification);