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

Merge branch 'master' into Adding_PLYSHLOG_RELATED

Browse Source
This commit is contained in:
Kai Bao 2015-06-10 15:15:25 +02:00
commit 6745a2fb0a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp
View File

@ -88,6 +88,9 @@ namespace Opm {
int newtonIterations() const; int newtonIterations() const;
int linearIterations() const; int linearIterations() const;
/// Not used by this class except to satisfy interface requirements.
typedef parameter::ParameterGroup SolverParameters;
private: private:
typedef AutoDiffBlock<double> ADB; typedef AutoDiffBlock<double> ADB;
typedef ADB::V V; typedef ADB::V V;

5
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
View File

@ -79,6 +79,11 @@ namespace Opm
typedef BlackoilOutputWriter OutputWriter; typedef BlackoilOutputWriter OutputWriter;
typedef GridT Grid; typedef GridT Grid;
typedef FullyImplicitCompressiblePolymerSolver Solver; typedef FullyImplicitCompressiblePolymerSolver Solver;
/// Dummy class, this Solver does not use a Model.
struct Model
{
typedef parameter::ParameterGroup ModelParameters;
};
}; };
/// Class collecting all necessary components for a two-phase simulation. /// Class collecting all necessary components for a two-phase simulation.