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

use WellStateFullyImplicitBlackoil instead of WellState.

Browse Source
This commit is contained in:
Liu Ming 2014-10-29 10:25:06 +08:00
parent d44e8e6d9f
commit 3102c4dab2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
View File

@ -25,12 +25,12 @@
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/autodiff/BlackoilPropsAdInterface.hpp> #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/GeoProps.hpp> #include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/linalg/LinearSolverInterface.hpp> #include <opm/core/linalg/LinearSolverInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp> #include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/polymer/PolymerBlackoilState.hpp> #include <opm/polymer/PolymerBlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/well_controls.h> #include <opm/core/well_controls.h>
#include <cassert> #include <cassert>
@ -197,7 +197,7 @@ namespace {
FullyImplicitCompressiblePolymerSolver:: FullyImplicitCompressiblePolymerSolver::
step(const double dt, step(const double dt,
PolymerBlackoilState& x , PolymerBlackoilState& x ,
WellState& xw, WellStateFullyImplicitBlackoil& xw,
const std::vector<double>& polymer_inflow, const std::vector<double>& polymer_inflow,
std::vector<double>& src) std::vector<double>& src)
{ {
@ -306,7 +306,7 @@ namespace {
FullyImplicitCompressiblePolymerSolver::SolutionState FullyImplicitCompressiblePolymerSolver::SolutionState
FullyImplicitCompressiblePolymerSolver::constantState(const PolymerBlackoilState& x, FullyImplicitCompressiblePolymerSolver::constantState(const PolymerBlackoilState& x,
const WellState& xw) const WellStateFullyImplicitBlackoil& xw)
{ {
const int nc = grid_.number_of_cells; const int nc = grid_.number_of_cells;
const int np = x.numPhases(); const int np = x.numPhases();
@ -368,7 +368,7 @@ namespace {
FullyImplicitCompressiblePolymerSolver::SolutionState FullyImplicitCompressiblePolymerSolver::SolutionState
FullyImplicitCompressiblePolymerSolver::variableState(const PolymerBlackoilState& x, FullyImplicitCompressiblePolymerSolver::variableState(const PolymerBlackoilState& x,
const WellState& xw) const WellStateFullyImplicitBlackoil& xw)
{ {
const int nc = grid_.number_of_cells; const int nc = grid_.number_of_cells;
const int np = x.numPhases(); const int np = x.numPhases();
@ -495,7 +495,7 @@ namespace {
FullyImplicitCompressiblePolymerSolver:: FullyImplicitCompressiblePolymerSolver::
assemble(const double dt, assemble(const double dt,
const PolymerBlackoilState& x , const PolymerBlackoilState& x ,
const WellState& xw, const WellStateFullyImplicitBlackoil& xw,
const std::vector<double>& polymer_inflow, const std::vector<double>& polymer_inflow,
std::vector<double>& src) std::vector<double>& src)
{ {
@ -695,7 +695,7 @@ namespace {
void FullyImplicitCompressiblePolymerSolver:: void FullyImplicitCompressiblePolymerSolver::
updateState(const V& dx, updateState(const V& dx,
PolymerBlackoilState& state, PolymerBlackoilState& state,
WellState& well_state) const WellStateFullyImplicitBlackoil& well_state) const
{ {
const int np = fluid_.numPhases(); const int np = fluid_.numPhases();
const int nc = grid_.number_of_cells; const int nc = grid_.number_of_cells;

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

@ -38,7 +38,7 @@ namespace Opm {
class RockCompressibility; class RockCompressibility;
class NewtonIterationBlackoilInterface; class NewtonIterationBlackoilInterface;
class PolymerBlackoilState; class PolymerBlackoilState;
class WellState; class WellStateFullyImplicitBlackoil;
/// A fully implicit solver for the oil-water with polymer problem. /// A fully implicit solver for the oil-water with polymer problem.
/// ///
@ -83,7 +83,7 @@ namespace Opm {
void void
step(const double dt, step(const double dt,
PolymerBlackoilState& state , PolymerBlackoilState& state ,
WellState& wstate, WellStateFullyImplicitBlackoil& wstate,
const std::vector<double>& polymer_inflow, const std::vector<double>& polymer_inflow,
std::vector<double>& src); std::vector<double>& src);
@ -146,11 +146,11 @@ namespace Opm {
// Private methods. // Private methods.
SolutionState SolutionState
constantState(const PolymerBlackoilState& x, constantState(const PolymerBlackoilState& x,
const WellState& xw); const WellStateFullyImplicitBlackoil& xw);
SolutionState SolutionState
variableState(const PolymerBlackoilState& x, variableState(const PolymerBlackoilState& x,
const WellState& xw); const WellStateFullyImplicitBlackoil& xw);
void void
computeAccum(const SolutionState& state, computeAccum(const SolutionState& state,
@ -159,7 +159,7 @@ namespace Opm {
void void
assemble(const double dt, assemble(const double dt,
const PolymerBlackoilState& x, const PolymerBlackoilState& x,
const WellState& xw, const WellStateFullyImplicitBlackoil& xw,
const std::vector<double>& polymer_inflow, const std::vector<double>& polymer_inflow,
std::vector<double>& src); std::vector<double>& src);
@ -167,7 +167,7 @@ namespace Opm {
void updateState(const V& dx, void updateState(const V& dx,
PolymerBlackoilState& state, PolymerBlackoilState& state,
WellState& well_state) const; WellStateFullyImplicitBlackoil& well_state) const;
std::vector<ADB> std::vector<ADB>
computeRelPerm(const SolutionState& state) const; computeRelPerm(const SolutionState& state) const;