OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes to NewtonIterationBlackoilInterleaved.cpp

Browse Source 
Some tempory changes is removed in
NewtonIterationBlackoilInterleaved.cpp to make flow run again.
This commit is contained in:
Tor Harald Sandve committed 2016-09-08 11:23:41 +02:00
1 parent 746f9a56cc
commit 902eff18a5
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
+6 -6
View File
@@ -390,7 +390,7 @@ namespace Opm
//const int np = residual.material_balance_eq.size(); //const int np = residual.material_balance_eq.size();
assert( np == int(residual.material_balance_eq.size()) ); assert( np == int(residual.material_balance_eq.size()) );
std::vector<ADB> eqs; std::vector<ADB> eqs;
eqs.reserve(np + 1); eqs.reserve(np + 2);
for (int phase = 0; phase < np; ++phase) { for (int phase = 0; phase < np; ++phase) {
eqs.push_back(residual.material_balance_eq[phase]); eqs.push_back(residual.material_balance_eq[phase]);
} }
@@ -401,14 +401,14 @@ namespace Opm
if( hasWells ) if( hasWells )
{ {
eqs.push_back(residual.well_flux_eq); eqs.push_back(residual.well_flux_eq);
//eqs.push_back(residual.well_eq); eqs.push_back(residual.well_eq);
// Eliminate the well-related unknowns, and corresponding equations. // Eliminate the well-related unknowns, and corresponding equations.
elim_eqs.reserve(1); elim_eqs.reserve(2);
elim_eqs.push_back(eqs[np]); elim_eqs.push_back(eqs[np]);
eqs = eliminateVariable(eqs, np); // Eliminate well flux unknowns. eqs = eliminateVariable(eqs, np); // Eliminate well flux unknowns.
//elim_eqs.push_back(eqs[np]); elim_eqs.push_back(eqs[np]);
//eqs = eliminateVariable(eqs, np); // Eliminate well bhp unknowns. eqs = eliminateVariable(eqs, np); // Eliminate well bhp unknowns.
assert(int(eqs.size()) == np); assert(int(eqs.size()) == np);
} }
@@ -500,7 +500,7 @@ namespace Opm
if ( hasWells ) { if ( hasWells ) {
// Compute full solution using the eliminated equations. // Compute full solution using the eliminated equations.
// Recovery in inverse order of elimination. // Recovery in inverse order of elimination.
//dx = recoverVariable(elim_eqs[1], dx, np); dx = recoverVariable(elim_eqs[1], dx, np);
dx = recoverVariable(elim_eqs[0], dx, np); dx = recoverVariable(elim_eqs[0], dx, np);
} }
return dx; return dx;