OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 21:32:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from xavierr/master

Browse Source 
Cleaned up Newton single cell solvers.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-10-08 06:06:48 -07:00
commit 10ec7db1a1
2 changed files with 437 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1031
opm/polymer/TransportModelCompressiblePolymer.cpp
View File

File diff suppressed because it is too large Load Diff

6
opm/polymer/TransportModelCompressiblePolymer.hpp
View File

@ -46,7 +46,7 @@ namespace Opm
{
public:
enum SingleCellMethod { Bracketing, Newton, Gradient, NewtonSimpleSC, NewtonSimpleC};
enum SingleCellMethod { Bracketing, Newton, NewtonC, Gradient};
enum GradientMethod { Analytic, FinDif }; // Analytic is chosen (hard-coded)
/// Construct solver.
@ -194,10 +194,8 @@ namespace Opm
virtual void solveSingleCell(const int cell);
virtual void solveMultiCell(const int num_cells, const int* cells);
void solveSingleCellBracketing(int cell);
void solveSingleCellNewton(int cell);
void solveSingleCellNewton(int cell, bool use_sc, bool use_explicit_step = false);
void solveSingleCellGradient(int cell);
void solveSingleCellNewtonSimple(int cell,bool use_sc);
void solveSingleCellGravity(const std::vector<int>& cells,
const int pos,
const double* gravflux);