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

WIP fix vfp in flow

Browse Source
This commit is contained in:
Tor Harald Sandve 2018-05-15 10:24:50 +02:00
parent ffd1f76c7c
commit 2534cc46db
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilWellModel_impl.hpp
View File

@ -264,6 +264,7 @@ namespace Opm {
updatePerforationIntensiveQuantities(); updatePerforationIntensiveQuantities();
if (iterationIdx == 0) { if (iterationIdx == 0) {
calculateExplicitQuantities();
prepareTimeStep(); prepareTimeStep();
} }
@ -272,7 +273,7 @@ namespace Opm {
initPrimaryVariablesEvaluation(); initPrimaryVariablesEvaluation();
if (iterationIdx == 0) { if (iterationIdx == 0) {
calculateExplicitQuantities(); //calculateExplicitQuantities();
} }
if (param_.solve_welleq_initially_ && iterationIdx == 0) { if (param_.solve_welleq_initially_ && iterationIdx == 0) {
@ -281,6 +282,7 @@ namespace Opm {
if (initial_step_) { if (initial_step_) {
// update the explicit quantities to get the initial fluid distribution in the well correct. // update the explicit quantities to get the initial fluid distribution in the well correct.
calculateExplicitQuantities(); calculateExplicitQuantities();
prepareTimeStep();
last_report_ = solveWellEq(dt); last_report_ = solveWellEq(dt);
initial_step_ = false; initial_step_ = false;
} }

4
opm/autodiff/VFPHelpers.hpp
View File

@ -49,8 +49,8 @@ inline double zeroIfNan(const double& value) {
* Returns zero if input value is NaN * Returns zero if input value is NaN
*/ */
template <class EvalWell> template <class EvalWell>
inline double zeroIfNan(const EvalWell& value) { inline EvalWell zeroIfNan(const EvalWell& value) {
return (std::isnan(value.value())) ? 0.0 : value.value(); return (std::isnan(value.value())) ? 0.0 : value;
} }

2
opm/core/simulator/WellState.hpp
View File

@ -124,7 +124,7 @@ namespace Opm
wellrates_[np*w + p] = rate_target * distr[p]; wellrates_[np*w + p] = rate_target * distr[p];
} }
} else { } else {
const double small_rate = 1e-14; const double small_rate = 0.0; //1e-14;
const double sign = (wells->type[w] == INJECTOR) ? 1.0 : -1.0; const double sign = (wells->type[w] == INJECTOR) ? 1.0 : -1.0;
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {
wellrates_[np*w + p] = small_rate * sign; wellrates_[np*w + p] = small_rate * sign;