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

adding wells_multisegment_ member for multisegment model

Browse Source 
and also updating the createSolver() function.
This commit is contained in:
Kai Bao
2015-09-22 17:15:55 +02:00
parent 00d9a57cc2
commit f0b363baa5
4 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@@ -84,7 +84,8 @@ namespace Opm {
Opm::EclipseStateConstPtr eclState,
const bool has_disgas,
const bool has_vapoil,
const bool terminal_output);
const bool terminal_output,
const std::vector<WellMultiSegmentConstPtr>& wells_multisegment);
/// Called once before each time step.
/// \param[in] dt time step size
@@ -171,13 +172,13 @@ namespace Opm {
V well_perforatoin_cell_pressure_diffs_;
const std::vector<WellMultiSegmentConstPtr> wells_multi_segment_;
const std::vector<WellMultiSegmentConstPtr> wells_multisegment_;
// return wells object
// TODO: remove this wells structure
using Base::wells;
const std::vector<WellMultiSegmentConstPtr>& wellsMultiSegment() const { return wells_multi_segment_; }
const std::vector<WellMultiSegmentConstPtr>& wellsMultiSegment() const { return wells_multisegment_; }
SolutionState
variableState(const ReservoirState& x,
@@ -455,8 +456,8 @@ namespace Opm {
};
/// Providing types by template specialisation of ModelTraits for BlackoilMultiSegmentModel.
template <class Grid>
struct ModelTraits< BlackoilMultiSegmentModel<Grid> >
template <class GridT>
struct ModelTraits< BlackoilMultiSegmentModel<GridT> >
{
typedef BlackoilState ReservoirState;
typedef WellStateMultiSegment WellState;