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

Merge branch 'frankenstein' into PR/remove-Eigen-from-BMEbos

Browse Source
This commit is contained in:
Robert Kloefkorn
2016-10-21 14:13:58 +02:00
parent c8374a4b95 67ce00a9cb
commit 31724030c9
60 changed files with 433 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -324,7 +324,7 @@ public:
computeWellPotentials(wells, well_state, well_potentials);
}
updateListEconLimited(solver, eclState()->getSchedule(), timer.currentStepNum(), wells,
updateListEconLimited(solver, eclState().getSchedule(), timer.currentStepNum(), wells,
well_state, dynamic_list_econ_limited);
}
@@ -371,7 +371,7 @@ protected:
{
typedef SimFIBODetails::WellMap WellMap;
const auto w_ecl = eclState()->getSchedule()->getWells(step);
const auto w_ecl = eclState().getSchedule().getWells(step);
const WellMap& wmap = SimFIBODetails::mapWells(w_ecl);
const std::vector<int>& resv_wells = SimFIBODetails::resvWells(wells, step, wmap);
@@ -549,7 +549,7 @@ protected:
void updateListEconLimited(const std::unique_ptr<Solver>& solver,
ScheduleConstPtr schedule,
const Schedule& schedule,
const int current_step,
const Wells* wells,
const WellState& well_state,
@@ -559,11 +559,11 @@ protected:
well_state, list_econ_limited);
}
EclipseStateConstPtr eclState() const
{ return ebosSimulator_.gridManager().eclState(); }
const EclipseState& eclState() const
{ return *ebosSimulator_.gridManager().eclState(); }
EclipseStatePtr eclState()
{ return ebosSimulator_.gridManager().eclState(); }
EclipseState& eclState()
{ return *ebosSimulator_.gridManager().eclState(); }
// Data.
Simulator& ebosSimulator_;