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

Adding the flag for PLYSHLOG keyword.

Browse Source
This commit is contained in:
Kai Bao 2015-06-01 10:52:49 +02:00
parent 47ef88806c
commit c6e240daae
7 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/flow_polymer.cpp
View File

@ -279,6 +279,7 @@ try
grav,
deck->hasKeyword("DISGAS"),
deck->hasKeyword("VAPOIL"),
deck->hasKeyword("PLYSHLOG"),
polymer,
eclipseState,
outputWriter,

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

@ -66,6 +66,7 @@ namespace Opm {
/// \param[in] has_disgas turn on dissolved gas
/// \param[in] has_vapoil turn on vaporized oil feature
/// \param[in] has_polymer turn on polymer feature
/// \param[in] has_plyshlog true when PLYSHLOG keyword available
/// \param[in] terminal_output request output to cout/cerr
BlackoilPolymerModel(const typename Base::ModelParameters& param,
const Grid& grid,
@ -78,6 +79,7 @@ namespace Opm {
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
const bool has_plyshlog,
const bool terminal_output);
/// Called once before each time step.
@ -122,6 +124,7 @@ namespace Opm {
const PolymerPropsAd& polymer_props_ad_;
const bool has_polymer_;
const bool has_plyshlog_;
const int poly_pos_;
V cmax_;

2
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@ -85,11 +85,13 @@ namespace Opm {
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
const bool has_plyshlog,
const bool terminal_output)
: Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver,
has_disgas, has_vapoil, terminal_output),
polymer_props_ad_(polymer_props_ad),
has_polymer_(has_polymer),
has_plyshlog_(has_plyshlog),
poly_pos_(detail::polymerPos(fluid.phaseUsage()))
{
if (has_polymer_) {

2
opm/polymer/fullyimplicit/FullyImplicitBlackoilPolymerSolver.hpp
View File

@ -108,6 +108,7 @@ namespace Opm {
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
const bool has_plyshlog,
const bool terminal_output);
/// \brief Set threshold pressures that prevent or reduce flow.
@ -205,6 +206,7 @@ namespace Opm {
const bool has_disgas_;
const bool has_vapoil_;
const bool has_polymer_;
const bool has_plyshlog_;
const int poly_pos_;
SolverParameter param_;

2
opm/polymer/fullyimplicit/FullyImplicitBlackoilPolymerSolver_impl.hpp
View File

@ -220,6 +220,7 @@ namespace detail {
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
const bool has_plyshlog,
const bool terminal_output)
: grid_ (grid)
, fluid_ (fluid)
@ -237,6 +238,7 @@ namespace detail {
, has_disgas_(has_disgas)
, has_vapoil_(has_vapoil)
, has_polymer_(has_polymer)
, has_plyshlog_(has_plyshlog)
, poly_pos_(detail::polymerPos(fluid.phaseUsage()))
, param_( param )
, use_threshold_pressure_(false)

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

@ -116,6 +116,7 @@ namespace Opm
const bool disgas,
const bool vapoil,
const bool polymer,
const bool plyshlog,
std::shared_ptr<EclipseState> eclipse_state,
BlackoilOutputWriter& output_writer,
Opm::DeckConstPtr& deck,
@ -131,6 +132,8 @@ namespace Opm
private:
const PolymerPropsAd& polymer_props_;
bool has_polymer_;
/// flag for PLYSHLOG keywords
bool has_plyshlog_;
DeckConstPtr deck_;
};

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

@ -34,6 +34,7 @@ namespace Opm
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
const bool has_plyshlog,
std::shared_ptr<EclipseState> eclipse_state,
BlackoilOutputWriter& output_writer,
Opm::DeckConstPtr& deck,
@ -52,6 +53,7 @@ namespace Opm
threshold_pressures_by_face)
, polymer_props_(polymer_props)
, has_polymer_(has_polymer)
, has_plyshlog_(has_plyshlog)
, deck_(deck)
{
}
@ -77,6 +79,7 @@ namespace Opm
BaseType::has_disgas_,
BaseType::has_vapoil_,
has_polymer_,
has_plyshlog_,
BaseType::terminal_output_));
if (!BaseType::threshold_pressures_by_face_.empty()) {