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

Make assemble() more similar to base version.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-10-12 16:27:13 +02:00 committed by Kai Bao
parent e6a81fca83
commit 653e55d7db
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@ -214,6 +214,7 @@ namespace Opm {
using Base::convergenceReduction; using Base::convergenceReduction;
using Base::maxResidualAllowed; using Base::maxResidualAllowed;
using Base::variableState; using Base::variableState;
using Base::asImpl;
const std::vector<WellMultiSegmentConstPtr>& wellsMultiSegment() const { return wells_multisegment_; } const std::vector<WellMultiSegmentConstPtr>& wellsMultiSegment() const { return wells_multisegment_; }

26
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
View File

@ -459,24 +459,24 @@ namespace Opm {
// SolutionState state = asImpl().variableState(reservoir_state, well_state); // SolutionState state = asImpl().variableState(reservoir_state, well_state);
// SolutionState state0 = state; // SolutionState state0 = state;
// asImpl().makeConstantState(state0); // asImpl().makeConstantState(state0);
// computeWellConnectionPressures(state0, well_state); // asImpl().computeWellConnectionPressures(state0, well_state);
// } // }
// Possibly switch well controls and updating well state to // Possibly switch well controls and updating well state to
// get reasonable initial conditions for the wells // get reasonable initial conditions for the wells
updateWellControls(well_state); asImpl().updateWellControls(well_state);
// Create the primary variables. // Create the primary variables.
SolutionState state = variableState(reservoir_state, well_state); SolutionState state = asImpl().variableState(reservoir_state, well_state);
if (initial_assembly) { if (initial_assembly) {
// Create the (constant, derivativeless) initial state. // Create the (constant, derivativeless) initial state.
SolutionState state0 = state; SolutionState state0 = state;
makeConstantState(state0); asImpl().makeConstantState(state0);
// Compute initial accumulation contributions // Compute initial accumulation contributions
// and well connection pressures. // and well connection pressures.
Base::computeAccum(state0, 0); asImpl().computeAccum(state0, 0);
computeWellConnectionPressures(state0, well_state); asImpl().computeWellConnectionPressures(state0, well_state);
} }
// OPM_AD_DISKVAL(state.pressure); // OPM_AD_DISKVAL(state.pressure);
@ -489,7 +489,7 @@ namespace Opm {
// OPM_AD_DISKVAL(state.bhp); // OPM_AD_DISKVAL(state.bhp);
// -------- Mass balance equations -------- // -------- Mass balance equations --------
Base::assembleMassBalanceEq(state); asImpl().assembleMassBalanceEq(state);
// -------- Well equations ---------- // -------- Well equations ----------
@ -529,12 +529,12 @@ namespace Opm {
// the perforation flux here are different // the perforation flux here are different
// it is related to the segment location // it is related to the segment location
computeWellFlux(state, mob_perfcells, b_perfcells, aliveWells, cq_s); asImpl().computeWellFlux(state, mob_perfcells, b_perfcells, aliveWells, cq_s);
computeSegmentDensities(state, cq_s, b_perfcells, well_state); asImpl().computeSegmentDensities(state, cq_s, b_perfcells, well_state);
updatePerfPhaseRatesAndPressures(cq_s, state, well_state); asImpl().updatePerfPhaseRatesAndPressures(cq_s, state, well_state);
addWellFluxEq(cq_s, state); asImpl().addWellFluxEq(cq_s, state);
addWellContributionToMassBalanceEq(cq_s, state, well_state); asImpl().addWellContributionToMassBalanceEq(cq_s, state, well_state);
addWellControlEq(state, well_state, aliveWells); asImpl().addWellControlEq(state, well_state, aliveWells);
} }