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

BlackoilModelEbos: remove redundant constructor parameters

Browse Source
This commit is contained in:
Andreas Lauser 2016-08-09 14:47:24 +02:00
parent 626d3e1da5
commit 8e81023e1d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -129,8 +129,6 @@ namespace Opm {
/// \param[in] vfp_properties Vertical flow performance tables /// \param[in] vfp_properties Vertical flow performance tables
/// \param[in] linsolver linear solver /// \param[in] linsolver linear solver
/// \param[in] eclState eclipse state /// \param[in] eclState eclipse state
/// \param[in] has_disgas turn on dissolved gas
/// \param[in] has_vapoil turn on vaporized oil feature
/// \param[in] terminal_output request output to cout/cerr /// \param[in] terminal_output request output to cout/cerr
BlackoilModelEbos(Simulator& ebosSimulator, BlackoilModelEbos(Simulator& ebosSimulator,
const ModelParameters& param, const ModelParameters& param,
@ -139,8 +137,6 @@ namespace Opm {
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
const StandardWells& well_model, const StandardWells& well_model,
const NewtonIterationBlackoilInterface& linsolver, const NewtonIterationBlackoilInterface& linsolver,
const bool has_disgas,
const bool has_vapoil,
const bool terminal_output) const bool terminal_output)
: ebosSimulator_(ebosSimulator) : ebosSimulator_(ebosSimulator)
, grid_(ebosSimulator_.gridManager().grid()) , grid_(ebosSimulator_.gridManager().grid())
@ -155,8 +151,8 @@ namespace Opm {
, canph_ (detail::active2Canonical(fluid.phaseUsage())) , canph_ (detail::active2Canonical(fluid.phaseUsage()))
, cells_ (detail::buildAllCells(Opm::AutoDiffGrid::numCells(grid_))) , cells_ (detail::buildAllCells(Opm::AutoDiffGrid::numCells(grid_)))
, ops_ (grid_, geo.nnc()) , ops_ (grid_, geo.nnc())
, has_disgas_(has_disgas) , has_disgas_(FluidSystem::enableDissolvedGas())
, has_vapoil_(has_vapoil) , has_vapoil_(FluidSystem::enableVaporizedOil())
, param_( param ) , param_( param )
, use_threshold_pressure_(false) , use_threshold_pressure_(false)
, rq_ (fluid.numPhases()) , rq_ (fluid.numPhases())

2
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -353,8 +353,6 @@ protected:
rock_comp_props_, rock_comp_props_,
well_model, well_model,
solver_, solver_,
has_disgas_,
has_vapoil_,
terminal_output_)); terminal_output_));
return std::unique_ptr<Solver>(new Solver(solver_param_, std::move(model))); return std::unique_ptr<Solver>(new Solver(solver_param_, std::move(model)));