OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add INVALID_NAME to GCONPROD, GCONINJE & GEFAC

Browse Source
This commit is contained in:
Lars Petter Øren Hauge
2018-05-03 14:04:19 +02:00
parent 675858f1e0
commit fcbcc9cda4
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -214,13 +214,13 @@ namespace Opm {
handleGRUPNET(keyword, currentStep);
else if (keyword.name() == "GCONINJE")
handleGCONINJE(section, keyword, currentStep);
handleGCONINJE(section, keyword, currentStep, parseContext);
else if (keyword.name() == "GCONPROD")
handleGCONPROD(keyword, currentStep);
handleGCONPROD(keyword, currentStep, parseContext);
else if (keyword.name() == "GEFAC")
handleGEFAC(keyword, currentStep);
handleGEFAC(keyword, currentStep, parseContext);
else if (keyword.name() == "TUNING")
handleTUNING(keyword, currentStep);
@@ -1141,11 +1141,14 @@ namespace Opm {
}
}
void Schedule::handleGCONINJE( const SCHEDULESection& section, const DeckKeyword& keyword, size_t currentStep) {
void Schedule::handleGCONINJE( const SCHEDULESection& section, const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext) {
for( const auto& record : keyword ) {
const std::string& groupNamePattern = record.getItem("GROUP").getTrimmedString(0);
auto groups = getGroups ( groupNamePattern );
if (groups.empty())
invalidNamePattern(groupNamePattern, parseContext, keyword);
for (auto* group : groups){
{
Phase phase = get_phase( record.getItem("PHASE").getTrimmedString(0) );
@@ -1173,11 +1176,14 @@ namespace Opm {
}
}
void Schedule::handleGCONPROD( const DeckKeyword& keyword, size_t currentStep) {
void Schedule::handleGCONPROD( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext) {
for( const auto& record : keyword ) {
const std::string& groupNamePattern = record.getItem("GROUP").getTrimmedString(0);
auto groups = getGroups ( groupNamePattern );
if (groups.empty())
invalidNamePattern(groupNamePattern, parseContext, keyword);
for (auto* group : groups){
{
GroupProduction::ControlEnum controlMode = GroupProduction::ControlEnumFromString( record.getItem("CONTROL_MODE").getTrimmedString(0) );
@@ -1199,11 +1205,14 @@ namespace Opm {
}
void Schedule::handleGEFAC( const DeckKeyword& keyword, size_t currentStep) {
void Schedule::handleGEFAC( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext) {
for( const auto& record : keyword ) {
const std::string& groupNamePattern = record.getItem("GROUP").getTrimmedString(0);
auto groups = getGroups ( groupNamePattern );
if (groups.empty())
invalidNamePattern(groupNamePattern, parseContext, keyword);
for (auto* group : groups){
group->setGroupEfficiencyFactor(currentStep, record.getItem("EFFICIENCY_FACTOR").get< double >(0));