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

fix function name

Browse Source 
Frations -> Fractions
This commit is contained in:
Arne Morten Kvarving
2021-05-12 10:50:46 +02:00
parent 9758cd4f92
commit 1568479d3d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/WellInterface.hpp
View File

@@ -520,7 +520,7 @@ namespace Opm
double scalingFactor(const int comp_idx) const; double scalingFactor(const int comp_idx) const;
std::vector<double> initialWellRateFrations(const Simulator& ebosSimulator, const std::vector<double>& potentials) const; std::vector<double> initialWellRateFractions(const Simulator& ebosSimulator, const std::vector<double>& potentials) const;
// whether a well is specified with a non-zero and valid VFP table number // whether a well is specified with a non-zero and valid VFP table number
bool isVFPActive(DeferredLogger& deferred_logger) const; bool isVFPActive(DeferredLogger& deferred_logger) const;

14
opm/simulators/wells/WellInterface_impl.hpp
View File

@@ -1780,7 +1780,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= controls.oil_rate/current_rate; well_state.wellRates()[well_index*np + p] *= controls.oil_rate/current_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
double control_fraction = fractions[pu.phase_pos[Oil]]; double control_fraction = fractions[pu.phase_pos[Oil]];
if (control_fraction != 0.0) { if (control_fraction != 0.0) {
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
@@ -1800,7 +1800,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= controls.water_rate/current_rate; well_state.wellRates()[well_index*np + p] *= controls.water_rate/current_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
double control_fraction = fractions[pu.phase_pos[Water]]; double control_fraction = fractions[pu.phase_pos[Water]];
if (control_fraction != 0.0) { if (control_fraction != 0.0) {
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
@@ -1820,7 +1820,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= controls.gas_rate/current_rate; well_state.wellRates()[well_index*np + p] *= controls.gas_rate/current_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
double control_fraction = fractions[pu.phase_pos[Gas]]; double control_fraction = fractions[pu.phase_pos[Gas]];
if (control_fraction != 0.0) { if (control_fraction != 0.0) {
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
@@ -1843,7 +1843,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= controls.liquid_rate/current_rate; well_state.wellRates()[well_index*np + p] *= controls.liquid_rate/current_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
double control_fraction = fractions[pu.phase_pos[Water]] + fractions[pu.phase_pos[Oil]]; double control_fraction = fractions[pu.phase_pos[Water]] + fractions[pu.phase_pos[Oil]];
if (control_fraction != 0.0) { if (control_fraction != 0.0) {
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
@@ -1873,7 +1873,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= controls.resv_rate/total_res_rate; well_state.wellRates()[well_index*np + p] *= controls.resv_rate/total_res_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
well_state.wellRates()[well_index*np + p] = - fractions[p] * controls.resv_rate / convert_coeff[p]; well_state.wellRates()[well_index*np + p] = - fractions[p] * controls.resv_rate / convert_coeff[p];
} }
@@ -1899,7 +1899,7 @@ namespace Opm
well_state.wellRates()[well_index*np + p] *= target/total_res_rate; well_state.wellRates()[well_index*np + p] *= target/total_res_rate;
} }
} else { } else {
const std::vector<double> fractions = initialWellRateFrations(ebos_simulator, well_state.wellPotentials()); const std::vector<double> fractions = initialWellRateFractions(ebos_simulator, well_state.wellPotentials());
for (int p = 0; p<np; ++p) { for (int p = 0; p<np; ++p) {
well_state.wellRates()[well_index*np + p] = - fractions[p] * target / convert_coeff[p]; well_state.wellRates()[well_index*np + p] = - fractions[p] * target / convert_coeff[p];
} }
@@ -1964,7 +1964,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
std::vector<double> std::vector<double>
WellInterface<TypeTag>:: WellInterface<TypeTag>::
initialWellRateFrations(const Simulator& ebosSimulator, const std::vector<double>& potentials) const initialWellRateFractions(const Simulator& ebosSimulator, const std::vector<double>& potentials) const
{ {
const int np = number_of_phases_; const int np = number_of_phases_;
std::vector<double> scaling_factor(np); std::vector<double> scaling_factor(np);