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

remove the hasDisgas and hasVapoil arguments from SimulatorFullyImplicitBlackoilEbos

Browse Source 
They seemed to be unused already. I suspect that were only there for
API compatibility reasons.
This commit is contained in:
Andreas Lauser 2018-06-06 10:59:41 +02:00
parent 37b6a540af
commit 5a9b81db33
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -146,8 +146,7 @@ namespace Opm {
BlackoilWellModel<TypeTag>& well_model,
BlackoilAquiferModel<TypeTag>& aquifer_model,
const NewtonIterationBlackoilInterface& linsolver,
const bool terminal_output
)
const bool terminal_output)
: ebosSimulator_(ebosSimulator)
, grid_(ebosSimulator_.vanguard().grid())
, istlSolver_( dynamic_cast< const ISTLSolverType* > (&linsolver) )

4
opm/autodiff/FlowMainEbos.hpp
View File

@ -551,9 +551,7 @@ namespace Opm
// Create the simulator instance.
simulator_.reset(new Simulator(*ebosSimulator_,
param_,
*fis_solver_,
FluidSystem::enableDissolvedGas(),
FluidSystem::enableVaporizedOil()));
*fis_solver_));
}
private:

8
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -92,17 +92,13 @@ public:
/// \param[in] threshold_pressures_by_face if nonempty, threshold pressures that inhibit flow
SimulatorFullyImplicitBlackoilEbos(Simulator& ebosSimulator,
const ParameterGroup& param,
NewtonIterationBlackoilInterface& linsolver,
const bool hasDisgas,
const bool hasVapoil)
NewtonIterationBlackoilInterface& linsolver)
: ebosSimulator_(ebosSimulator)
, param_(param)
, modelParam_(param)
, solverParam_(param)
, solver_(linsolver)
, phaseUsage_(phaseUsageFromDeck(eclState()))
, hasDisgas_(hasDisgas)
, hasVapoil_(hasVapoil)
, terminalOutput_(param.getDefault("output_terminal", true))
{
#if HAVE_MPI
@ -384,8 +380,6 @@ protected:
NewtonIterationBlackoilInterface& solver_;
PhaseUsage phaseUsage_;
// Misc. data
const bool hasDisgas_;
const bool hasVapoil_;
bool terminalOutput_;
};