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

chaning the naming of the member functions of WellStateMultiSegment

Browse Source 
segPressures   -> segPress
perfPressures  -> perPress
to keep consist with the WellState
This commit is contained in:
Kai Bao 2015-09-21 13:31:37 +02:00
parent 1788f5c1b3
commit d2728fbfc6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -633,7 +633,7 @@ namespace detail {
vars0.push_back(qs);
// for the pressure of the segments
const V pseg = Eigen::Map<const V>(& xw.segPressures()[0], xw.segPressures().size());
const V pseg = Eigen::Map<const V>(& xw.segPress()[0], xw.segPress().size());
vars0.push_back(pseg);
}
else
@ -677,7 +677,7 @@ namespace detail {
// Initial pressures
const V seg_pressures = Eigen::Map<const V>(& xw.segPressures()[0], nseg);
const V seg_pressures = Eigen::Map<const V>(& xw.segPress()[0], nseg);
vars0.push_back(seg_pressures);
}
else
@ -1089,7 +1089,7 @@ namespace detail {
const int nperf_nonsegmented = well_cells_non_segmented.size();
const V perf_press = Eigen::Map<const V>(xw.perfPressures().data(), nperf);
const V perf_press = Eigen::Map<const V>(xw.perfPress().data(), nperf);
// const V perf_press_nonsegmented = subset(perf_press, well_cells_non_segmented_idx);
V avg_press = perf_press * 0.0;
@ -1947,7 +1947,7 @@ namespace detail {
// TODO: now it is so necesary to have a gobal wellsMultiSegment class to store some global information.
const int np = numPhases();
const int nw = wellsMultiSegment().size();
const int nperf = xw.perfPressures().size();
const int nperf = xw.perfPress().size();
V cq = superset(cq_s[0].value(), Span(nperf, np, 0), nperf*np);
for (int phase = 1; phase < np; ++phase) {

12
opm/autodiff/WellStateMultiSegment.hpp
View File

@ -321,13 +321,13 @@ namespace Opm
// perf_pressures_
for (int i = 0; i < num_perf_this_well; ++i) {
// p
perf_pressures_[this_start_perforation + i] = prevState.perfPressures()[old_start_perforation + i];
perf_pressures_[this_start_perforation + i] = prevState.perfPress()[old_start_perforation + i];
}
// seg_pressures_
for (int i = 0; i < num_seg_this_well; ++i) {
// p
seg_pressures_[this_start_segment + i] = prevState.segPressures()[old_start_segment + i];
seg_pressures_[this_start_segment + i] = prevState.segPress()[old_start_segment + i];
}
// current controls
}
@ -380,11 +380,11 @@ namespace Opm
std::vector<double>& segPhaseRates() { return seg_phaserates_; }
const std::vector<double>& segPhaseRates() const { return seg_phaserates_; }
std::vector<double>& segPressures() { return seg_pressures_; }
const std::vector<double>& segPressures() const { return seg_pressures_; }
std::vector<double>& segPress() { return seg_pressures_; }
const std::vector<double>& segPress() const { return seg_pressures_; }
std::vector<double>& perfPressures() { return perf_pressures_; }
const std::vector<double>& perfPressures() const { return perf_pressures_; }
std::vector<double>& perfPress() { return perf_pressures_; }
const std::vector<double>& perfPress() const { return perf_pressures_; }
std::vector<double>& perfPhaseRates() { return perf_phaserates_; }
const std::vector<double>& perfPhaseRates() const { return perf_phaserates_; }