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

SimulatorBase: move the new method bodies from the .hpp to the _impl.hpp file

Browse Source
This commit is contained in:
Andreas Lauser 2015-05-28 13:28:40 +02:00
parent 662cd9791e
commit 553f32e6cf
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
opm/autodiff/SimulatorBase.hpp
View File

@ -147,36 +147,9 @@ namespace Opm
void handleAdditionalWellInflow(SimulatorTimer& timer, void handleAdditionalWellInflow(SimulatorTimer& timer,
WellsManager& wells_manager, WellsManager& wells_manager,
WellState& well_state, WellState& well_state,
const Wells* wells) const Wells* wells);
{};
std::shared_ptr<Solver> createSolver(const Wells* wells) std::shared_ptr<Solver> createSolver(const Wells* wells);
{
typedef typename Traits::Model Model;
typedef typename Model::ModelParameters ModelParams;
ModelParams modelParams( param_ );
typedef NewtonSolver<Model> Solver;
auto model = std::make_shared<Model>(modelParams,
grid_,
props_,
geo_,
rock_comp_props_,
wells,
solver_,
has_disgas_,
has_vapoil_,
terminal_output_);
if (!threshold_pressures_by_face_.empty()) {
model->setThresholdPressures(threshold_pressures_by_face_);
}
typedef typename Solver::SolverParameters SolverParams;
SolverParams solverParams( param_ );
return std::make_shared<Solver>(solverParams, model);
}
void void
computeRESV(const std::size_t step, computeRESV(const std::size_t step,

36
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -317,6 +317,42 @@ namespace Opm
} }
} // namespace SimFIBODetails } // namespace SimFIBODetails
template <class Implementation>
void SimulatorBase<Implementation>::handleAdditionalWellInflow(SimulatorTimer& timer,
WellsManager& wells_manager,
WellState& well_state,
const Wells* wells)
{ }
template <class Implementation>
auto SimulatorBase<Implementation>::createSolver(const Wells* wells)
-> std::shared_ptr<Solver>
{
typedef typename Traits::Model Model;
typedef typename Model::ModelParameters ModelParams;
ModelParams modelParams( param_ );
typedef NewtonSolver<Model> Solver;
auto model = std::make_shared<Model>(modelParams,
grid_,
props_,
geo_,
rock_comp_props_,
wells,
solver_,
has_disgas_,
has_vapoil_,
terminal_output_);
if (!threshold_pressures_by_face_.empty()) {
model->setThresholdPressures(threshold_pressures_by_face_);
}
typedef typename Solver::SolverParameters SolverParams;
SolverParams solverParams( param_ );
return std::make_shared<Solver>(solverParams, model);
}
template <class Implementation> template <class Implementation>
void SimulatorBase<Implementation>::computeRESV(const std::size_t step, void SimulatorBase<Implementation>::computeRESV(const std::size_t step,
const Wells* wells, const Wells* wells,