OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pass solutionState as first parameter

Browse Source 
output parameters go last...
This commit is contained in:
Tor Harald Sandve committed 2016-04-05 08:57:07 +02:00
1 parent 925d0becf3
commit 89e540cb2c
4 files changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/autodiff/BlackoilModelBase.hpp
+3 -3
View File
@@ -398,9 +398,9 @@ namespace Opm {
assembleMassBalanceEq(const SolutionState& state); assembleMassBalanceEq(const SolutionState& state);
void void
extractWellPerfProperties(std::vector<ADB>& mob_perfcells, extractWellPerfProperties(const SolutionState& state,
std::vector<ADB>& b_perfcells, std::vector<ADB>& mob_perfcells,
const SolutionState&) const; std::vector<ADB>& b_perfcells) const;
bool bool
solveWellEq(const std::vector<ADB>& mob_perfcells, solveWellEq(const std::vector<ADB>& mob_perfcells,
opm/autodiff/BlackoilModelBase_impl.hpp
+4 -4
View File
@@ -978,7 +978,7 @@ namespace detail {
std::vector<ADB> mob_perfcells; std::vector<ADB> mob_perfcells;
std::vector<ADB> b_perfcells; std::vector<ADB> b_perfcells;
asImpl().extractWellPerfProperties(mob_perfcells, b_perfcells, state); asImpl().extractWellPerfProperties(state, mob_perfcells, b_perfcells);
if (param_.solve_welleq_initially_ && initial_assembly) { if (param_.solve_welleq_initially_ && initial_assembly) {
// solve the well equations as a pre-processing step // solve the well equations as a pre-processing step
asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state); asImpl().solveWellEq(mob_perfcells, b_perfcells, state, well_state);
@@ -1125,9 +1125,9 @@ namespace detail {
template <class Grid, class Implementation> template <class Grid, class Implementation>
void void
BlackoilModelBase<Grid, Implementation>::extractWellPerfProperties(std::vector<ADB>& mob_perfcells, BlackoilModelBase<Grid, Implementation>::extractWellPerfProperties(const SolutionState&,
std::vector<ADB>& b_perfcells, std::vector<ADB>& mob_perfcells,
const SolutionState&) const std::vector<ADB>& b_perfcells) const
{ {
// If we have wells, extract the mobilities and b-factors for // If we have wells, extract the mobilities and b-factors for
// the well-perforated cells. // the well-perforated cells.
opm/autodiff/BlackoilSolventModel.hpp
+3 -3
View File
@@ -226,9 +226,9 @@ namespace Opm {
const std::vector<PhasePresence> const std::vector<PhasePresence>
phaseCondition() const {return this->phaseCondition_;} phaseCondition() const {return this->phaseCondition_;}
void extractWellPerfProperties(std::vector<ADB>& mob_perfcells, void extractWellPerfProperties(const SolutionState& state,
std::vector<ADB>& b_perfcells, std::vector<ADB>& mob_perfcells,
const SolutionState& state); std::vector<ADB>& b_perfcells);
// compute effective viscosities (mu_eff_) and effective b factors (b_eff_) using the ToddLongstaff model // compute effective viscosities (mu_eff_) and effective b factors (b_eff_) using the ToddLongstaff model
opm/autodiff/BlackoilSolventModel_impl.hpp
+4 -4
View File
@@ -758,11 +758,11 @@ namespace Opm {
template <class Grid> template <class Grid>
void void
BlackoilSolventModel<Grid>::extractWellPerfProperties(std::vector<ADB>& mob_perfcells, BlackoilSolventModel<Grid>::extractWellPerfProperties(const SolutionState& state,
std::vector<ADB>& b_perfcells, std::vector<ADB>& mob_perfcells,
const SolutionState& state) std::vector<ADB>& b_perfcells)
{ {
Base::extractWellPerfProperties(mob_perfcells, b_perfcells, state); Base::extractWellPerfProperties(state, mob_perfcells, b_perfcells);
if (has_solvent_) { if (has_solvent_) {
int gas_pos = fluid_.phaseUsage().phase_pos[Gas]; int gas_pos = fluid_.phaseUsage().phase_pos[Gas];
const std::vector<int>& well_cells = wops_.well_cells; const std::vector<int>& well_cells = wops_.well_cells;