OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce macro to control whether or not to initialise NR with prev. soln.

Browse Source 
On by default.
This commit is contained in:
Bård Skaflestad
2011-11-25 18:15:46 +01:00
parent 93916418fc
commit 17f48c62c8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SinglePointUpwindTwoPhase.hpp
View File

@@ -345,15 +345,24 @@ namespace Opm {
const Grid& g ,
JacobianSystem& sys ) {
// Impose s=0.5 at next time level as an NR initial value.
//const ::std::vector<double>& s = state.saturation();
(void) state; // Suppress 'unused' warning.
#define USE_PREVIOUS_SOLUTION 1
#if !USE_PREVIOUS_SOLUTION
const ::std::vector<double>& s = state.saturation();
#endif
typename JacobianSystem::vector_type& x =
sys.vector().writableSolution();
assert (x.size() == (::std::size_t) (g.number_of_cells));
for (int c = 0, nc = g.number_of_cells; c < nc; ++c) {
x[c] = 0.0;//0.5 - s[2*c + 0];
#if !USE_PREVIOUS_SOLUTION
// Impose s=0.5 at next time level as an NR initial value.
x[c] = 0.5 - s[2*c + 0];
#else
x[c] = 0.0;
#endif
}
}