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 blank lines

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-01-30 16:10:23 +01:00
parent 2d2ec82640
commit 052f25636c
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -1701,7 +1701,6 @@ namespace Opm {
if (!group.hasInjectionControl(phase)) { if (!group.hasInjectionControl(phase)) {
continue; continue;
} }
int phasePos; int phasePos;
if (phase == Phase::GAS && phase_usage_.phase_used[BlackoilPhases::Vapour] ) if (phase == Phase::GAS && phase_usage_.phase_used[BlackoilPhases::Vapour] )
phasePos = phase_usage_.phase_pos[BlackoilPhases::Vapour]; phasePos = phase_usage_.phase_pos[BlackoilPhases::Vapour];

1
opm/simulators/wells/WellGroupHelpers.hpp
View File

@ -469,6 +469,7 @@ namespace Opm {
} }
wellState.setCurrentInjectionVREPRates(group.name(), resv); wellState.setCurrentInjectionVREPRates(group.name(), resv);
} }
inline void updateReservoirRatesInjectionGroups(const Group& group, const Schedule& schedule, const int reportStepIdx, const WellStateFullyImplicitBlackoil& wellStateNupcol, WellStateFullyImplicitBlackoil& wellState) { inline void updateReservoirRatesInjectionGroups(const Group& group, const Schedule& schedule, const int reportStepIdx, const WellStateFullyImplicitBlackoil& wellStateNupcol, WellStateFullyImplicitBlackoil& wellState) {
for (const std::string& groupName : group.groups()) { for (const std::string& groupName : group.groups()) {
const Group& groupTmp = schedule.getGroup(groupName, reportStepIdx); const Group& groupTmp = schedule.getGroup(groupName, reportStepIdx);

8
opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
View File

@ -327,6 +327,7 @@ namespace Opm
void setCurrentProductionGroupControl(const std::string& groupName, const Group::ProductionCMode& groupControl ) { void setCurrentProductionGroupControl(const std::string& groupName, const Group::ProductionCMode& groupControl ) {
current_production_group_controls_[groupName] = groupControl; current_production_group_controls_[groupName] = groupControl;
} }
const Group::ProductionCMode& currentProductionGroupControl(const std::string& groupName) const { const Group::ProductionCMode& currentProductionGroupControl(const std::string& groupName) const {
auto it = current_production_group_controls_.find(groupName); auto it = current_production_group_controls_.find(groupName);
@ -340,6 +341,7 @@ namespace Opm
void setCurrentInjectionGroupControl(const Opm::Phase& phase, const std::string& groupName, const Group::InjectionCMode& groupControl ) { void setCurrentInjectionGroupControl(const Opm::Phase& phase, const std::string& groupName, const Group::InjectionCMode& groupControl ) {
current_injection_group_controls_[std::make_pair(phase, groupName)] = groupControl; current_injection_group_controls_[std::make_pair(phase, groupName)] = groupControl;
} }
const Group::InjectionCMode& currentInjectionGroupControl(const Opm::Phase& phase, const std::string& groupName) const { const Group::InjectionCMode& currentInjectionGroupControl(const Opm::Phase& phase, const std::string& groupName) const {
auto it = current_injection_group_controls_.find(std::make_pair(phase, groupName)); auto it = current_injection_group_controls_.find(std::make_pair(phase, groupName));
@ -353,6 +355,7 @@ namespace Opm
void setCurrentProductionGroupReductionRates(const std::string& groupName, const std::vector<double>& target ) { void setCurrentProductionGroupReductionRates(const std::string& groupName, const std::vector<double>& target ) {
production_group_reduction_rates[groupName] = target; production_group_reduction_rates[groupName] = target;
} }
const std::vector<double>& currentProductionGroupReductionRates(const std::string& groupName) const { const std::vector<double>& currentProductionGroupReductionRates(const std::string& groupName) const {
auto it = production_group_reduction_rates.find(groupName); auto it = production_group_reduction_rates.find(groupName);
@ -365,6 +368,7 @@ namespace Opm
void setCurrentInjectionGroupReductionRates(const std::string& groupName, const std::vector<double>& target ) { void setCurrentInjectionGroupReductionRates(const std::string& groupName, const std::vector<double>& target ) {
injection_group_reduction_rates[groupName] = target; injection_group_reduction_rates[groupName] = target;
} }
const std::vector<double>& currentInjectionGroupReductionRates(const std::string& groupName) const { const std::vector<double>& currentInjectionGroupReductionRates(const std::string& groupName) const {
auto it = injection_group_reduction_rates.find(groupName); auto it = injection_group_reduction_rates.find(groupName);
@ -377,6 +381,7 @@ namespace Opm
void setCurrentInjectionGroupReservoirRates(const std::string& groupName, const std::vector<double>& target ) { void setCurrentInjectionGroupReservoirRates(const std::string& groupName, const std::vector<double>& target ) {
injection_group_reservoir_rates[groupName] = target; injection_group_reservoir_rates[groupName] = target;
} }
const std::vector<double>& currentInjectionGroupReservoirRates(const std::string& groupName) const { const std::vector<double>& currentInjectionGroupReservoirRates(const std::string& groupName) const {
auto it = injection_group_reservoir_rates.find(groupName); auto it = injection_group_reservoir_rates.find(groupName);
@ -389,6 +394,7 @@ namespace Opm
void setCurrentInjectionVREPRates(const std::string& groupName, const double& target ) { void setCurrentInjectionVREPRates(const std::string& groupName, const double& target ) {
injection_group_vrep_rates[groupName] = target; injection_group_vrep_rates[groupName] = target;
} }
const double& currentInjectionVREPRates(const std::string& groupName) const { const double& currentInjectionVREPRates(const std::string& groupName) const {
auto it = injection_group_vrep_rates.find(groupName); auto it = injection_group_vrep_rates.find(groupName);
@ -401,6 +407,7 @@ namespace Opm
void setCurrentInjectionREINRates(const std::string& groupName, const std::vector<double>& target ) { void setCurrentInjectionREINRates(const std::string& groupName, const std::vector<double>& target ) {
injection_group_rein_rates[groupName] = target; injection_group_rein_rates[groupName] = target;
} }
const std::vector<double>& currentInjectionREINRates(const std::string& groupName) const { const std::vector<double>& currentInjectionREINRates(const std::string& groupName) const {
auto it = injection_group_rein_rates.find(groupName); auto it = injection_group_rein_rates.find(groupName);
@ -413,6 +420,7 @@ namespace Opm
void setCurrentGroupInjectionPotentials(const std::string& groupName, const std::vector<double>& pot ) { void setCurrentGroupInjectionPotentials(const std::string& groupName, const std::vector<double>& pot ) {
injection_group_potentials[groupName] = pot; injection_group_potentials[groupName] = pot;
} }
const std::vector<double>& currentGroupInjectionPotentials(const std::string& groupName) const { const std::vector<double>& currentGroupInjectionPotentials(const std::string& groupName) const {
auto it = injection_group_potentials.find(groupName); auto it = injection_group_potentials.find(groupName);