drop using statement for ebosCompIdxToFlowCompIdx

rather qualify member function calls with this->
This commit is contained in:
Arne Morten Kvarving
2021-09-06 12:58:16 +02:00
parent 9ebb315002
commit dae0e73327
2 changed files with 5 additions and 6 deletions

View File

@@ -262,7 +262,6 @@ namespace Opm
protected: protected:
// protected functions from the Base class // protected functions from the Base class
using Base::ebosCompIdxToFlowCompIdx;
using Base::wsalt; using Base::wsalt;
using Base::wsolvent; using Base::wsolvent;
using Base::wpolymer; using Base::wpolymer;

View File

@@ -472,7 +472,7 @@ namespace Opm
auto& perf_rate_solvent = perf_data.solvent_rates; auto& perf_rate_solvent = perf_data.solvent_rates;
perf_rate_solvent[perf] = cq_s[componentIdx].value(); perf_rate_solvent[perf] = cq_s[componentIdx].value();
} else { } else {
perf_rates[perf*np + ebosCompIdxToFlowCompIdx(componentIdx)] = cq_s[componentIdx].value(); perf_rates[perf*np + this->ebosCompIdxToFlowCompIdx(componentIdx)] = cq_s[componentIdx].value();
} }
} }
@@ -1007,8 +1007,8 @@ namespace Opm
for (int p = 0; p < number_of_phases_; ++p) { for (int p = 0; p < number_of_phases_; ++p) {
// TODO: double check the indices here // TODO: double check the indices here
ipr_a_[ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p]; ipr_a_[this->ebosCompIdxToFlowCompIdx(p)] += ipr_a_perf[p];
ipr_b_[ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p]; ipr_b_[this->ebosCompIdxToFlowCompIdx(p)] += ipr_b_perf[p];
} }
} }
this->parallel_well_info_.communication().sum(ipr_a_.data(), ipr_a_.size()); this->parallel_well_info_.communication().sum(ipr_a_.data(), ipr_a_.size());
@@ -1444,7 +1444,7 @@ namespace Opm
for (int perf = 0; perf < nperf; ++perf) { for (int perf = 0; perf < nperf; ++perf) {
for (int comp = 0; comp < np; ++comp) { for (int comp = 0; comp < np; ++comp) {
perfRates[perf * num_components_ + comp] = perf_rates_state[perf * np + ebosCompIdxToFlowCompIdx(comp)]; perfRates[perf * num_components_ + comp] = perf_rates_state[perf * np + this->ebosCompIdxToFlowCompIdx(comp)];
} }
} }
@@ -1663,7 +1663,7 @@ namespace Opm
cq_s, deferred_logger); cq_s, deferred_logger);
for(int p = 0; p < np; ++p) { for(int p = 0; p < np; ++p) {
well_flux[ebosCompIdxToFlowCompIdx(p)] += cq_s[p]; well_flux[this->ebosCompIdxToFlowCompIdx(p)] += cq_s[p];
} }
} }
this->parallel_well_info_.communication().sum(well_flux.data(), well_flux.size()); this->parallel_well_info_.communication().sum(well_flux.data(), well_flux.size());