OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-05 22:13:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix typos

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-01-20 09:14:19 +01:00
parent c1748604f0
commit 6e0f26f488
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1954,9 +1954,9 @@ namespace Opm {
well_state.setCurrentProductionGroupControl(group.name(), newControl);
ss << "Switching control mode for group "<< group.name() << " to " << Group::ProductionCMode2String(newControl);
}
// Pass a dummy phase for producer groups. The topPhase is only relevant for injector groups
const Phase topPhase = Phase::WATER;
wellGroupHelpers::setGroupControl(group, schedule(), topPhase, reportStepIdx, false, well_state, ss);
// Pass a dummy phase for producer groups. The topUpPhase is only relevant for injector groups
const Phase topUpPhase = Phase::WATER;
wellGroupHelpers::setGroupControl(group, schedule(), topUpPhase, reportStepIdx, false, well_state, ss);
break;
}
default:
@ -1994,8 +1994,8 @@ namespace Opm {
well_state.setCurrentInjectionGroupControl(group.name(), newControl);
}
const auto& summaryState = ebosSimulator_.vanguard().summaryState();
const Phase& topPhase = group.injectionControls(summaryState).phase;
wellGroupHelpers::setGroupControl(group, schedule(), topPhase, reportStepIdx, /*isInjector*/true, well_state, ss);
const Phase& topUpPhase = group.injectionControls(summaryState).phase;
wellGroupHelpers::setGroupControl(group, schedule(), topUpPhase, reportStepIdx, /*isInjector*/true, well_state, ss);
if (!ss.str().empty())
deferred_logger.info(ss.str());

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

@ -29,13 +29,13 @@ namespace Opm {
namespace wellGroupHelpers
{
inline void setGroupControl(const Group& group, const Schedule& schedule, const Phase& topPhase, const int reportStepIdx, const bool injector, WellStateFullyImplicitBlackoil& wellState, std::ostringstream& ss) {
inline void setGroupControl(const Group& group, const Schedule& schedule, const Phase& topUpPhase, const int reportStepIdx, const bool injector, WellStateFullyImplicitBlackoil& wellState, std::ostringstream& ss) {
for (const std::string& groupName : group.groups()) {
const Group& groupTmp = schedule.getGroup(groupName, reportStepIdx);
setGroupControl(groupTmp, schedule, topPhase, reportStepIdx, injector, wellState, ss);
setGroupControl(groupTmp, schedule, topUpPhase, reportStepIdx, injector, wellState, ss);
if (injector) {
if (groupTmp.injection_phase() == topPhase || wellState.currentInjectionGroupControl(groupName) == Group::InjectionCMode::NONE) // only switch sub groups with same face or NONE
if (groupTmp.injection_phase() == topUpPhase || wellState.currentInjectionGroupControl(groupName) == Group::InjectionCMode::NONE) // only switch sub groups with same phase or NONE
wellState.setCurrentInjectionGroupControl(groupName, Group::InjectionCMode::FLD);
} else {
wellState.setCurrentProductionGroupControl(groupName, Group::ProductionCMode::FLD);
@ -69,13 +69,13 @@ namespace Opm {
// Get the current controls.
const Well::InjectorType& injectorType = wellEcl.getInjectionProperties().injectorType;
if (injectorType == Well::InjectorType::WATER && topPhase != Phase::WATER)
if (injectorType == Well::InjectorType::WATER && topUpPhase != Phase::WATER)
continue;
if (injectorType == Well::InjectorType::OIL && topPhase != Phase::OIL)
if (injectorType == Well::InjectorType::OIL && topUpPhase != Phase::OIL)
continue;
if (injectorType == Well::InjectorType::GAS && topPhase != Phase::GAS)
if (injectorType == Well::InjectorType::GAS && topUpPhase != Phase::GAS)
continue;
if (injectorType == Well::InjectorType::MULTI)