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

fixup! Internalisation of SUMMARY C keywords

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-04-14 09:42:36 +02:00
parent 44b19a04ea
commit 302e656ea4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opm/parser/eclipse/EclipseState/Summary/Summary.cpp
View File

@@ -148,9 +148,7 @@ namespace Opm {
for( const auto& record : keyword ) {
const auto& wellname = record.getItem( 0 ).get< std::string >( 0 );
if( wellname == "*" ) {
if( record.getItem( 0 ).defaultApplied( 0 ) ) {
for( const auto& well : schedule->getWells() ) {
const auto& name = wellName( well );
@@ -159,7 +157,7 @@ namespace Opm {
auto cijk = getijk( *completion );
/* well defaulted, block coordinates defaulted */
if( record.size() != 4 ) {
if( record.getItem( 1 ).defaultApplied( 0 ) ) {
nodes.emplace_back( keywordstring, name, dims.data(), cijk.data() );
}
/* well defaulted, block coordinates specified */
@@ -172,16 +170,17 @@ namespace Opm {
}
} else {
const auto& name = record.getItem( 0 ).get< std::string >( 0 );
/* all specified */
if( !record.getItem( 1 ).defaultApplied( 0 ) ) {
auto ijk = getijk( record, 1 );
nodes.emplace_back( keywordstring, wellname, dims.data(), ijk.data() );
nodes.emplace_back( keywordstring, name, dims.data(), ijk.data() );
}
else {
/* well specified, block coordinates defaulted */
for( const auto& completion : *schedule->getWell( wellname ).getCompletions( last_timestep ) ) {
for( const auto& completion : *schedule->getWell( name ).getCompletions( last_timestep ) ) {
auto ijk = getijk( *completion );
nodes.emplace_back( keywordstring, wellname, dims.data(), ijk.data() );
nodes.emplace_back( keywordstring, name, dims.data(), ijk.data() );
}
}
}