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

For keywords classified as SpecialField, append data to existing objects, if any.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-06-07 14:05:32 +02:00
parent 0551401bc6
commit 5bbf5bc832
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
opm/core/eclipse/EclipseGridParser.cpp
View File

@@ -447,11 +447,17 @@ void EclipseGridParser::readImpl(istream& is)
++current_epoch_;
ASSERT(int(special_field_by_epoch_.size()) == current_epoch_ + 1);
}
SpecialFieldPtr sb_ptr = createSpecialField(is, keyword);
if (sb_ptr) {
special_field_by_epoch_[current_epoch_][keyword] = sb_ptr;
// Check if the keyword already exists. If so, append. Otherwise, create new.
SpecialMap::iterator it = special_field_by_epoch_[current_epoch_].find(keyword);
if (it != special_field_by_epoch_[current_epoch_].end()) {
it->second->read(is);
} else {
THROW("Could not create field " << keyword);
SpecialFieldPtr sb_ptr = createSpecialField(is, keyword);
if (sb_ptr) {
special_field_by_epoch_[current_epoch_][keyword] = sb_ptr;
} else {
THROW("Could not create field " << keyword);
}
}
break;
}
@@ -672,7 +678,7 @@ const std::vector<double>& EclipseGridParser::getFloatingPointValue(const std::s
//---------------------------------------------------------------------------
const std::tr1::shared_ptr<SpecialBase> EclipseGridParser::getSpecialValue(const std::string& keyword) const
const SpecialBasePtr EclipseGridParser::getSpecialValue(const std::string& keyword) const
//---------------------------------------------------------------------------
{
SpecialMap::const_iterator it = special_field_by_epoch_[current_epoch_].find(keyword);
@@ -684,19 +690,20 @@ const std::tr1::shared_ptr<SpecialBase> EclipseGridParser::getSpecialValue(const
}
//---------------------------------------------------------------------------
std::tr1::shared_ptr<SpecialBase>
SpecialBasePtr
EclipseGridParser::createSpecialField(std::istream& is,
const std::string& fieldname)
//---------------------------------------------------------------------------
{
string ukey = upcase(fieldname);
std::tr1::shared_ptr<SpecialBase> spec_ptr
SpecialBasePtr spec_ptr
= Factory<SpecialBase>::createObject(fieldname);
is >> ignoreWhitespace;
spec_ptr->read(is);
return spec_ptr;
}
//---------------------------------------------------------------------------
void EclipseGridParser::setIntegerField(const std::string& keyword,
const std::vector<int>& field)