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

correcting a typo in the name of WellMultiSegmentConstPtr

Browse Source
This commit is contained in:
Kai Bao
2015-09-22 15:54:21 +02:00
parent ca253cebc3
commit da6d88707c
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@@ -133,9 +133,6 @@ namespace Opm {
// while usually SEG way
using Base::well_perforation_densities_; //Density of each well perforation
// ADB version, when using AVG way, the calculation of the density and hydrostatic head
// is implicit
ADB well_perforation_densities_adb_;
// Diff to the pressure of the related segment.
// When the well is a usual well, the bhp will be the pressure of the top segment
@@ -147,6 +144,10 @@ namespace Opm {
// For segmented wells, they are zeros.
using Base::well_perforation_pressure_diffs_; // Diff to bhp for each well perforation.
// ADB version of the densities, when using AVG way, the calculation of the density and hydrostatic head
// is implicit
ADB well_perforation_densities_adb_;
// ADB version. Eventually, only ADB version will be kept.
ADB well_perforation_pressure_diffs_adb_;
@@ -169,6 +170,14 @@ namespace Opm {
ADB well_perforation_cell_densities_adb_;
V well_perforatoin_cell_pressure_diffs_;
const std::vector<WellMultiSegmentConstPtr> wells_multi_segment_;
// return wells object
// TODO: remove this wells structure
using Base::wells;
const std::vector<WellMultiSegmentConstPtr>& wellsMultiSegment() const { return wells_multi_segment_; }
/*
const Grid& grid_;
@@ -178,7 +187,6 @@ namespace Opm {
const Wells* wells_;
// FOR TEMPORARY
// SHOUlD BE A REFERENCE
const std::vector<WellMultiSegment> wells_multi_segment_;
VFPProperties vfp_properties_;
const NewtonIterationBlackoilInterface& linsolver_;
// For each canonical phase -> true if active
@@ -271,9 +279,6 @@ namespace Opm {
// return true if wells are available on this process
bool localWellsActive() const { return wells_ ? (wells_->number_of_wells > 0 ) : false; }
// return wells object
const Wells& wells () const { assert( bool(wells_ != 0) ); return *wells_; }
const std::vector<WellMultiSegment>& wellsMultiSegment() const { return wells_multi_segment_; }
void
makeConstantState(SolutionState& state) const;

2
opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment_impl.hpp
View File

@@ -84,7 +84,7 @@ namespace Opm
// well_state.init(wells, state, prev_well_state);
const std::vector<WellConstPtr>& wells_ecl = eclipse_state_->getSchedule()->getWells(timer.currentStepNum());
std::vector<WellMutliSegmentConstPtr> wells_multisegment(wells_ecl.size());
std::vector<WellMultiSegmentConstPtr> wells_multisegment(wells_ecl.size());
// wells_multisegment.resize(wells_ecl.size());
for (size_t i = 0; i < wells_multisegment.size(); ++i) {
wells_multisegment[i].reset(new WellMultiSegment(wells_ecl[i], timer.currentStepNum(), wells));

4
opm/autodiff/WellMultiSegment.hpp
View File

@@ -163,8 +163,8 @@ namespace Opm
WellOps m_wops_;
};
typedef std::shared_ptr<WellMultiSegment> WellMutliSegmentPtr;
typedef std::shared_ptr<const WellMultiSegment> WellMutliSegmentConstPtr;
typedef std::shared_ptr<WellMultiSegment> WellMultiSegmentPtr;
typedef std::shared_ptr<const WellMultiSegment> WellMultiSegmentConstPtr;
} // namespace Opm

2
opm/autodiff/WellStateMultiSegment.hpp
View File

@@ -69,7 +69,7 @@ namespace Opm
/// and perfPhaseRates() fields, depending on controls
/// the PrevState here must be the same with State
template <class State, class PrevState>
void init(const std::vector<WellMutliSegmentConstPtr>& wells, const State& state, const PrevState& prevState)
void init(const std::vector<WellMultiSegmentConstPtr>& wells, const State& state, const PrevState& prevState)
{
const int nw = wells.size();
if (nw == 0) {